linking fixes

[wxWidgets.git] / src / zlib / makefile.wat

diff --git a/src/zlib/makefile.wat b/src/zlib/makefile.wat
index e8ee232db440486835005d78aacdff56aa47c804..8b6dab6273bb7f972cd02dff21d911faef309ad3 100644 (file)
--- a/src/zlib/makefile.wat
+++ b/src/zlib/makefile.wat
@@ -29,7 +29,9 @@ OBJP1=adler32$(O)+compress$(O)+crc32$(O)+gzio$(O)+uncompr$(O)+deflate$(O)
 OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
 OBJP3=infutil$(O)+inffast$(O)
 
 OBJP2=trees$(O)+zutil$(O)+inflate$(O)+infblock$(O)+inftrees$(O)+infcodes$(O)
 OBJP3=infutil$(O)+inffast$(O)
 

-all: test
+# all: test
+
+all: $(LIBTARGET)

 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
        $(CC) $(CFLAGS) $*.c
 
 adler32.obj: adler32.c zutil.h zlib.h zconf.h
        $(CC) $(CFLAGS) $*.c


@@ -83,7 +85,7 @@ minigzip.obj: minigzip.c zlib.h zconf.h
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 $(LIBTARGET): $(OBJ1) $(OBJ2) $(OBJ3) 
 
 # we must cut the command line to fit in the MS/DOS 128 byte limit:
 $(LIBTARGET): $(OBJ1) $(OBJ2) $(OBJ3) 

-       del $(LIBTARGET)
+       if exist $(LIBTARGET) del $(LIBTARGET)

        $(LIB) $(LIBTARGET) +$(OBJP1)
        $(LIB) $(LIBTARGET) +$(OBJP2)
        $(LIB) $(LIBTARGET) +$(OBJP3)
        $(LIB) $(LIBTARGET) +$(OBJP1)
        $(LIB) $(LIBTARGET) +$(OBJP2)
        $(LIB) $(LIBTARGET) +$(OBJP3)


@@ -99,7 +101,7 @@ test: minigzip.exe example.exe
        echo hello world | minigzip | minigzip -d >test
        type test
 
        echo hello world | minigzip | minigzip -d >test
        type test
 

-clean:
+clean: .SYMBOLIC

        -erase *.obj
        -erase *.exe
         -erase $(LIBTARGET)
        -erase *.obj
        -erase *.exe
         -erase $(LIBTARGET)