From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 10 May 2013 09:20:24 +0000 (+0200)
Subject: Merge branch 'maint' into ng/master
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9a1ac8a44383cf291dd1a8d68afc66e4815d8c2e;p=thirdparty%2Fautomake.git

Merge branch 'maint' into ng/master

* maint:
  am: prefer a shorter idiom where possible
  cosmetics: fix few typos, grammaros and missing whitespace
  fixup: remove an obsolete comment
  docs: we still don't have the promised better Java interface
  maint: re-run "make update-copyright" ...
  tests: avoid spurious failure with older flex (2.5.4)
  announcement: cater to more flexible NEWS format

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

9a1ac8a44383cf291dd1a8d68afc66e4815d8c2e
diff --cc lib/am/library.am
index c7eae862c,c01d221ef..bf260efdf
--- a/lib/am/library.am
+++ b/lib/am/library.am
@@@ -13,9 -13,8 +13,10 @@@
  
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
 -%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) $(EXTRA_%XLIBRARY%_DEPENDENCIES) %DIRSTAMP%
 -	%SILENT%-rm -f %LIBRARY%
 -	%VERBOSE%$(%XLIBRARY%_AR) %LIBRARY% $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
 -	%SILENT%$(RANLIB) %LIBRARY%
 +%LIBRARY%: $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_DEPENDENCIES) \
 +           $(EXTRA_%XLIBRARY%_DEPENDENCIES)
 +	%SILENT%rm -f $@
 +	%SILENT%$(am.cmd.ensure-target-dir-exists)
 +	%VERBOSE%$(%XLIBRARY%_AR) $@ $(%XLIBRARY%_OBJECTS) $(%XLIBRARY%_LIBADD)
 +	%SILENT%$(RANLIB) $@
diff --cc lib/am/ltlibrary.am
index 49c646a17,642d032ba..e036779f1
--- a/lib/am/ltlibrary.am
+++ b/lib/am/ltlibrary.am
@@@ -13,7 -13,6 +13,8 @@@
  
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
 -%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) $(EXTRA_%XLTLIBRARY%_DEPENDENCIES) %DIRSTAMP%
 +%LTLIBRARY%: $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_DEPENDENCIES) \
 +             $(EXTRA_%XLTLIBRARY%_DEPENDENCIES)
 +	%SILENT%$(am.cmd.ensure-target-dir-exists)
  	%VERBOSE%$(%XLINK%) %RPATH% $(%XLTLIBRARY%_OBJECTS) $(%XLTLIBRARY%_LIBADD) $(LIBS)
diff --cc lib/am/program.am
index de4ca2068,131c4a9c6..446fbce83
--- a/lib/am/program.am
+++ b/lib/am/program.am
@@@ -13,8 -13,8 +13,9 @@@
  
  ## You should have received a copy of the GNU General Public License
  ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ 
 -%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) $(EXTRA_%XPROGRAM%_DEPENDENCIES) %DIRSTAMP%
 +%PROGRAM%%EXEEXT%: $(%XPROGRAM%_OBJECTS) $(%XPROGRAM%_DEPENDENCIES) \
 +                   $(EXTRA_%XPROGRAM%_DEPENDENCIES)
  ## Remove program before linking.  Otherwise the link will fail if the
  ## program is running somewhere.  FIXME: this could be a loss if
  ## you're using an incremental linker.  Maybe we should think twice?