reverted Robert's over-optimisation, correct fix coming soon

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

diff --git a/src/png/makefile.wat b/src/png/makefile.wat
index c6c6c8ae483126cf0b23fb29190387d869aa05ef..8d5b96706fddc22ab311bd00d4fcb7695dcf3273 100644 (file)
--- a/src/png/makefile.wat
+++ b/src/png/makefile.wat
@@ -3,6 +3,7 @@
 # File:                makefile.wat
 # Author:      Julian Smart
 # Created:     1998
+# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #
 # Makefile : Builds PNG library for Watcom C++, WIN32
 
@@ -13,25 +14,42 @@ EXTRACPPFLAGS=-i=..\zlib
 
 WXLIB = $(WXDIR)\lib
 
-LIBTARGET   = $(WXLIB)\png.lib
-
-OBJECTS = png.obj pngread.obj pngrtran.obj pngrutil.obj &
- pngpread.obj pngtrans.obj pngwrite.obj pngwtran.obj pngwutil.obj &
- pngerror.obj pngmem.obj pngwio.obj pngrio.obj pngget.obj pngset.obj
-
-all:        $(OBJECTS) $(LIBTARGET)
-
+LIBTARGET = $(WXLIB)\png$(WATCOM_SUFFIX).lib
+
+OBJECTS = &
+    $(OUTPUTDIR)\png.obj &
+    $(OUTPUTDIR)\pngread.obj &
+    $(OUTPUTDIR)\pngrtran.obj &
+    $(OUTPUTDIR)\pngrutil.obj &
+    $(OUTPUTDIR)\pngpread.obj &
+    $(OUTPUTDIR)\pngtrans.obj &
+    $(OUTPUTDIR)\pngwrite.obj &
+    $(OUTPUTDIR)\pngwtran.obj &
+    $(OUTPUTDIR)\pngwutil.obj &
+    $(OUTPUTDIR)\pngerror.obj &
+    $(OUTPUTDIR)\pngmem.obj &
+    $(OUTPUTDIR)\pngwio.obj &
+    $(OUTPUTDIR)\pngrio.obj &
+    $(OUTPUTDIR)\pngget.obj &
+    $(OUTPUTDIR)\pngset.obj
+
+all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
+
+$(OUTPUTDIR):
+       @if not exist $^@ mkdir $^@
+
+LBCFILE=$(OUTPUTDIR)\png.lbc
 $(LIBTARGET) : $(OBJECTS)
-    %create tmp.lbc
-    @for %i in ( $(OBJECTS) ) do @%append tmp.lbc +%i
-    wlib /b /c /n /p=512 $^@ @tmp.lbc
+    %create $(LBCFILE)
+    @for %i in ( $(OBJECTS) ) do @%append $(LBCFILE) +%i
+    wlib /q /b /c /n /p=512 $^@ @$(LBCFILE)
 
 clean:   .SYMBOLIC
-    -erase *.obj
+    -erase $(OUTPUTDIR)\*.obj
     -erase $(LIBTARGET)
-    -erase *.pch
-    -erase *.err
-    -erase *.lbc
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.lbc
 
 cleanall:   clean