moved wxWindow::GetBestSize implementation into DoGetBestSize to make it easier to...

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

diff --git a/src/png/scripts/makefile.so9 b/src/png/scripts/makefile.so9
index 0713b9798a3ced58f69c3c874522676f5829a527..c907deda91078a3316b474b57fdc5306dd62a991 100644 (file)
--- a/src/png/scripts/makefile.so9
+++ b/src/png/scripts/makefile.so9
@@ -34,7 +34,7 @@ LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
 RANLIB=echo
 
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 LIBNAME = libpng12
 
@@ -81,9 +81,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) -R$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -107,8 +107,12 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        echo; \
        ;; \
        esac
-       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+       $(LD) -G -h $(LIBNAME).so.$(PNGMAJ) \
+        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(LD) -G -h libpng.so.3 \
+        -o libpng.so.3.$(PNGMIN) $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -132,18 +136,21 @@ install-static: install-headers libpng.a
        -@/bin/rm -f $(DL)/libpng.a
        (cd $(DL); ln -f -s $(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 -f -s $(LIBNAME).so.$(PNGVER) libpng.so; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3; \
-       ln -f -s $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
+       ln -f -s libpng.so.3.$(PNGMIN) libpng.so.3; \
+       ln -f -s libpng.so.3 libpng.so; \
        ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
        ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
        -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
@@ -170,25 +177,37 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
-       (cd $(DB); ln -sf $(LIBNAME)-config libpng-config)
+       (cd $(DB); ln -f -s $(LIBNAME)-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 \
+          -o pngtestd `$(BINPATH)/libpng12-config --ldflags` \
+          -L$(DL) -L$(ZLIBLIB)  -R$(ZLIBLIB) -R$(DL)
+       ./pngtestd pngtest.png
 
 test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) -I$(ZLIBINC) \
-          `$(BINPATH)/libpng12-config --cppflags --cflags` pngtest.c \
-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags --libs` \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtesti `$(BINPATH)/libpng12-config --ldflags` \
           -L$(ZLIBLIB) -R$(ZLIBLIB)
        ./pngtesti pngtest.png
 
 clean:
-       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png libpng.pc \
-       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)*
+       /bin/rm -f *.o libpng.a pngtest pngtesti pngout.png \
+       libpng-config $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* \
+       libpng.so.3.$(PNGMIN) \
+       libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
 writelock: