a fix for the last fix

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 1bd843ce90c8b4bdcac943bbbdc488adfcb82e00..aa7be11a3fb23c53187695f3d94f1c4c6223b08b 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -101,6 +101,7 @@ GENERICOBJS= \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\dcpsg.obj \
+  ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\fontdlgg.obj \
   ..\generic\$D\grid.obj \
@@ -115,7 +116,6 @@ GENERICOBJS= \
   ..\generic\$D\logg.obj \
   ..\generic\$D\numdlgg.obj \
   ..\generic\$D\panelg.obj \
-  ..\generic\$D\plot.obj \
   ..\generic\$D\printps.obj \
   ..\generic\$D\prntdlgg.obj \
   ..\generic\$D\progdlgg.obj \
@@ -130,6 +130,7 @@ GENERICOBJS= \
   ..\generic\$D\tbarsmpl.obj \
   ..\generic\$D\textdlgg.obj \
   ..\generic\$D\tipdlg.obj \
+  ..\generic\$D\tipwin.obj \
   ..\generic\$D\treectlg.obj \
   ..\generic\$D\treelay.obj \
   ..\generic\$D\wizard.obj
@@ -144,6 +145,7 @@ GENLIBOBJS= \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \
+  dirctrlg.obj \
   dragimgg.obj \
   fontdlgg.obj \
   grid.obj \
@@ -158,7 +160,6 @@ GENLIBOBJS= \
   logg.obj \
   numdlgg.obj \
   panelg.obj \
-  plot.obj \
   printps.obj \
   prntdlgg.obj \
   progdlgg.obj \
@@ -173,6 +174,7 @@ GENLIBOBJS= \
   tbarsmpl.obj \
   textdlgg.obj \
   tipdlg.obj \
+  tipwin.obj \
   treectlg.obj \
   treelay.obj \
   wizard.obj
@@ -189,6 +191,7 @@ COMMONOBJS = \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\config.obj \
+  ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
   ..\common\$D\datetime.obj \
@@ -206,6 +209,7 @@ COMMONOBJS = \
   ..\common\$D\docview.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
+  ..\common\$D\effects.obj \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
   ..\common\$D\extended.obj \
@@ -213,6 +217,7 @@ COMMONOBJS = \
   ..\common\$D\file.obj \
   ..\common\$D\fileconf.obj \
   ..\common\$D\filefn.obj \
+  ..\common\$D\filename.obj \
   ..\common\$D\filesys.obj \
   ..\common\$D\fontcmn.obj \
   ..\common\$D\fontmap.obj \
@@ -300,6 +305,7 @@ COMLIBOBJS1 = \
   cmdline.obj \
   cmndata.obj \
   config.obj \
+  cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
@@ -314,6 +320,7 @@ COMLIBOBJS1 = \
   docview.obj \
   dynarray.obj \
   dynlib.obj \
+  effects.obj \
   encconv.obj \
   event.obj \
   extended.obj \
@@ -321,6 +328,7 @@ COMLIBOBJS1 = \
   file.obj \
   fileconf.obj \
   filefn.obj \
+  filename.obj \
   filesys.obj \
   fontcmn.obj \
   fontmap.obj \
@@ -334,12 +342,12 @@ COMLIBOBJS1 = \
   gifdecod.obj \
   hash.obj \
   helpbase.obj \
-  http.obj \
-  imagall.obj \
-  imagbmp.obj \
-  image.obj
+  http.obj
 
 COMLIBOBJS2 = \
+  imagall.obj \
+  imagbmp.obj \
+  image.obj \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
@@ -378,12 +386,12 @@ COMLIBOBJS2 = \
   strconv.obj \
   stream.obj \
   string.obj \
-  tbarbase.obj \
-  textcmn.obj \
-  textfile.obj \
-  timercmn.obj
+  tbarbase.obj
 
 COMLIBOBJS3 = \
+  textcmn.obj \
+  textfile.obj \
+  timercmn.obj \
   tokenzr.obj \
   treebase.obj \
   txtstrm.obj \
@@ -425,6 +433,7 @@ OS2OBJS = \
   ..\os2\$D\dcprint.obj \
   ..\os2\$D\dcscreen.obj \
   ..\os2\$D\dialog.obj \
+  ..\os2\$D\dir.obj \
   ..\os2\$D\dirdlg.obj \
   ..\os2\$D\dnd.obj \
   ..\os2\$D\filedlg.obj \
@@ -434,8 +443,8 @@ OS2OBJS = \
   ..\os2\$D\fontutil.obj \
   ..\os2\$D\frame.obj \
   ..\os2\$D\gauge.obj \
-  ..\os2\$D\gdiobj.obj \
   ..\os2\$D\gdiimage.obj \
+  ..\os2\$D\gdiobj.obj \
   ..\os2\$D\gsocket.obj \
   ..\os2\$D\helpwin.obj \
   ..\os2\$D\icon.obj \
@@ -479,7 +488,8 @@ OS2OBJS = \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
-  ..\os2\$D\window.obj
+  ..\os2\$D\window.obj \
+  ..\os2\$D\xpmhand.obj
 
 OS2LIBOBJS1 = \
   accel.obj \
@@ -504,6 +514,7 @@ OS2LIBOBJS1 = \
   dcprint.obj \
   dcscreen.obj \
   dialog.obj \
+  dir.obj \
   dirdlg.obj \
   dnd.obj \
   filedlg.obj \
@@ -525,10 +536,10 @@ OS2LIBOBJS1 = \
   mdi.obj \
   menu.obj \
   menuitem.obj \
-  metafile.obj \
-  mimetype.obj
+  metafile.obj
 
 OS2LIBOBJS2 = \
+  mimetype.obj \
   minifram.obj \
   msgdlg.obj \
   nativdlg.obj \
@@ -560,7 +571,8 @@ OS2LIBOBJS2 = \
   utils.obj \
   utilsexc.obj \
   wave.obj \
-  window.obj
+  window.obj \
+  xpmhand.obj
 
 HTMLOBJS = \
   ..\html\$D\helpctrl.obj \
@@ -631,6 +643,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\config.obj
+  copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\datetime.obj
@@ -645,6 +658,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\docview.obj
   copy ..\common\$D\dynarray.obj
   copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\effects.obj
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
   copy ..\common\$D\extended.obj
@@ -652,6 +666,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\file.obj
   copy ..\common\$D\fileconf.obj
   copy ..\common\$D\filefn.obj
+  copy ..\common\$D\filename.obj
   copy ..\common\$D\filesys.obj
   copy ..\common\$D\fontcmn.obj
   copy ..\common\$D\fontmap.obj
@@ -666,11 +681,11 @@ $(COMLIBOBJS1):
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj
+
+$(COMLIBOBJS2):
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj
-
-$(COMLIBOBJS2):
   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
@@ -710,11 +725,11 @@ $(COMLIBOBJS2):
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
   copy ..\common\$D\tbarbase.obj
+
+$(COMLIBOBJS3):
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
-
-$(COMLIBOBJS3):
   copy ..\common\$D\tokenzr.obj
   copy ..\common\$D\treebase.obj
   copy ..\common\$D\txtstrm.obj
@@ -741,6 +756,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\colrdlgg.obj
   copy ..\generic\$D\dragimgg.obj
   copy ..\generic\$D\dcpsg.obj
+  copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.obj
   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\gridsel.obj
@@ -754,7 +770,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\logg.obj
   copy ..\generic\$D\numdlgg.obj
   copy ..\generic\$D\panelg.obj
-  copy ..\generic\$D\plot.obj
   copy ..\generic\$D\printps.obj
   copy ..\generic\$D\prntdlgg.obj
   copy ..\generic\$D\progdlgg.obj
@@ -769,6 +784,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\tbarsmpl.obj
   copy ..\generic\$D\textdlgg.obj
   copy ..\generic\$D\tipdlg.obj
+  copy ..\generic\$D\tipwin.obj
   copy ..\generic\$D\treectlg.obj
   copy ..\generic\$D\treelay.obj
   copy ..\generic\$D\wizard.obj
@@ -818,6 +834,7 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\dcprint.obj
   copy ..\os2\$D\dcscreen.obj
   copy ..\os2\$D\dialog.obj
+  copy ..\os2\$D\dir.obj
   copy ..\os2\$D\dirdlg.obj
   copy ..\os2\$D\dnd.obj
   copy ..\os2\$D\filedlg.obj
@@ -840,9 +857,9 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
-  copy ..\os2\$D\mimetype.obj
 
 $(OS2LIBOBJS2):
+  copy ..\os2\$D\mimetype.obj
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
@@ -875,6 +892,7 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj
   copy ..\os2\$D\window.obj
+  copy ..\os2\$D\xpmhand.obj
 
 # wxWindows library as DLL
 dll:
@@ -996,15 +1014,15 @@ $(WXDIR)\lib\wx.lib: \
 !else
 
 # Update the dynamic link library
-$(WXDIR)\lib\wx22.dll: $(OBJECTS)
+$(WXDIR)\lib\wx23.dll: $(OBJECTS)
     icc @<<
     /B" $(LINKFLAGS)" /Fe$@
     $(LIBS)
     $(DUMMYOBJ)
     $(OBJECTS)
-    $(WXDIR)\lib\wx22.def
+    $(WXDIR)\src\os2\wx23.def
 <<
-    implib $(WXDIR)\lib\wx22.lib $(WXDIR)\lib\wx22.def
+    implib $(WXDIR)\lib\wx23.lib $(WXDIR)\src\os2\wx23.def
 
 !endif
 
@@ -1100,7 +1118,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\wx22.lib
+        erase /N ..\..\lib\wx23.lib
 !endif
 
 cleanall: clean