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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index e6e235fa5f..0332017631 100644
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -24,10 +24,12 @@ DUMMYOBJ=$D\dummydll.obj
 LIBTARGET=$(WXLIB)
 COMTEMPTGT1=$(WXDIR)\lib\wxcom1.lib
 COMTEMPTGT2=$(WXDIR)\lib\wxcom2.lib
+COMTEMPTGT3=$(WXDIR)\lib\wxcom3.lib
 GENTEMPTGT=$(WXDIR)\lib\wxgen.lib
 NONESTEMPTGT=$(WXDIR)\lib\wxnones.lib
 OS2TEMPTGT1=$(WXDIR)\lib\wxos21.lib
 OS2TEMPTGT2=$(WXDIR)\lib\wxos22.lib
+HTMLTEMPTGT=$(WXDIR)\lib\wxhtml.lib
 DUMMYOBJ=$D\dummy.obj
 !endif
 
@@ -50,6 +52,18 @@ COMMDIR=$(WXDIR)\src\common
 OS2DIR=$(WXDIR)\src\os2
 HTMLDIR = $(WXDIR)\src\html
 
+!if [md $(COMMDIR)\$D]
+!endif
+
+!if [md $(OS2DIR)\$D]
+!endif
+
+!if [md $(GENDIR)\$D]
+!endif
+
+!if [md $(HTMLDIR)\$D]
+!endif
+
 {..\generic}.cpp{..\generic\$D}.obj:
     @echo $<
     icc @<<
@@ -81,11 +95,24 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 <<
 
 GENERICOBJS= \
+  ..\generic\$D\busyinfo.obj \
   ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
-  ..\generic\$D\gridg.obj \
+  ..\generic\$D\colrdlgg.obj \
+  ..\generic\$D\dcpsg.obj \
+  ..\generic\$D\grid.obj \
+  ..\generic\$D\helpext.obj \
+  ..\generic\$D\helphtml.obj \
+  ..\generic\$D\helpwxht.obj \
+  ..\generic\$D\helpxlp.obj \
+  ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \
+  ..\generic\$D\listctrl.obj \
+  ..\generic\$D\logg.obj \
+  ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
+  ..\generic\$D\printps.obj \
+  ..\generic\$D\prntdlgg.obj \
   ..\generic\$D\progdlgg.obj \
   ..\generic\$D\prop.obj \
   ..\generic\$D\propform.obj \
@@ -97,19 +124,30 @@ GENERICOBJS= \
   ..\generic\$D\tabg.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
-  ..\generic\$D\busyinfo.obj
+  ..\generic\$D\treectrl.obj
 
-#  ..\generic\$D\imaglist.obj \
-#  ..\generic\$D\treectrl.obj \
-#  ..\generic\$D\listctrl.obj \
+#  ..\generic\$D\gridg.obj \
 #  ..\generic\$D\notebook.obj \
 
 GENLIBOBJS= \
+  busyinfo.obj \
   caret.obj \
   choicdgg.obj \
-  gridg.obj \
+  colrdlgg.obj \
+  dcpsg.obj \
+  grid.obj \
+  helpext.obj \
+  helphtml.obj \
+  helpwxht.obj \
+  helpxlp.obj \
+  imaglist.obj \
   laywin.obj \
+  listctrl.obj \
+  logg.obj \
+  numdlgg.obj \
   panelg.obj \
+  printps.obj \
+  prntdlgg.obj \
   progdlgg.obj \
   prop.obj \
   propform.obj \
@@ -121,16 +159,12 @@ GENLIBOBJS= \
   tabg.obj \
   textdlgg.obj \
   tipdlg.obj \
-  busyinfo.obj
+  treectrl.obj
 
 # These are generic things that don't need to be compiled on PM,
 # but sometimes it's useful to do so for testing purposes.
 NONESSENTIALOBJS= \
-  ..\generic\$D\printps.obj \
-  ..\generic\$D\prntdlgg.obj \
   ..\generic\$D\msgdlgg.obj \
-  ..\generic\$D\helpxlp.obj \
-  ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\fontdlgg.obj
 
 COMMONOBJS = \
@@ -186,12 +220,12 @@ COMMONOBJS = \
   ..\common\$D\longlong.obj \
   ..\common\$D\matrix.obj \
   ..\common\$D\memory.obj \
+  ..\common\$D\menucmn.obj \
   ..\common\$D\mimetype.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
-  ..\common\$D\odbc.obj \
   ..\common\$D\paper.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
@@ -274,23 +308,23 @@ COMLIBOBJS1 = \
   imagpcx.obj \
   imagpng.obj \
   imagpnm.obj \
-  intl.obj \
+  intl.obj
+
+COMLIBOBJS2 = \
   ipcbase.obj \
   layout.obj \
   lboxcmn.obj \
   list.obj \
-  log.obj
-
-COMLIBOBJS2 = \
+  log.obj \
   longlong.obj \
   matrix.obj \
   memory.obj \
+  menucmn.obj \
   mimetype.obj \
   module.obj \
   mstream.obj \
   object.obj \
   objstrm.obj \
-  odbc.obj \
   paper.obj \
   prntbase.obj \
   process.obj \
@@ -319,7 +353,9 @@ COMLIBOBJS2 = \
   utilscmn.obj \
   valgen.obj \
   validate.obj \
-  valtext.obj \
+  valtext.obj
+
+COMLIBOBJS3 = \
   variant.obj \
   wfstream.obj \
   wincmn.obj \
@@ -360,14 +396,13 @@ OS2OBJS = \
   ..\os2\$D\frame.obj \
   ..\os2\$D\gauge.obj \
   ..\os2\$D\gdiobj.obj \
+  ..\os2\$D\gdiimage.obj \
   ..\os2\$D\gsocket.obj \
   ..\os2\$D\helpwin.obj \
   ..\os2\$D\icon.obj \
-  ..\os2\$D\imaglist.obj \
   ..\os2\$D\iniconf.obj \
   ..\os2\$D\joystick.obj \
   ..\os2\$D\listbox.obj \
-  ..\os2\$D\listctrl.obj \
   ..\os2\$D\main.obj \
   ..\os2\$D\mdi.obj \
   ..\os2\$D\menu.obj \
@@ -392,8 +427,8 @@ OS2OBJS = \
   ..\os2\$D\spinctrl.obj \
   ..\os2\$D\statbmp.obj \
   ..\os2\$D\statbox.obj \
+  ..\os2\$D\statline.obj \
   ..\os2\$D\stattext.obj \
-  ..\os2\$D\statbrpm.obj \
   ..\os2\$D\tabctrl.obj \
   ..\os2\$D\taskbar.obj \
   ..\os2\$D\textctrl.obj \
@@ -401,7 +436,6 @@ OS2OBJS = \
   ..\os2\$D\timer.obj \
   ..\os2\$D\toolbar.obj \
   ..\os2\$D\tooltip.obj \
-  ..\os2\$D\treectrl.obj \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
@@ -437,25 +471,24 @@ OS2LIBOBJS1 = \
   fontdlg.obj \
   frame.obj \
   gauge.obj \
+  gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
   helpwin.obj \
   icon.obj \
-  imaglist.obj \
   iniconf.obj \
   joystick.obj \
   listbox.obj \
-  listctrl.obj \
   main.obj \
   mdi.obj \
   menu.obj \
   menuitem.obj \
   metafile.obj \
   minifram.obj \
-  msgdlg.obj
+  msgdlg.obj \
+  nativdlg.obj
 
 OS2LIBOBJS2 = \
-  nativdlg.obj \
   notebook.obj \
   ownerdrw.obj \
   palette.obj \
@@ -473,7 +506,7 @@ OS2LIBOBJS2 = \
   statbmp.obj \
   statbox.obj \
   stattext.obj \
-  statbrpm.obj \
+  statline.obj \
   tabctrl.obj \
   taskbar.obj \
   textctrl.obj \
@@ -481,36 +514,56 @@ OS2LIBOBJS2 = \
   timer.obj \
   toolbar.obj \
   tooltip.obj \
-  treectrl.obj \
   utils.obj \
   utilsexc.obj \
   wave.obj \
   window.obj
 
 HTMLOBJS = \
+  ..\html\$D\helpctrl.obj \
+  ..\html\$D\helpdata.obj \
+  ..\html\$D\helpfrm.obj \
   ..\html\$D\htmlcell.obj \
-  ..\html\$D\htmlfilter.obj \
-  ..\html\$D\htmlhelp.obj \
-  ..\html\$D\htmlhelp_io.obj \
-  ..\html\$D\htmlparser.obj \
+  ..\html\$D\htmlfilt.obj \
+  ..\html\$D\htmlpars.obj \
   ..\html\$D\htmltag.obj \
   ..\html\$D\htmlwin.obj \
-  ..\html\$D\htmlwinparser.obj \
-  ..\html\$D\mod_fonts.obj \
-  ..\html\$D\mod_hline.obj \
-  ..\html\$D\mod_image.obj \
-  ..\html\$D\mod_layout.obj \
-  ..\html\$D\mod_links.obj \
-  ..\html\$D\mod_list.obj \
-  ..\html\$D\mod_pre.obj \
-  ..\html\$D\mod_tables.obj \
-  ..\html\$D\search.obj
+  ..\html\$D\htmprint.obj \
+  ..\html\$D\m_fonts.obj \
+  ..\html\$D\m_hline.obj \
+  ..\html\$D\m_image.obj \
+  ..\html\$D\m_layout.obj \
+  ..\html\$D\m_links.obj \
+  ..\html\$D\m_list.obj \
+  ..\html\$D\m_pre.obj \
+  ..\html\$D\m_tables.obj \
+  ..\html\$D\winpars.obj
+
+HTMLLIBOBJS = \
+  helpctrl.obj \
+  helpdata.obj \
+  helpfrm.obj \
+  htmlcell.obj \
+  htmlfilt.obj \
+  htmlpars.obj \
+  htmltag.obj \
+  htmlwin.obj \
+  htmprint.obj \
+  m_fonts.obj \
+  m_hline.obj \
+  m_image.obj \
+  m_layout.obj \
+  m_links.obj \
+  m_list.obj \
+  m_pre.obj \
+  m_tables.obj \
+  winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
-OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
+OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:    $(OBJECTS) $(PERIPH_TARGET) $(LIBTARGET)
+all:  $(OBJECTS) $(PERIPH_TARGET) png zlib xpm jpeg $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -518,21 +571,6 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 test:   $(OS2DIR)\$D\wave.obj
 test2:  ..\common\Debug\config.obj
 
-$D:
-    md $D
-
-$(COMMDIR)\$D:
-    md $(COMMDIR)\$D
-
-$(OS2DIR)\$D:
-    md $(OS2DIR)\$D
-
-$(GENDIR)\$D:
-    md $(GENDIR)\$D
-
-$(HTMLDIR)\$D:
-    md $(HTMLDIR)\$D
-
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
@@ -540,7 +578,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
   copy ..\common\$D\ctrlcmn.obj
-  copy  ..\common\$D\ctrlsub.obj
+  copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\date.obj
   copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.obj
@@ -578,66 +616,81 @@ $(COMLIBOBJS1):
   copy ..\common\$D\imagpng.obj
   copy ..\common\$D\imagpnm.obj
   copy ..\common\$D\intl.obj
+
+$(COMLIBOBJS2):
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj
   copy ..\common\$D\lboxcmn.obj
   copy ..\common\$D\list.obj
   copy ..\common\$D\log.obj
-
-$(COMLIBOBJS2):
-  copy ..\common\$D\longlong.obj \
-  copy ..\common\$D\matrix.obj \
-  copy ..\common\$D\memory.obj \
-  copy ..\common\$D\mimetype.obj \
-  copy ..\common\$D\module.obj \
-  copy ..\common\$D\mstream.obj \
-  copy ..\common\$D\object.obj \
-  copy ..\common\$D\objstrm.obj \
-  copy ..\common\$D\odbc.obj \
-  copy ..\common\$D\paper.obj \
-  copy ..\common\$D\prntbase.obj \
-  copy ..\common\$D\process.obj \
-  copy ..\common\$D\protocol.obj \
-  copy ..\common\$D\resource.obj \
-  copy ..\common\$D\sckaddr.obj \
-  copy ..\common\$D\sckfile.obj \
-  copy ..\common\$D\sckipc.obj \
-  copy ..\common\$D\sckstrm.obj \
-  copy ..\common\$D\serbase.obj \
-  copy ..\common\$D\sizer.obj \
-  copy ..\common\$D\socket.obj \
-  copy ..\common\$D\strconv.obj \
-  copy ..\common\$D\stream.obj \
-  copy ..\common\$D\string.obj \
-  copy ..\common\$D\tbarbase.obj \
-  copy ..\common\$D\tbarsmpl.obj \
-  copy ..\common\$D\textcmn.obj \
-  copy ..\common\$D\textfile.obj \
-  copy ..\common\$D\time.obj \
-  copy ..\common\$D\timercmn.obj \
-  copy ..\common\$D\tokenzr.obj \
-  copy ..\common\$D\txtstrm.obj \
-  copy ..\common\$D\unzip.obj \
-  copy ..\common\$D\url.obj \
-  copy ..\common\$D\utilscmn.obj \
-  copy ..\common\$D\valgen.obj \
-  copy ..\common\$D\validate.obj \
-  copy ..\common\$D\valtext.obj \
-  copy ..\common\$D\variant.obj \
-  copy ..\common\$D\wfstream.obj \
-  copy ..\common\$D\wincmn.obj \
-  copy ..\common\$D\wxchar.obj \
-  copy ..\common\$D\wxexpr.obj \
-  copy ..\common\$D\y_tab.obj \
-  copy ..\common\$D\zipstrm.obj \
+  copy ..\common\$D\longlong.obj
+  copy ..\common\$D\matrix.obj
+  copy ..\common\$D\memory.obj
+  copy ..\common\$D\menucmn.obj
+  copy ..\common\$D\mimetype.obj
+  copy ..\common\$D\module.obj
+  copy ..\common\$D\mstream.obj
+  copy ..\common\$D\object.obj
+  copy ..\common\$D\objstrm.obj
+  copy ..\common\$D\paper.obj
+  copy ..\common\$D\prntbase.obj
+  copy ..\common\$D\process.obj
+  copy ..\common\$D\protocol.obj
+  copy ..\common\$D\resource.obj
+  copy ..\common\$D\sckaddr.obj
+  copy ..\common\$D\sckfile.obj
+  copy ..\common\$D\sckipc.obj
+  copy ..\common\$D\sckstrm.obj
+  copy ..\common\$D\serbase.obj
+  copy ..\common\$D\sizer.obj
+  copy ..\common\$D\socket.obj
+  copy ..\common\$D\strconv.obj
+  copy ..\common\$D\stream.obj
+  copy ..\common\$D\string.obj
+  copy ..\common\$D\tbarbase.obj
+  copy ..\common\$D\tbarsmpl.obj
+  copy ..\common\$D\textcmn.obj
+  copy ..\common\$D\textfile.obj
+  copy ..\common\$D\time.obj
+  copy ..\common\$D\timercmn.obj
+  copy ..\common\$D\tokenzr.obj
+  copy ..\common\$D\txtstrm.obj
+  copy ..\common\$D\unzip.obj
+  copy ..\common\$D\url.obj
+  copy ..\common\$D\utilscmn.obj
+  copy ..\common\$D\valgen.obj
+  copy ..\common\$D\validate.obj
+  copy ..\common\$D\valtext.obj
+
+$(COMLIBOBJS3):
+  copy ..\common\$D\variant.obj
+  copy ..\common\$D\wfstream.obj
+  copy ..\common\$D\wincmn.obj
+  copy ..\common\$D\wxchar.obj
+  copy ..\common\$D\wxexpr.obj
+  copy ..\common\$D\y_tab.obj
+  copy ..\common\$D\zipstrm.obj
   copy ..\common\$D\zstream.obj
 
 $(GENLIBOBJS):
+  copy ..\generic\$D\busyinfo.obj
   copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
-  copy ..\generic\$D\gridg.obj
+  copy ..\generic\$D\colrdlgg.obj
+  copy ..\generic\$D\dcpsg.obj
+  copy ..\generic\$D\grid.obj
+  copy ..\generic\$D\helpext.obj
+  copy ..\generic\$D\helphtml.obj
+  copy ..\generic\$D\helpwxht.obj
+  copy ..\generic\$D\helpxlp.obj
+  copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj
+  copy ..\generic\$D\listctrl.obj
+  copy ..\generic\$D\logg.obj
+  copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
+  copy ..\generic\$D\printps.obj
+  copy ..\generic\$D\prntdlgg.obj
   copy ..\generic\$D\progdlgg.obj
   copy ..\generic\$D\prop.obj
   copy ..\generic\$D\propform.obj
@@ -649,7 +702,27 @@ $(GENLIBOBJS):
   copy ..\generic\$D\tabg.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
-  copy ..\generic\$D\busyinfo.obj
+  copy ..\generic\$D\treectrl.obj
+
+$(HTMLLIBOBJS):
+  copy ..\html\$D\helpctrl.obj
+  copy ..\html\$D\helpdata.obj
+  copy ..\html\$D\helpfrm.obj
+  copy ..\html\$D\htmlcell.obj
+  copy ..\html\$D\htmlfilt.obj
+  copy ..\html\$D\htmlpars.obj
+  copy ..\html\$D\htmltag.obj
+  copy ..\html\$D\htmlwin.obj
+  copy ..\html\$D\htmprint.obj
+  copy ..\html\$D\m_fonts.obj
+  copy ..\html\$D\m_hline.obj
+  copy ..\html\$D\m_image.obj
+  copy ..\html\$D\m_layout.obj
+  copy ..\html\$D\m_links.obj
+  copy ..\html\$D\m_list.obj
+  copy ..\html\$D\m_pre.obj
+  copy ..\html\$D\m_tables.obj
+  copy ..\html\$D\winpars.obj
 
 $(OS2LIBOBJS1):
   copy ..\os2\$D\accel.obj
@@ -667,6 +740,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\control.obj
   copy ..\os2\$D\cursor.obj
   copy ..\os2\$D\data.obj
+  copy ..\os2\$D\dataobj.obj
   copy ..\os2\$D\dc.obj
   copy ..\os2\$D\dcclient.obj
   copy ..\os2\$D\dcmemory.obj
@@ -680,15 +754,14 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\fontdlg.obj
   copy ..\os2\$D\frame.obj
   copy ..\os2\$D\gauge.obj
+  copy ..\os2\$D\gdiimage.obj
   copy ..\os2\$D\gdiobj.obj
   copy ..\os2\$D\gsocket.obj
   copy ..\os2\$D\helpwin.obj
   copy ..\os2\$D\icon.obj
-  copy ..\os2\$D\imaglist.obj
   copy ..\os2\$D\iniconf.obj
   copy ..\os2\$D\joystick.obj
   copy ..\os2\$D\listbox.obj
-  copy ..\os2\$D\listctrl.obj
   copy ..\os2\$D\main.obj
   copy ..\os2\$D\mdi.obj
   copy ..\os2\$D\menu.obj
@@ -715,8 +788,8 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\spinctrl.obj
   copy ..\os2\$D\statbmp.obj
   copy ..\os2\$D\statbox.obj
+  copy ..\os2\$D\statline.obj
   copy ..\os2\$D\stattext.obj
-  copy ..\os2\$D\statbrpm.obj
   copy ..\os2\$D\tabctrl.obj
   copy ..\os2\$D\taskbar.obj
   copy ..\os2\$D\textctrl.obj
@@ -724,7 +797,6 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\timer.obj
   copy ..\os2\$D\toolbar.obj
   copy ..\os2\$D\tooltip.obj
-  copy ..\os2\$D\treectrl.obj
   copy ..\os2\$D\utils.obj
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj
@@ -779,6 +851,13 @@ $(WXDIR)\lib\wxcom2.lib: $(COMLIBOBJS2)
     $**;
 <<
 
+$(WXDIR)\lib\wxcom3.lib: $(COMLIBOBJS3)
+ touch $(WXDIR)\lib\wxcom3.lib
+ del $(WXDIR)\lib\wxcom3.lib
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+
 $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
  touch $(WXDIR)\lib\wxgen.lib
  del $(WXDIR)\lib\wxgen.lib
@@ -786,6 +865,13 @@ $(WXDIR)\lib\wxgen.lib: $(GENLIBOBJS)
     $**;
 <<
 
+$(WXDIR)\lib\wxhtml.lib: $(HTMLLIBOBJS)
+ touch $(WXDIR)\lib\wxhtml.lib
+ del $(WXDIR)\lib\wxhtml.lib
+ ilib $(LIBFLAGS) $@ @<<
+    $**;
+<<
+
 $(WXDIR)\lib\wxnones.lib: $(NONESSENTIALOBJS)
  touch $(WXDIR)\lib\wxnones.lib
  del $(WXDIR)\lib\wxnones.lib
@@ -812,7 +898,9 @@ $(WXDIR)\lib\wx.lib: \
   $D\dummy.obj \
   $(COMTEMPTGT1) \
   $(COMTEMPTGT2) \
+  $(COMTEMPTGT3) \
   $(GENTEMPTGT) \
+  $(HTMLTEMPTGT) \
   $(NONESTEMPTGT) \
   $(OS2TEMPTGT1) \
   $(OS2TEMPTGT2) \
@@ -824,7 +912,9 @@ $(WXDIR)\lib\wx.lib: \
 <<
   del $(COMTEMPTGT1)
   del $(COMTEMPTGT2)
+  del $(COMTEMPTGT3)
   del $(GENTEMPTGT)
+  del $(HTMLTEMPTGT)
   del $(NONESTEMPTGT)
   del $(OS2TEMPTGT1)
   del $(OS2TEMPTGT2)
@@ -847,11 +937,9 @@ $(WXDIR)\lib\wx200.dll: $(OBJECTS) $(WXDIR)\lib\wx210.lib
 !endif
 
 $D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
-        @echo $<
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
 
 $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
-        @echo $<
         icc @<<
 $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /c /Tp dummydll.cpp
 <<
@@ -862,13 +950,11 @@ $(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h
     copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
 
 ..\common\$D\extended.obj:     ..\common\extended.c
-        @echo $<
         icc @<<
 $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c
 <<
 
 ..\common\$D\y_tab.obj:     ..\common\y_tab.c ..\common\lex_yy.c
-        @echo $<
         icc @<<
 $(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@  ..\common\y_tab.c
 <<
@@ -882,24 +968,64 @@ $(CPPFLAGS2) /DUSE_DEFINE /DYY_USE_PROTOS /Fo$@  ..\common\y_tab.c
 $(OBJECTS): $(WXDIR)/include/wx/setup.h
 
 ..\common\$D\unzip.obj:     ..\common\unzip.c
-        @echo $<
         icc @<<
 $(CPPFLAGS2) /Fo$@ $(COMMDIR)\unzip.c
 <<
 
+png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_png:
+    cd $(WXDIR)\src\png
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_zlib:
+    cd $(WXDIR)\src\zlib
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_jpeg:
+    cd $(WXDIR)\src\jpeg
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
+xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.va FINAL=$(FINAL) DLL=$(DLL) WXMAKINGDLL=$(WXMAKINGDLL)
+    cd $(WXDIR)\src\os2
+
+clean_xpm:
+    cd $(WXDIR)\src\xpm
+    nmake -f makefile.va clean
+    cd $(WXDIR)\src\os2
+
 clean: $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm
-        -erase $(LIBTARGET)
-        -erase ..\..\lib\wx200.dll
-        -erase ..\..\lib\wx200.lib
-        -erase $(GENDIR)\$D\*.obj
-        -erase $(COMMDIR)\$D\*.obj
-        -erase $(COMMDIR)\\y_tab.c
-        -erase $(COMMDIR)\lex_yy.c
-        -erase $(OS2DIR)\$D\*.obj
-        -rmdir $(D)
-        -rmdir ole\$(D)
-        -rmdir ..\generic\$(D)
-        -rmdir ..\common\$(D)
+        del      $(LIBTARGET)
+        erase /N ..\..\lib\wx200.dll
+        erase /N ..\..\lib\wx200.lib
+        erase /N $(GENDIR)\$D\*.obj
+        erase /N $(COMMDIR)\$D\*.obj
+        erase /N $(COMMDIR)\\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c
+        erase /N $(OS2DIR)\$D\*.obj
+        rd       $(D)
+        rd      ..\generic\$(D)
+        rd      ..\common\$(D)
+        rd      ..\html\$(D)
+        rd      ..\os2\$(D)
 
 cleanall: clean