1 --- unzip-5.51/unix/Makefile.orig 2004-03-01 18:37:24.000000000 +0100
2 +++ unzip-5.51/unix/Makefile 2004-06-08 09:51:27.353336136 +0200
5 'which is UnZip linked with the DLL). This target is an example only.'
7 - $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUNIX $(LOC)"
8 + $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL -DUNIX $(LOC)"
9 gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
10 $(RM) libunzip.so.0 libunzip.so
11 $(LN) -s libunzip.so.0.4 libunzip.so.0
14 @echo 'NOTE: use bsdi_noasm target for non-Intel BSD/OS compiles.'
15 $(MAKE) unzips CC=gcc2 LD=shlicc2 AS=gcc2\
16 - CF="-O3 -Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)" CRC32=crc_gcc
17 + CF="-Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)" CRC32=crc_gcc
21 # @echo 'NOTE: use bsd target for non-Intel BSD/OS compiles.'
22 $(MAKE) unzips CC=gcc2 LD=shlicc2 AS=gcc2\
23 - CF="-O3 -Wall -I. -DUNIX -DBSD $(LOC)"
24 + CF="-Wall -I. -DUNIX -DBSD $(LOC)"
26 # Coherent 3.x/4.x, Mark Williams C. ``For Coherent's CC, it needs either
27 # -T0 or -T150000 (or bigger) added to the CFLAGS, otherwise the compiler
30 @echo 'NOTE: use bsd target for non-Intel FreeBSD compiles (if any).'
31 $(MAKE) unzips CC=gcc LD=gcc AS=gcc\
32 - CF="-O3 -Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)"\
33 + CF="-Wall -I. -DASM_CRC -DUNIX -DBSD $(LOC)"\
34 AF="-Di386 $(AF)" CRC32=crc_gcc
36 # Generic BSDish Unix gcc. ``The -O3 only works with later versions of gcc;
38 # with "echo" instead).
41 - $(MAKE) unzips CC=gcc LD=gcc CF="-O3 -I. $(LOC)" LF2=""
42 + $(MAKE) unzips CC=gcc LD=gcc CF="-I. $(LOC)" LF2=""
45 # Heurikon HK68 (68010), UniPlus+ System V 5.0, Green Hills C-68000
48 $(MAKE) unzips AS=gcc CC=gcc LD=gcc CRC32=crc_gcc LF="-shlib $(LF)" \
49 SL="-shlib $(SL)" FL="-shlib $(FL)" \
50 - LF2="" CF="-O3 -I. -DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM $(LOC)" \
51 + LF2="" CF="-I. -DSYSV -DASM_CRC -DNO_UID_GID -DNEED_PTEM $(LOC)" \
52 AF="-DNO_UNDERLINE -Djecxz=jcxz -DALIGNMENT='.align 16' $(AF)"
57 @echo 'NOTE: use linux_noasm target for non-Intel Linux compiles.'
58 $(MAKE) unzips CC=gcc LD=gcc AS=gcc\
59 - CF="-O3 -Wall -I. -DASM_CRC $(LOC)"\
60 - AF="-Di386 $(AF)" CRC32=crc_gcc
61 + CF="-Wall -I. -DASM_CRC $(LOC) $(CFLAGS)"\
62 + AF="-Di386 $(AF) $(LDFLAGS)" CRC32=crc_gcc
63 # GRR: this echo is pointless; if user gets this far, no difference to install
64 # @echo 'Be sure to use the install_asm target rather than the install target'
67 # (or -O2 or -O) is ignored. [GRR 960828: test target only]
70 - $(MAKE) unzips CC=lcc LD=lcc CF="-O3 -Wall -I. -D__inline__= $(LOC)"
71 + $(MAKE) unzips CC=lcc LD=lcc CF="-Wall -I. -D__inline__= $(LOC)"
73 # Linux host with go32 (djgpp) cross-compiler (go32crs.tgz) for 32-bit DOS.
78 linux_shlib: unix_make
79 -# $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL $(LOC)"
80 - $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DASM_CRC $(LOC)"\
81 +# $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL $(LOC)"
82 + $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL -DASM_CRC $(LOC)"\
83 AS=gcc AF="-fPIC -Di386 $(AF)" CRC32=crc_gcc
84 ln -sf crc_gcc.pic.o crc32.pic.o
85 gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
87 # Linux ELF shared library, as above, but using inflate() from zlib (libz.so)
88 # instead of the original UnZip version. (libz was libgz prior to 0.94)
89 linux_shlibz: unix_make
90 -# $(MAKE) objsdll CC=gcc CF="-O3 -Wall -I. -fPIC -DDLL -DUSE_ZLIB $(LOC)"
91 +# $(MAKE) objsdll CC=gcc CF="-Wall -I. -fPIC -DDLL -DUSE_ZLIB $(LOC)"
92 $(MAKE) objsdll CC=gcc AS=gcc AF="-fPIC -Di386 $(AF)" CRC32=crc_gcc\
93 - CF="-O3 -Wall -I. -fPIC -DDLL -DUSE_ZLIB -DASM_CRC $(LOC)"
94 + CF="-Wall -I. -fPIC -DDLL -DUSE_ZLIB -DASM_CRC $(LOC)"
95 ln -sf crc_gcc.pic.o crc32.pic.o
96 gcc -shared -Wl,-soname,libunzip.so.0 -o libunzip.so.0.4 $(OBJSDLL)
97 ln -sf libunzip.so.0.4 libunzip.so.0