X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ea258ad3489638fbcf504a674f8793b1362bd2b5..e1208c3103734c8581c9854c344b97323e381897:/src/os2/makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index ad63b0030f..1785ccae96 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -573,7 +573,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(OBJECTS) $(PERIPH_TARGET) png zlib $(LIBTARGET)
+all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -915,7 +915,7 @@ $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
- del *.obj
+# del *.obj
 
 $(WXDIR)\lib\wx.lib: \
   $D\dummy.obj \
@@ -933,14 +933,14 @@ $(WXDIR)\lib\wx.lib: \
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
-  del $(COMTEMPTGT1)
-  del $(COMTEMPTGT2)
-  del $(COMTEMPTGT3)
-  del $(GENTEMPTGT)
-  del $(HTMLTEMPTGT)
-  del $(NONESTEMPTGT)
-  del $(OS2TEMPTGT1)
-  del $(OS2TEMPTGT2)
+# del $(COMTEMPTGT1)
+# del $(COMTEMPTGT2)
+# del $(COMTEMPTGT3)
+# del $(GENTEMPTGT)
+# del $(HTMLTEMPTGT)
+# del $(NONESTEMPTGT)
+# del $(OS2TEMPTGT1)
+# del $(OS2TEMPTGT2)
 
 !else
 
@@ -1027,20 +1027,32 @@ clean_xpm:
     nmake -f makefile.va clean
     cd $(WXDIR)\src\os2
 
-clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
+tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_tiff:
+    cd $(WXDIR)\src\tiff
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_tiff
         del      $(LIBTARGET)
-        erase /N ..\..\lib\wx200.dll
+!if "$(WXMAKINGDLL)" == "1"
         erase /N ..\..\lib\wx200.lib
+!endif
         erase /N $(GENDIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
-        erase /N $(COMMDIR)\\y_tab.c
-        erase /N $(COMMDIR)\lex_yy.c
+        erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(OS2DIR)\$D\*.obj
+        erase /N $(COMMDIR)\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c
         rd       $(D)
-        rd      ..\generic\$(D)
-        rd      ..\common\$(D)
-        rd      ..\html\$(D)
-        rd      ..\os2\$(D)
+        rd      ..\generic\$D
+        rd      ..\common\$D
+        rd      ..\html\$D
+        rd      ..\os2\$D
 
 cleanall: clean