non-PCH build fix (according to Tinderbox).

[wxWidgets.git] / src / png / scripts / makefile.linux

diff --git a/src/png/scripts/makefile.linux b/src/png/scripts/makefile.linux
index 3ddac27e33224c18dcb286db15f463cc612ea2c7..67edfd977a40b5adb49d1aa7843c00e1e903420a 100644 (file)
--- a/src/png/scripts/makefile.linux
+++ b/src/png/scripts/makefile.linux
@@ -5,7 +5,7 @@
 
 LIBNAME = libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=gcc
@@ -83,9 +83,9 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"\"; \
-       echo ldflags=\"-L$(LIBPATH) -Wl,-rpath,$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -99,7 +99,12 @@ $(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
 $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        $(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
        -o $(LIBNAME).so.$(PNGVER) \
-       $(OBJSDLL) -L$(ZLIBLIB) -lz -lm -lc
+       $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJSDLL)
+       $(CC) -shared -Wl,-soname,libpng.so.3 \
+       -o libpng.so.3.$(PNGMIN) \
+       $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -133,18 +138,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
 
-install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc
+install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
+       libpng.so.3.$(PNGMIN)
        -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
+       -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
        -@/bin/rm -f $(DL)/libpng.so
        -@/bin/rm -f $(DL)/libpng.so.3
-       -@/bin/rm -f $(DL)/libpng.so.3.*
+       -@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
        cp $(LIBNAME).so.$(PNGVER) $(DL)
+       cp libpng.so.3.$(PNGMIN) $(DL)
        chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
+       chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
        (cd $(DL); \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -sf libpng.so.3 libpng.so; \
        ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -176,18 +184,30 @@ install-config: libpng-config
 install: install-static install-shared install-man install-config
 
 # If you installed in $(DESTDIR), test-installed won't work until you
-# move the library to its final location.
+# move the library to its final location.  Use test-dd to test it
+# before then.
+
+test-dd:
+       echo
+       echo Testing installed dynamic shared library in $(DL).
+       $(CC) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -L$(DL) -L$(ZLIBLIB) -W1, -rpath,$(DL) -Wl,-rpath,$(ZLIBLIB) \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+       ./pngtestd pngtest.png
 
 test-installed:
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
           -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs`
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngout.png libpng.pc libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti
+       /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
+       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock: