Added chapter on collection and container classes to contents

[wxWidgets.git] / src / os2 / makefile.va

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 190951eaeda74d3ff6fde533aa8f1d7b3edf1a5c..720dd9e935ff51d9ace66dc4f86f4e4294959ffb 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -606,7 +606,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) png zlib jpeg xpm tiff $(LIBTARGET)
+all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -960,7 +960,7 @@ $(WXDIR)\lib\wxos22.lib: $(OS2LIBOBJS2)
  ilib $(LIBFLAGS) $@ @<<
     $**;
 <<
-# del *.obj
+ del *.obj
 
 $(WXDIR)\lib\wx.lib: \
   $D\dummy.obj \
@@ -978,31 +978,27 @@ $(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
 
-# Update the import library
-$(WXDIR)\lib\wx214.lib: $(OBJECTS)
-    implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
-
 # Update the dynamic link library
-$(WXDIR)\lib\wx214.dll: $(OBJECTS)
+$(WXDIR)\lib\wx22.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)
-    $(WXDIR)\lib\wx214.def
+    $(WXDIR)\lib\wx22.def
 <<
-    implib $(WXDIR)\lib\wx214.lib $(WXDIR)\lib\wx214.def
+    implib $(WXDIR)\lib\wx22.lib $(WXDIR)\lib\wx22.def
 
 !endif
 
@@ -1098,7 +1094,7 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
         rd      ..\os2\$D
         del      $(LIBTARGET)
 !if "$(WXMAKINGDLL)" == "1"
-        erase /N ..\..\lib\wx214.lib
+        erase /N ..\..\lib\wx22.lib
 !endif
 
 cleanall: clean