going back to 16x16 standard size

[wxWidgets.git] / src / png / scripts / makefile.32sunu

diff --git a/src/png/scripts/makefile.32sunu b/src/png/scripts/makefile.32sunu
index de7c4b1c1ba3f9a2d306a38cd70151d9bb09c3a1..2ace57fb44ba56be7b5dc8c16c92f7fcd8e3ad3b 100644 (file)
--- a/src/png/scripts/makefile.32sunu
+++ b/src/png/scripts/makefile.32sunu
@@ -26,14 +26,14 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \
        -Wstrict-prototypes -Wmissing-prototypes #-Wconversion
 CFLAGS=-I$(ZLIBINC) $(SUN_CC_FLAGS) \
        # $(WARNMORE) -g -DPNG_DEBUG=5
-LDFLAGS=-L. -R. $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm
+LDFLAGS=$(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB) libpng.a -lz -lm
 
 #RANLIB=ranlib
 RANLIB=echo
 
 LIBNAME=libpng12
 PNGMAJ = 0
-PNGMIN = 1.2.4
+PNGMIN = 1.2.7
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
@@ -79,9 +79,12 @@ libpng.pc:
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
        echo prefix=\"$(prefix)\"; \
-       echo cppflags=\"-I$(INCPATH)/$(LIBNAME)\"; \
-       echo cflags=\"-xtarget=ultra\"; \
-       echo ldflags=\"-xtarget=ultra -L$(LIBPATH) -R$(LIBPATH)\"; \
+       echo libdir=\"$(LIBPATH)\"; \
+       echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
+       echo L_opts=\"-L$(LIBPATH)\"; \
+       echo R_opts=\"-R$(LIBPATH)\"; \
+       echo ccopts=\"-xtarget=ultra\"; \
+       echo ldopts=\"-xtarget=ultra\"; \
        echo libs=\"-lpng12 -lz -lm\"; \
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
@@ -106,7 +109,11 @@ $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
        ;; \
        esac
        $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h $(LIBNAME).so.$(PNGMAJ) \
-        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL) -lz
+        -o $(LIBNAME).so.$(PNGVER) $(OBJSDLL)
+
+libpng.so.3.$(PNGMIN): $(OBJS)
+       $(LD) -G -L$(ZLIBLIB) -R$(ZLIBLIB) -h libpng.so.3 \
+        -o libpng.so.3.$(PNGMIN)  $(OBJSDLL)
 
 pngtest: pngtest.o $(LIBNAME).so
        $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
@@ -130,21 +137,24 @@ 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.$(PNGVER)*
        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
+       -@if [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig; fi
        -@/bin/rm -f $(DL)/pkgconfig/libpng12.pc
        -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
        cp libpng.pc $(DL)/pkgconfig/libpng12.pc
@@ -168,25 +178,37 @@ install-config: libpng-config
        -@/bin/rm -f $(DB)/libpng12-config
        cp libpng-config $(DB)/libpng12-config
        chmod 755 $(DB)/libpng12-config
-       (cd $(DB); ln -sf libpng12-config libpng-config)
+       (cd $(DB); ln -f -s libpng12-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) $(SUN_CC_FLAGS) -I$(DI) -I$(ZLIBINC) \
+          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          -o pngtestd -L$(DL) -R$(DL) `$(BINPATH)/libpng12-config --ldflags` \
+          $(SUN_LD_FLAGS) -L$(ZLIBLIB) -R$(ZLIBLIB)
+       ./pngtestd pngtest.png
 
 test-installed:
        echo
        echo Testing installed dynamic shared library.
        $(CC) $(SUN_CC_FLAGS) -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` \
           $(SUN_LD_FLAGS) -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: