Menu
▾
▴
[opengtoolkit-cvs] lvzip/c_source Makefile,1.2,1.3 Makefile.in,1.1,1.2 configure,1.1,1.2
|
From: <lab...@us...> - 2004-03-03 13:28:14
|
Update of /cvsroot/opengtoolkit/lvzip/c_source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11433/c_source Modified Files: Makefile Makefile.in configure Log Message: Linux makefile modifications Index: Makefile =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Makefile 11 Sep 2003 22:33:15 -0000 1.2 --- Makefile 3 Mar 2004 13:15:24 -0000 1.3 *************** *** 25,29 **** CPP=$(CC) -E - #VER=1.1.4 LIBS=lvzlib.so SHAREDLIB=lvzlib.so --- 25,28 ---- *************** *** 34,41 **** SHELL=/bin/sh ! prefix =/usr/local ! exec_prefix =${prefix} ! libdir =${exec_prefix}/lib ! includedir =${prefix}/include OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ --- 33,40 ---- SHELL=/bin/sh ! prefix = /usr/local ! exec_prefix = ${prefix} ! libdir = ${exec_prefix}/lib ! includedir = ${prefix}/include OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ *************** *** 48,62 **** TEST_OBJS = example.o minigzip.o ! DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \ ! algorithm.txt zlib.3 zlib.html \ ! msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \ ! nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \ ! contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \ ! contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \ ! contrib/asm[56]86/*.S contrib/iostream/*.cpp \ ! contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \ ! contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \ ! contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \ ! contrib/delphi*/*.??? all: example minigzip --- 47,52 ---- TEST_OBJS = example.o minigzip.o ! DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] gvmat32.* \ ! mkgvmt32.bat algorithm.txt zlib.3 zlib.html zlib.rc zlibvc.* all: example minigzip *************** *** 82,90 **** rm -f _match.s ! $(SHAREDLIB): $(OBJS) ! $(LDSHARED) -o $@ $(OBJS) ! # rm -f $(SHAREDLIB) $(SHAREDLIB).1 ! # ln -s $@ $(SHAREDLIB) ! # ln -s $@ $(SHAREDLIB).1 example: example.o $(LIBS) --- 72,77 ---- rm -f _match.s ! $(SHAREDLIB): $(OBJS) $(OBJA) ! $(LDSHARED) -o $@ $(OBJS) $(OBJA) example: example.o $(LIBS) *************** *** 116,120 **** if test -f zlib.h; then \ v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ ! rm -f zlib.h zconf.h; \ fi; \ cd $(libdir); rm -f libz.a; \ --- 103,107 ---- if test -f zlib.h; then \ v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ ! rm -f zlib.h zconf.h; \ fi; \ cd $(libdir); rm -f libz.a; \ Index: Makefile.in =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/Makefile.in,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Makefile.in 4 Oct 2002 09:41:32 -0000 1.1 --- Makefile.in 3 Mar 2004 13:15:24 -0000 1.2 *************** *** 1,19 **** ! # Makefile for zlib # Copyright (C) 1995-2002 Jean-loup Gailly. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: ! # ./configure; make test ! # The call of configure is optional if you don't have special requirements ! # If you wish to build zlib as a shared library, use: ./configure -s ! ! # To install /usr/local/lib/libz.* and /usr/local/include/zlib.h, type: ! # make install ! # To install in $HOME instead of /usr/local, use: ! # make install prefix=$HOME CC=cc ! CFLAGS=-O #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG --- 1,14 ---- ! # Makefile for lvzlib # Copyright (C) 1995-2002 Jean-loup Gailly. + # Copyright (C) 2003 Rolf Kalbermatter. # For conditions of distribution and use, see copyright notice in zlib.h # To compile and test, type: ! # ./configure -s; make test ! # The call of ./configure is optional if you don't have special requirements CC=cc ! CFLAGS=-fPIC -O3 -DHAVE_UNISTD_H -DUSE_MMAP -Wall #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 #CFLAGS=-g -DDEBUG *************** *** 22,31 **** LDFLAGS=-L. -lz ! LDSHARED=$(CC) CPP=$(CC) -E ! VER=1.1.4 ! LIBS=libz.a ! SHAREDLIB=libz.so AR=ar rc --- 17,25 ---- LDFLAGS=-L. -lz ! LDSHARED=$(CC) -shared -Wl CPP=$(CC) -E ! LIBS=lvzlib.so ! SHAREDLIB=lvzlib.so AR=ar rc *************** *** 41,45 **** OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o \ ! ioapi.o zip.o unzip.o OBJA = --- 35,39 ---- OBJS = adler32.o compress.o crc32.o gzio.o uncompr.o deflate.o trees.o \ zutil.o inflate.o infblock.o inftrees.o infcodes.o infutil.o inffast.o \ ! ioapi.o macbin.o zip.o unzip.o OBJA = *************** *** 48,62 **** TEST_OBJS = example.o minigzip.o ! DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] *.mms \ ! algorithm.txt zlib.3 zlib.html \ ! msdos/Make*[a-z0-9] msdos/zlib.def msdos/zlib.rc \ ! nt/Make*[a-z0-9] nt/zlib.dnt amiga/Make*.??? os2/M*.os2 os2/zlib.def \ ! contrib/RE*.contrib contrib/*.txt contrib/asm386/*.asm contrib/asm386/*.c \ ! contrib/asm386/*.bat contrib/asm386/zlibvc.d?? contrib/asm[56]86/*.?86 \ ! contrib/asm[56]86/*.S contrib/iostream/*.cpp \ ! contrib/iostream/*.h contrib/iostream2/*.h contrib/iostream2/*.cpp \ ! contrib/untgz/Makefile contrib/untgz/*.c contrib/untgz/*.w32 \ ! contrib/minizip/[CM]*[pe] contrib/minizip/*.[ch] contrib/minizip/*.[td]?? \ ! contrib/delphi*/*.??? all: example minigzip --- 42,47 ---- TEST_OBJS = example.o minigzip.o ! DISTFILES = README FAQ INDEX ChangeLog configure Make*[a-z0-9] *.[ch] gvmat32.* \ ! mkgvmt32.bat algorithm.txt zlib.3 zlib.html zlib.rc zlibvc.* all: example minigzip *************** *** 72,76 **** fi ! libz.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 --- 57,61 ---- fi ! lvzlib.a: $(OBJS) $(OBJA) $(AR) $@ $(OBJS) $(OBJA) -@ ($(RANLIB) $@ || true) >/dev/null 2>&1 *************** *** 82,90 **** rm -f _match.s ! $(SHAREDLIB).$(VER): $(OBJS) $(LDSHARED) -o $@ $(OBJS) - rm -f $(SHAREDLIB) $(SHAREDLIB).1 - ln -s $@ $(SHAREDLIB) - ln -s $@ $(SHAREDLIB).1 example: example.o $(LIBS) --- 67,72 ---- rm -f _match.s ! $(SHAREDLIB): $(OBJS) $(LDSHARED) -o $@ $(OBJS) example: example.o $(LIBS) *************** *** 116,120 **** if test -f zlib.h; then \ v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ ! rm -f zlib.h zconf.h; \ fi; \ cd $(libdir); rm -f libz.a; \ --- 98,102 ---- if test -f zlib.h; then \ v=`sed -n '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`; \ ! rm -f zlib.h zconf.h; \ fi; \ cd $(libdir); rm -f libz.a; \ *************** *** 149,153 **** mv Makefile~ Makefile ! tags: etags *.[ch] --- 131,135 ---- mv Makefile~ Makefile ! tags: etags *.[ch] *************** *** 171,174 **** --- 153,157 ---- inftrees.o: zutil.h zlib.h zconf.h inftrees.h infutil.o: zutil.h zlib.h zconf.h infblock.h inftrees.h infcodes.h infutil.h + macbin.o: zlib.h macbin.h minigzip.o: zlib.h zconf.h trees.o: deflate.h zutil.h zlib.h zconf.h trees.h Index: configure =================================================================== RCS file: /cvsroot/opengtoolkit/lvzip/c_source/configure,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** configure 4 Oct 2002 09:41:32 -0000 1.1 --- configure 3 Mar 2004 13:15:24 -0000 1.2 *************** *** 1,7 **** #!/bin/sh ! # configure script for zlib. This script is needed only if ! # you wish to build a shared library and your system supports them, ! # of if you need special compiler, flags or install directory. ! # Otherwise, you can just use directly "make test; make install" # # To create a shared library, use "configure --shared"; by default a static --- 1,6 ---- #!/bin/sh ! # configure script for lvzlib. This script is needed only if you ! # wish to build a shared library using a special compiler, or flags. ! # Otherwise, you can just use directly "make" # # To create a shared library, use "configure --shared"; by default a static *************** *** 73,77 **** CFLAGS="$cflags" case `(uname -s || echo unknown) 2>/dev/null` in ! Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,libz.so.1"};; *) LDSHARED=${LDSHARED-"gcc -shared"};; esac --- 72,76 ---- CFLAGS="$cflags" case `(uname -s || echo unknown) 2>/dev/null` in ! Linux | linux) LDSHARED=${LDSHARED-"gcc -shared -Wl,-soname,lvzlib.so"};; *) LDSHARED=${LDSHARED-"gcc -shared"};; esac *************** *** 96,108 **** LDSHARED=${LDSHARED-"cc -shared"};; QNX*) SFLAGS=${CFLAGS-"-4 -O"} ! CFLAGS=${CFLAGS-"-4 -O"} LDSHARED=${LDSHARED-"cc"} ! RANLIB=${RANLIB-"true"} ! AR="cc -A";; SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} CFLAGS=${CFLAGS-"-O3"} LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} ! CFLAGS=${CFLAGS-"-fast -xcg89"} LDSHARED=${LDSHARED-"cc -G"};; SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} --- 95,107 ---- LDSHARED=${LDSHARED-"cc -shared"};; QNX*) SFLAGS=${CFLAGS-"-4 -O"} ! CFLAGS=${CFLAGS-"-4 -O"} LDSHARED=${LDSHARED-"cc"} ! RANLIB=${RANLIB-"true"} ! AR="cc -A";; SCO_SV\ 3.2*) SFLAGS=${CFLAGS-"-O3 -dy -KPIC "} CFLAGS=${CFLAGS-"-O3"} LDSHARED=${LDSHARED-"cc -dy -KPIC -G"};; SunOS\ 5*) SFLAGS=${CFLAGS-"-fast -xcg89 -KPIC -R."} ! CFLAGS=${CFLAGS-"-fast -xcg89"} LDSHARED=${LDSHARED-"cc -G"};; SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"} *************** *** 133,137 **** echo Building shared library $SHAREDLIB.$VER with $CC. elif test -z "$old_cc" -a -z "$old_cflags"; then ! echo No shared library suppport. shared=0; else --- 132,136 ---- echo Building shared library $SHAREDLIB.$VER with $CC. elif test -z "$old_cc" -a -z "$old_cflags"; then ! echo No shared library support. shared=0; else |
