Revision: 55100
http://brlcad.svn.sourceforge.net/brlcad/?rev=55100&view=rev
Author: starseeker
Date: 2013-04-09 20:20:21 +0000 (Tue, 09 Apr 2013)
Log Message:
-----------
More libpng build tweaks
Modified Paths:
--------------
brlcad/trunk/src/other/libpng/Makefile.am
Modified: brlcad/trunk/src/other/libpng/Makefile.am
===================================================================
--- brlcad/trunk/src/other/libpng/Makefile.am 2013-04-09 20:05:02 UTC (rev
55099)
+++ brlcad/trunk/src/other/libpng/Makefile.am 2013-04-09 20:20:21 UTC (rev
55100)
@@ -143,45 +143,5 @@
$(libpng15_la_OBJECTS): png.h pngconf.h \
pnglibconf.h pngpriv.h pngdebug.h pnginfo.h pngstruct.h
-test: check-am
+include $(top_srcdir)/misc/Makefile.defs
-# Extra checks
-check: scripts/symbols.chk
-
-# Don't distribute the generated script files
-dist-hook:
- cd '$(top_distdir)'; rm -f $(SCRIPT_CLEANFILES)
-
-# install the .../include headers as links to the new ones
-install-data-hook:
- cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
- cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
- cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pngconf.h \
- pngconf.h
- cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/pnglibconf.h \
- pnglibconf.h
- cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
- cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
-
-# do evil things to libpng to cause libpng15 to be used
-install-exec-hook:
- cd $(DESTDIR)$(bindir); rm -f libpng-config
- cd $(DESTDIR)$(bindir); $(LN_S) $(PNGLIB_BASENAME)-config libpng-config
- @set -x;\
- cd $(DESTDIR)$(libdir);\
- for ext in a la so so.15.12 sl dylib dll.a; do\
- rm -f libpng.$$ext;\
- if test -f $(PNGLIB_BASENAME).$$ext; then\
- $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
- fi;\
- done
-
-uninstall-hook:
- cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h pnglibconf.h
- rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
- rm -f $(DESTDIR)$(bindir)/libpng-config
- rm -f $(DESTDIR)$(libdir)/libpng.a
- rm -f $(DESTDIR)$(libdir)/libpng.la
- rm -f $(DESTDIR)$(libdir)/libpng.dll.a
-
-depends:
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Precog is a next-generation analytics platform capable of advanced
analytics on semi-structured data. The platform includes APIs for building
apps and a phenomenal toolset for data science. Developers can use
our toolset for easy data analysis & visualization. Get a free account!
http://www2.precog.com/precogplatform/slashdotnewsletter
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
