[brlcad-commits] SF.net SVN: brlcad:[39839] brlcad/trunk/src/other/libpng/Makefile.am

[<br...@us...>]

Revision: 39839
          http://brlcad.svn.sourceforge.net/brlcad/?rev=39839&view=rev
Author:   brlcad
Date:     2010-07-17 23:45:47 +0000 (Sat, 17 Jul 2010)

Log Message:
-----------
automake 1.6 does not recognize using += to append to variables.  minor mod makes things happy.

Modified Paths:
--------------
    brlcad/trunk/src/other/libpng/Makefile.am

Modified: brlcad/trunk/src/other/libpng/Makefile.am
===================================================================
--- brlcad/trunk/src/other/libpng/Makefile.am	2010-07-16 21:28:51 UTC (rev 39838)
+++ brlcad/trunk/src/other/libpng/Makefile.am	2010-07-17 23:45:47 UTC (rev 39839)
@@ -33,16 +33,16 @@
 
 libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@
 
-libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = -no-undefined -export-dynamic \
+libpng_la_LDFLAGS = -no-undefined -export-dynamic \
 	-version-number @PNGLIB_MAJOR@@PNGLIB_MINOR@:@PNGLIB_RELEASE@:0
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = $(libpng_la_LDFLAGS) -Wl,--version-script=libpng.vers
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers
 else
   # Only restricted exports when possible
-  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS = $(libpng_la_LDFLAGS) -export-symbols libpng.sym
   libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym
 endif
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.