diff options
| author | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-02-23 16:00:23 +0000 |
|---|---|---|
| committer | Ralf Corsepius <ralf.corsepius@rtems.org> | 2010-02-23 16:00:23 +0000 |
| commit | 44b3802abbd930492c3331a50d84ccdc469baf04 (patch) | |
| tree | 4513ab9212d239fe2a6124a9fe2022f6fd40bcd0 /cpukit/zlib/win32 | |
| parent | Import from zlib-1.2.4 (diff) | |
| download | rtems-44b3802abbd930492c3331a50d84ccdc469baf04.tar.bz2 | |
Import from zlib-1.2.4
Diffstat (limited to 'cpukit/zlib/win32')
| -rw-r--r-- | cpukit/zlib/win32/Makefile.gcc | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/cpukit/zlib/win32/Makefile.gcc b/cpukit/zlib/win32/Makefile.gcc index 62a8430156..abe3d5a365 100644 --- a/cpukit/zlib/win32/Makefile.gcc +++ b/cpukit/zlib/win32/Makefile.gcc @@ -45,6 +45,8 @@ ARFLAGS = rcs RC = windres RCFLAGS = --define GCC_WINDRES +STRIP = strip + CP = cp -fp # If GNU install is available, replace $(CP) with install. INSTALL = $(CP) @@ -53,17 +55,17 @@ RM = rm -f prefix = /usr/local exec_prefix = $(prefix) -OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \ - inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o +OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \ + gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o OBJA = -all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example minigzip example_d minigzip_d +all: $(STATICLIB) $(SHAREDLIB) $(IMPLIB) example.exe minigzip.exe example_d.exe minigzip_d.exe -test: example minigzip +test: example.exe minigzip.exe ./example echo hello world | ./minigzip | ./minigzip -d -testdll: example_d minigzip_d +testdll: example_d.exe minigzip_d.exe ./example_d echo hello world | ./minigzip_d | ./minigzip_d -d @@ -79,20 +81,20 @@ $(STATICLIB): $(OBJS) $(OBJA) $(IMPLIB): $(SHAREDLIB) $(SHAREDLIB): win32/zlib.def $(OBJS) $(OBJA) zlibrc.o - dllwrap --driver-name $(CC) --def win32/zlib.def \ - --implib $(IMPLIB) -o $@ $(OBJS) $(OBJA) zlibrc.o - strip $@ + $(CC) -shared -Wl,--out-implib,$(IMPLIB) \ + -o $@ win32/zlib.def $(OBJS) $(OBJA) zlibrc.o + $(STRIP) $@ -example: example.o $(STATICLIB) +example.exe: example.o $(STATICLIB) $(LD) $(LDFLAGS) -o $@ example.o $(STATICLIB) -minigzip: minigzip.o $(STATICLIB) +minigzip.exe: minigzip.o $(STATICLIB) $(LD) $(LDFLAGS) -o $@ minigzip.o $(STATICLIB) -example_d: example.o $(IMPLIB) +example_d.exe: example.o $(IMPLIB) $(LD) $(LDFLAGS) -o $@ example.o $(IMPLIB) -minigzip_d: minigzip.o $(IMPLIB) +minigzip_d.exe: minigzip.o $(IMPLIB) $(LD) $(LDFLAGS) -o $@ minigzip.o $(IMPLIB) zlibrc.o: win32/zlib1.rc @@ -130,7 +132,10 @@ compress.o: zlib.h zconf.h crc32.o: crc32.h zlib.h zconf.h deflate.o: deflate.h zutil.h zlib.h zconf.h example.o: zlib.h zconf.h -gzio.o: zutil.h zlib.h zconf.h +gzclose.o: zlib.h zconf.h gzguts.h +gzlib.o: zlib.h zconf.h gzguts.h +gzread.o: zlib.h zconf.h gzguts.h +gzwrite.o: zlib.h zconf.h gzguts.h inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |