Hopefully fixed library names generated by wx-config for OS/2's PM port.

[wxWidgets.git] / src / makelib.wat

diff --git a/src/makelib.wat b/src/makelib.wat
index 74cc16dc7bb7e312b24a96f9455e602292c33d05..110f0398a5ec36ade09b89273aac04f93e3971d9 100644 (file)
--- a/src/makelib.wat
+++ b/src/makelib.wat
@@ -1,26 +1,41 @@
-WXDIR = $(%WXWIN)
+#
+# Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
+#
+
+
+THISDIR = $+ $(%cdrive):$(%cwd) $-
+# set OUTPUTDIR to the directory to be used for the .obj files created during
+# the build (under $THISDIR)
+!ifndef OUTPUTDIR
+OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
+# no trailing slash for win98
+!endif

 
 !include $(WXDIR)\src\makewat.env
 
 
 !include $(WXDIR)\src\makewat.env
 

-WXLIB = $(WXDIR)\lib
-LNK = tmp.lbc

 
 

-all: $(LIBTARGET)

 
 

+all: MAKDIR $(LIBTARGET) .SYMBOLIC
+
+MAKDIR:  .SYMBOLIC
+       @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
+
+# the name of the file containing the objects to be put in the library
+LBCFILE=$(LIBTARGET).lbc

 $(LIBTARGET) : $(OBJECTS)
 $(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
+    $(LIB) /b /c /n /p=512 $^@ @$(LBCFILE)

 
 clean:   .SYMBOLIC
 
 clean:   .SYMBOLIC

-    -erase *.obj
-    -erase *.bak
-    -erase *.err
-    -erase *.pch
-    -erase *.lib
-    -erase *.lbc
-    -erase *.res
-    -erase *.exe
-    -erase *.lbc
+    -erase $(OUTPUTDIR)\*.obj
+    -erase $(OUTPUTDIR)\*.bak
+    -erase $(OUTPUTDIR)\*.err
+    -erase $(OUTPUTDIR)\*.pch
+    -erase $(OUTPUTDIR)\*.lib
+    -erase $(OUTPUTDIR)\*.lbc
+    -erase $(OUTPUTDIR)\*.res
+    -erase $(OUTPUTDIR)\*.exe
+    -erase $(OUTPUTDIR)\*.lbc

     -erase $(LIBTARGET)
 
     -erase $(LIBTARGET)