Revision: 41934
http://brlcad.svn.sourceforge.net/brlcad/?rev=41934&view=rev
Author: starseeker
Date: 2011-01-04 19:13:08 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Use brlcad trunk copy of src/other/libpng/Makefile.am
Modified Paths:
--------------
brlcad/branches/cmake/src/other/libpng/Makefile.am
Modified: brlcad/branches/cmake/src/other/libpng/Makefile.am
===================================================================
--- brlcad/branches/cmake/src/other/libpng/Makefile.am 2011-01-04 18:58:29 UTC
(rev 41933)
+++ brlcad/branches/cmake/src/other/libpng/Makefile.am 2011-01-04 19:13:08 UTC
(rev 41934)
@@ -1,6 +1,7 @@
# Makefile.am:
# Source file for Makefile.in (and hence Makefile)
#
+ACLOCAL_AMFLAGS = -I ../../../m4
PNGLIB_BASENAME= lib...@pnglib_major@@PNGLIB_MINOR@
@@ -31,18 +32,19 @@
pngwtran.c pngmem.c pngerror.c pngpread.c \
png.h pngconf.h pngpriv.h
-lib...@pnglib_major@@pnglib_mi...@_la_cppflags = @LIBPNG_DEFINES@
+# support automake 1.7+, no target-specific CPPFLAGS
+AM_CPPFLAGS = @LIBPNG_DEFINES@
-lib...@pnglib_major@@pnglib_mi...@_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
- lib...@pnglib_major@@pnglib_mi...@_la_ldflags +=
-Wl,--version-script=libpng.vers
+ lib...@pnglib_major@@pnglib_mi...@_la_ldflags = $(libpng_la_LDFLAGS)
-Wl,--version-script=libpng.vers
lib...@pnglib_major@@pnglib_mi...@_la_dependencies = libpng.vers
else
# Only restricted exports when possible
- lib...@pnglib_major@@pnglib_mi...@_la_ldflags += -export-symbols libpng.sym
+ lib...@pnglib_major@@pnglib_mi...@_la_ldflags = $(libpng_la_LDFLAGS)
-export-symbols libpng.sym
lib...@pnglib_major@@pnglib_mi...@_la_dependencies = libpng.sym
endif
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
