Removed extraneous semicolons and commas (partly fixes #10456).

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

diff --git a/src/png/scripts/makefile.sco b/src/png/scripts/makefile.sco
index b37e72dd5d51b491e1af50063a7707afc8e4693c..ea9986710bc8acc00acd0c09e60d44d2a935e882 100644 (file)
--- a/src/png/scripts/makefile.sco
+++ b/src/png/scripts/makefile.sco
@@ -1,15 +1,36 @@
 # makefile for SCO OSr5  ELF and Unixware 7 with Native cc
 # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
 #   force ELF build dynamic linking, SONAME setting in lib and RPATH in app
 # makefile for SCO OSr5  ELF and Unixware 7 with Native cc
 # Contributed by Mike Hopkirk (hops@sco.com) modified from Makefile.lnx
 #   force ELF build dynamic linking, SONAME setting in lib and RPATH in app

-# Copyright (C) 2002 Glenn Randers-Pehrson
+# Copyright (C) 2002, 2006 Glenn Randers-Pehrson

 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h
 
 # Copyright (C) 1998 Greg Roelofs
 # Copyright (C) 1996, 1997 Andreas Dilger
 # For conditions of distribution and use, see copyright notice in png.h
 

+# Library name:
+LIBNAME = libpng12
+PNGMAJ = 0
+PNGMIN = 1.2.34
+PNGVER = $(PNGMAJ).$(PNGMIN)
+
+# Shared library names:
+LIBSO=$(LIBNAME).so
+LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
+LIBSOVER=$(LIBNAME).so.$(PNGVER)
+OLDSO=libpng.so
+OLDSOMAJ=libpng.so.3
+OLDSOVER=libpng.so.3.$(PNGMIN)
+
+# Utilities:

 CC=cc
 CC=cc

+AR_RC=ar rc
+MKDIR_P=mkdir
+LN_SF=ln -f -s
+RANLIB=echo
+RM_F=/bin/rm -f

 
 

-# where make install puts libpng.a, libpng.so*, and png.h
+# where make install puts libpng.a, $(OLDSO)*, and png.h

 prefix=/usr/local
 prefix=/usr/local

+exec_prefix=$(prefix)

 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib
 
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib


@@ -17,21 +38,13 @@ prefix=/usr/local
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 
 ZLIBLIB=../zlib
 ZLIBINC=../zlib
 

-CFLAGS= -dy -belf -I$(ZLIBINC) -O3
+CFLAGS= -dy -belf -I$(ZLIBINC) -O3 -DPNG_NO_MMX_CODE

 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 

-#RANLIB=ranlib
-RANLIB=echo
-
-PNGMAJ = 0
-PNGMIN = 1.2.7
-PNGVER = $(PNGMAJ).$(PNGMIN)
-LIBNAME = libpng12
-

 INCPATH=$(prefix)/include/libpng
 INCPATH=$(prefix)/include/libpng

-LIBPATH=$(prefix)/lib
+LIBPATH=$(exec_prefix)/lib

 MANPATH=$(prefix)/man
 MANPATH=$(prefix)/man

-BINPATH=$(prefix)/bin
+BINPATH=$(exec_prefix)/bin

 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:
 
 # override DESTDIR= on the make install command line to easily support
 # installing into a temporary location.  Example:


@@ -59,14 +72,18 @@ OBJSDLL = $(OBJS:.o=.pic.o)
 .c.pic.o:
        $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
 
 .c.pic.o:
        $(CC) -c $(CFLAGS) -KPIC -o $@ $*.c
 

-all: libpng.a $(LIBNAME).so pngtest libpng.pc libpng-config
+all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config

 
 libpng.a: $(OBJS)
 
 libpng.a: $(OBJS)

-       ar rc $@ $(OBJS)
+       $(AR_RC) $@ $(OBJS)

        $(RANLIB) $@
 
 libpng.pc:
        $(RANLIB) $@
 
 libpng.pc:

-       cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
+       cat scripts/libpng.pc.in | sed -e s!@prefix@!$(prefix)! \
+       -e s!@exec_prefix@!$(exec_prefix)! \
+       -e s!@libdir@!$(LIBPATH)! \
+       -e s!@includedir@!$(INCPATH)! \
+       -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc

 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \
 
 libpng-config:
        ( cat scripts/libpng-config-head.in; \


@@ -78,86 +95,86 @@ libpng-config:
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 
        cat scripts/libpng-config-body.in ) > libpng-config
        chmod +x libpng-config
 

-$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
-       ln -f -s $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
+$(LIBSO): $(LIBSOMAJ)
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO)

 
 

-$(LIBNAME).so.$(PNGMAJ): $(LIBNAME).so.$(PNGVER)
-       ln -f -s $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
+$(LIBSOMAJ): $(LIBSOVER)
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)

 
 

-$(LIBNAME).so.$(PNGVER): $(OBJSDLL)
-       $(CC) -G  -Wl,-h,$(LIBNAME).so.$(PNGMAJ) -o $(LIBNAME).so.$(PNGVER) \
+$(LIBSOVER): $(OBJSDLL)
+       $(CC) -G  -Wl,-h,$(LIBSOMAJ) -o $(LIBSOVER) \

         $(OBJSDLL)
 
         $(OBJSDLL)
 

-libpng.so.3.$(PNGMIN): $(OBJSDLL)
-       $(CC) -G  -Wl,-h,libpng.so.3 -o libpng.so.3.$(PNGMIN) \
+$(OLDSOVER): $(OBJSDLL)
+       $(CC) -G  -Wl,-h,$(OLDSOMAJ) -o $(OLDSOVER) \

        $(OBJSDLL)
 
        $(OBJSDLL)
 

-pngtest: pngtest.o $(LIBNAME).so
+pngtest: pngtest.o $(LIBSO)

        LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
        ./pngtest
 
 install-headers: png.h pngconf.h
        LD_RUN_PATH=.:$(ZLIBLIB) $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
 
 test: pngtest
        ./pngtest
 
 install-headers: png.h pngconf.h

-       -@if [ ! -d $(DI) ]; then mkdir $(DI); fi
-       -@if [ ! -d $(DI)/$(LIBNAME) ]; then mkdir $(DI)/$(LIBNAME); fi
-       -@/bin/rm -f $(DI)/png.h
-       -@/bin/rm -f $(DI)/pngconf.h
+       -@if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+       -@if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
+       -@$(RM_F) $(DI)/png.h
+       -@$(RM_F) $(DI)/pngconf.h

        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
        cp png.h pngconf.h $(DI)/$(LIBNAME)
        chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h

-       -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
-       -@/bin/rm -f $(DI)/libpng
-       (cd $(DI); ln -f -s $(LIBNAME) libpng; ln -f -s $(LIBNAME)/* .)
+       -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
+       -@$(RM_F) $(DI)/libpng
+       (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)

 
 install-static: install-headers libpng.a
 
 install-static: install-headers libpng.a

-       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi

        cp libpng.a $(DL)/$(LIBNAME).a
        chmod 644 $(DL)/$(LIBNAME).a
        cp libpng.a $(DL)/$(LIBNAME).a
        chmod 644 $(DL)/$(LIBNAME).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 \
-       libpng.so.3.$(PNGMIN)
-       -@if [ ! -d $(DL) ]; then mkdir $(DL); fi
-       -@/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.$(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)
+       -@$(RM_F) $(DL)/libpng.a
+       (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
+
+install-shared: install-headers $(LIBSOVER) libpng.pc \
+       $(OLDSOVER)
+       -@if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+       -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
+       -@$(RM_F) $(DL)/$(LIBSOMAJ)
+       -@$(RM_F) $(DL)/$(OLDSO)
+       -@$(RM_F) $(DL)/$(OLDSOMAJ)
+       -@$(RM_F) $(DL)/$(OLDSOVER)*
+       cp $(LIBSOVER) $(DL)
+       cp $(OLDSOVER) $(DL)
+       chmod 755 $(DL)/$(LIBSOVER)
+       chmod 755 $(DL)/$(OLDSOVER)

        (cd $(DL); \
        (cd $(DL); \

-       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
-       -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
-       -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
+       $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
+       $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
+       $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
+       $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+       -@if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
+       -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
+       -@$(RM_F) $(DL)/pkgconfig/libpng.pc

        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
        chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
        cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
        chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc

-       (cd $(DL)/pkgconfig; ln -f -s $(LIBNAME).pc libpng.pc)
+       (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)

 
 install-man: libpng.3 libpngpf.3 png.5
 
 install-man: libpng.3 libpngpf.3 png.5

-       -@if [ ! -d $(DM) ]; then mkdir $(DM); fi
-       -@if [ ! -d $(DM)/man3 ]; then mkdir $(DM)/man3; fi
-       -@/bin/rm -f $(DM)/man3/libpng.3
-       -@/bin/rm -f $(DM)/man3/libpngpf.3
+       -@if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+       -@if [ ! -d $(DM)/man3 ]; then $(MKDIR_P) $(DM)/man3; fi
+       -@$(RM_F) $(DM)/man3/libpng.3
+       -@$(RM_F) $(DM)/man3/libpngpf.3

        cp libpng.3 $(DM)/man3
        cp libpngpf.3 $(DM)/man3
        cp libpng.3 $(DM)/man3
        cp libpngpf.3 $(DM)/man3

-       -@if [ ! -d $(DM)/man5 ]; then mkdir $(DM)/man5; fi
-       -@/bin/rm -f $(DM)/man5/png.5
+       -@if [ ! -d $(DM)/man5 ]; then $(MKDIR_P) $(DM)/man5; fi
+       -@$(RM_F) $(DM)/man5/png.5

        cp png.5 $(DM)/man5
 
 install-config: libpng-config
        cp png.5 $(DM)/man5
 
 install-config: libpng-config

-       -@if [ ! -d $(DB) ]; then mkdir $(DB); fi
-       -@/bin/rm -f $(DB)/libpng-config
-       -@/bin/rm -f $(DB)/$(LIBNAME)-config
+       -@if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+       -@$(RM_F) $(DB)/libpng-config
+       -@$(RM_F) $(DB)/$(LIBNAME)-config

        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config
        cp libpng-config $(DB)/$(LIBNAME)-config
        chmod 755 $(DB)/$(LIBNAME)-config

-       (cd $(DB); ln -f -s $(LIBNAME)-config libpng-config)
+       (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)

 
 install: install-static install-shared install-man install-config
 
 
 install: install-static install-shared install-man install-config
 


@@ -169,22 +186,22 @@ test-dd:
        echo
        echo Testing installed dynamic shared library in $(DL).
        $(CC) -I$(DI) $(CFLAGS) \
        echo
        echo Testing installed dynamic shared library in $(DL).
        $(CC) -I$(DI) $(CFLAGS) \

-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \

           -L$(DL) -L$(ZLIBLIB) \
           -L$(DL) -L$(ZLIBLIB) \

-          -o pngtestd `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtestd `$(BINPATH)/$(LIBNAME)-config --ldflags`

        ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \
        ./pngtestd pngtest.png
 
 test-installed:
        $(CC) $(CFLAGS) \

-          `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+          `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \

           -L$(ZLIBLIB) \
           -L$(ZLIBLIB) \

-          -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+          -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`

        ./pngtesti pngtest.png
 
 clean:
        ./pngtesti pngtest.png
 
 clean:

-       /bin/rm -f *.o libpng.a pngtest pngout.png libpng-config \
-       $(LIBNAME).so $(LIBNAME).so.$(PNGMAJ)* pngtest-static pngtesti \
-       libpng.so.3.$(PNGMIN) \
+       $(RM_F) *.o libpng.a pngtest pngout.png libpng-config \
+       $(LIBSO) $(LIBSOMAJ)* pngtest-static pngtesti \
+       $(OLDSOVER) \

        libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO
        libpng.pc
 
 DOCS = ANNOUNCE CHANGES INSTALL KNOWNBUG LICENSE README TODO Y2KINFO