Rework the GTK WebKit backend history to remove the need for the map between wxWebHis...

[wxWidgets.git] / src / png / Makefile.am

diff --git a/src/png/Makefile.am b/src/png/Makefile.am
index 8c8ddc2fa37b5f6153afa6db42def5754de76a91..81bbba66ef37fc52000d5d9c6aee370b878e7190 100644 (file)
--- a/src/png/Makefile.am
+++ b/src/png/Makefile.am
@@ -1,12 +1,6 @@
 # Makefile.am:
 #   Source file for Makefile.in (and hence Makefile)
 #
 # Makefile.am:
 #   Source file for Makefile.in (and hence Makefile)
 #

-# Makefile.am need only be changed on a major version number
-# change (e.g. libpng12 --> libpng13).  In that case seach
-# this file for every instance of the old base name (libpng12)
-# and change to the new one (libpng13), then change the
-# -version-number settings below so that the new values have
-# the correct major part (first field).

 
 PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 
 
 PNGLIB_BASENAME= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@
 


@@ -16,7 +10,7 @@ AUTOMAKE_OPTIONS = foreign
 # test programs - run on make check, make distcheck
 check_PROGRAMS= pngtest
 pngtest_SOURCES = pngtest.c
 # test programs - run on make check, make distcheck
 check_PROGRAMS= pngtest
 pngtest_SOURCES = pngtest.c

-pngtest_LDADD = libpng12.la
+pngtest_LDADD = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la

 TESTS = test-pngtest.sh
 TESTS_ENVIRONMENT= srcdir=$(srcdir) 
 
 TESTS = test-pngtest.sh
 TESTS_ENVIRONMENT= srcdir=$(srcdir) 
 


@@ -24,39 +18,33 @@ TESTS_ENVIRONMENT= srcdir=$(srcdir)
 dist_man_MANS= libpng.3 libpngpf.3 png.5
 
 # generate the -config scripts if required
 dist_man_MANS= libpng.3 libpngpf.3 png.5
 
 # generate the -config scripts if required

-binconfigs= libpng12-config 
-EXTRA_SCRIPTS= libpng-config libpng12-config
+binconfigs= libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config 
+EXTRA_SCRIPTS= libpng-config libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config

 bin_SCRIPTS= @binconfigs@
 
 # rules to build libpng, only build the old library on request
 bin_SCRIPTS= @binconfigs@
 
 # rules to build libpng, only build the old library on request

-lib_LTLIBRARIES=libpng12.la @compatlib@
-EXTRA_LTLIBRARIES= libpng.la
-libpng12_la_SOURCES = png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
+lib_LTLIBRARIES=libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.la
+# EXTRA_LTLIBRARIES= libpng.la
+libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_SOURCES = png.c pngset.c pngget.c pngrutil.c \
+       pngtrans.c pngwutil.c \

        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
        pngwtran.c pngmem.c pngerror.c pngpread.c \
        pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
        pngwtran.c pngmem.c pngerror.c pngpread.c \

-       png.h pngconf.h
-libpng_la_SOURCES = $(libpng12_la_SOURCES)
+       png.h pngconf.h pngpriv.h

 
 

-libpng_la_CPPFLAGS = @LIBPNG_DEFINES@
-libpng12_la_CPPFLAGS = @LIBPNG_DEFINES@
+libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_CPPFLAGS = @LIBPNG_DEFINES@

 
 

-# MAJOR UPGRADE: the version-number settings below must be changed.
-libpng12_la_LDFLAGS = -no-undefined -export-dynamic \
-       -version-number 0:@PNGLIB_RELEASE@:0
-# -rpath is needed as automake doesn't know the directory
-libpng_la_LDFLAGS = -rpath '$(libdir)' -no-undefined -export-dynamic \
-       -version-number 3:@PNGLIB_RELEASE@:0
+libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_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
 
 if HAVE_LD_VERSION_SCRIPT
   # Versioned symbols and restricted exports

-  libpng12_la_LDFLAGS += -Wl,--version-script=libpng.vers
-  libpng12_la_DEPENDENCIES = libpng.vers
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -Wl,--version-script=libpng.vers
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.vers

 else
   # Only restricted exports when possible
 else
   # Only restricted exports when possible

-  libpng12_la_LDFLAGS += -export-symbols libpng.sym
-  libpng12_la_DEPENDENCIES = libpng.sym
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_LDFLAGS += -export-symbols libpng.sym
+  libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@_la_DEPENDENCIES = libpng.sym

 endif
 endif

-libpng_la_DEPENDENCIES = $(libpng12_la_DEPENDENCIES)

 
 # Avoid depending upon Character Ranges.
 AN = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'
 
 # Avoid depending upon Character Ranges.
 AN = '_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789'


@@ -68,27 +56,25 @@ pkginclude_HEADERS= png.h pngconf.h
 # pkg-config stuff, note that libpng.pc is always required in order
 # to get the correct library
 pkgconfigdir = @pkgconfigdir@
 # pkg-config stuff, note that libpng.pc is always required in order
 # to get the correct library
 pkgconfigdir = @pkgconfigdir@

-pkgconfig_DATA = libpng12.pc
+pkgconfig_DATA = libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc

 
 #extra source distribution files.
 EXTRA_DIST= \
 
 #extra source distribution files.
 EXTRA_DIST= \

-       ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO \
+       ANNOUNCE CHANGES INSTALL LICENSE README TODO \

        pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \
        pngtest.png pngbar.png pngnow.png pngbar.jpg autogen.sh \

-       ${srcdir}/projects/cbuilder5/* \
-       ${srcdir}/projects/beos/* \

        ${srcdir}/projects/visualc6/* \
        ${srcdir}/projects/visualc71/* \
        ${srcdir}/projects/visualc6/* \
        ${srcdir}/projects/visualc71/* \

-       ${srcdir}/projects/wince.txt \
-       ${srcdir}/projects/netware.txt \
+       ${srcdir}/projects/xcode/* \

        ${srcdir}/scripts/* \
        ${srcdir}/contrib/gregbook/* \
        ${srcdir}/scripts/* \
        ${srcdir}/contrib/gregbook/* \

+       ${srcdir}/contrib/pngminim/* \

        ${srcdir}/contrib/pngminus/* \
        ${srcdir}/contrib/pngsuite/* \
        ${srcdir}/contrib/visupng/* \
        $(TESTS) \
        ${srcdir}/contrib/pngminus/* \
        ${srcdir}/contrib/pngsuite/* \
        ${srcdir}/contrib/visupng/* \
        $(TESTS) \

-       example.c libpng-1.2.34.txt pngvcrd.c 
+       example.c libpng-*.txt

 
 

-CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers \
+CLEANFILES= pngout.png libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@.pc libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@-config libpng.vers \

 libpng.sym
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \
 libpng.sym
 
 MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess config.h.in \


@@ -122,17 +108,18 @@ test: check
 install-data-hook:
        cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
        cd $(DESTDIR)$(includedir); $(LN_S) $(PNGLIB_BASENAME)/png.h png.h
 install-data-hook:
        cd $(DESTDIR)$(includedir); rm -f png.h pngconf.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)/pngconf.h \
+               pngconf.h

        cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
        cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
 
        cd $(DESTDIR)$(pkgconfigdir); rm -f libpng.pc
        cd $(DESTDIR)$(pkgconfigdir); $(LN_S) $(PNGLIB_BASENAME).pc libpng.pc
 

-# do evil things to libpng to cause libpng12 to be used
+# do evil things to libpng to cause libpng@PNGLIB_MAJOR@@PNGLIB_MINOR@ 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);\
 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 sl dylib; do\
+       for ext in a la so so.@PNGLIB_MAJOR@@PNGLIB_MINOR@.@PNGLIB_RELEASE@ sl dylib dll.a; do\

                rm -f libpng.$$ext;\
                 if test -f $(PNGLIB_BASENAME).$$ext; then\
                        $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\
                rm -f libpng.$$ext;\
                 if test -f $(PNGLIB_BASENAME).$$ext; then\
                        $(LN_S) $(PNGLIB_BASENAME).$$ext libpng.$$ext;\


@@ -143,10 +130,3 @@ uninstall-hook:
        cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
        rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
        rm -f $(DESTDIR)$(bindir)/libpng-config
        cd $(DESTDIR)$(includedir); rm -f png.h pngconf.h
        rm -f $(DESTDIR)$(pkgconfigdir)/libpng.pc
        rm -f $(DESTDIR)$(bindir)/libpng-config

-       @if test -n "@compatlib@"; then\
-               set -x;\
-               cd $(DESTDIR)$(libdir);\
-               for ext in a la so sl dylib; do\
-                       rm -f libpng.$$ext;\
-               done;\
-       fi