compilation fix

[wxWidgets.git] / src / makelib.wat

diff --git a/src/makelib.wat b/src/makelib.wat
index 3390cb6ff2ac1f150924adf18bd6b9e77f83313a..110f0398a5ec36ade09b89273aac04f93e3971d9 100644 (file)
--- a/src/makelib.wat
+++ b/src/makelib.wat
@@ -2,7 +2,7 @@
 # Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #
 
 # Changelist:  2003-02-25 - Juergen Ulbts - update from wxWindows 2.5.x/HEAD branch
 #
 

-<<<<<<< makelib.wat
+

 THISDIR = $+ $(%cdrive):$(%cwd) $-
 # set OUTPUTDIR to the directory to be used for the .obj files created during
 # the build (under $THISDIR)
 THISDIR = $+ $(%cdrive):$(%cwd) $-
 # set OUTPUTDIR to the directory to be used for the .obj files created during
 # the build (under $THISDIR)


@@ -11,31 +11,15 @@ OUTPUTDIR=$(THISDIR)\$(BASEDIRPREFIX)$(CONFIGURATION)Watcom
 # no trailing slash for win98
 !endif
 
 # no trailing slash for win98
 !endif
 

-=======
-OUTPUTDIR= $+ $(%cdrive):$(%cwd)\WATCOM $-
-
->>>>>>> 1.1.8.2

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

-<<<<<<< makelib.wat

 
 

-all: $(OUTPUTDIR) $(LIBTARGET) .SYMBOLIC
-=======

 
 

->>>>>>> 1.1.8.2

 
 

-<<<<<<< makelib.wat
-$(OUTPUTDIR):
-       @if not exist $^@ mkdir $^@
-=======

 all: MAKDIR $(LIBTARGET) .SYMBOLIC
 all: MAKDIR $(LIBTARGET) .SYMBOLIC

->>>>>>> 1.1.8.2

 
 

-<<<<<<< makelib.wat
-=======

 MAKDIR:  .SYMBOLIC
        @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
 
 MAKDIR:  .SYMBOLIC
        @if not exist $(OUTPUTDIR) mkdir $(OUTPUTDIR)
 

->>>>>>> 1.1.8.2

 # the name of the file containing the objects to be put in the library
 LBCFILE=$(LIBTARGET).lbc
 $(LIBTARGET) : $(OBJECTS)
 # the name of the file containing the objects to be put in the library
 LBCFILE=$(LIBTARGET).lbc
 $(LIBTARGET) : $(OBJECTS)