removed a condition (l. 124) that always eval to true

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 6b9f7dcff655675fd3ec30f3b2c8a0ca186ed635..7748d3f325b8944823634917808914e2d150777a 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -96,6 +96,7 @@ $(CPPFLAGS) /Fo$@ /Tp $<
 
 GENERICOBJS= \
   ..\generic\$D\busyinfo.obj \
+  ..\generic\$D\calctrl.obj \
   ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
@@ -131,6 +132,7 @@ GENERICOBJS= \
 
 GENLIBOBJS= \
   busyinfo.obj \
+  calctrl.obj \
   caret.obj \
   choicdgg.obj \
   colrdlgg.obj \
@@ -175,7 +177,7 @@ COMMONOBJS = \
   ..\common\$D\config.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
-  ..\common\$D\date.obj \
+  ..\common\$D\datetime.obj \
   ..\common\$D\datstrm.obj \
   ..\common\$D\db.obj \
   ..\common\$D\dbtable.obj \
@@ -186,6 +188,7 @@ COMMONOBJS = \
   ..\common\$D\docview.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
+  ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
   ..\common\$D\extended.obj \
   ..\common\$D\ffile.obj \
@@ -194,6 +197,7 @@ COMMONOBJS = \
   ..\common\$D\filefn.obj \
   ..\common\$D\filesys.obj \
   ..\common\$D\fontcmn.obj \
+  ..\common\$D\fontmap.obj \
   ..\common\$D\framecmn.obj \
   ..\common\$D\fs_inet.obj \
   ..\common\$D\fs_zip.obj \
@@ -220,12 +224,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 \
@@ -242,10 +246,8 @@ COMMONOBJS = \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
   ..\common\$D\tbarbase.obj \
-  ..\common\$D\tbarsmpl.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \
-  ..\common\$D\time.obj \
   ..\common\$D\timercmn.obj \
   ..\common\$D\tokenzr.obj \
   ..\common\$D\txtstrm.obj \
@@ -272,7 +274,7 @@ COMLIBOBJS1 = \
   config.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
-  date.obj \
+  datetime.obj \
   datstrm.obj \
   db.obj \
   dbtable.obj \
@@ -283,6 +285,7 @@ COMLIBOBJS1 = \
   docview.obj \
   dynarray.obj \
   dynlib.obj \
+  encconv.obj \
   event.obj \
   extended.obj \
   ffile.obj \
@@ -291,6 +294,7 @@ COMLIBOBJS1 = \
   filefn.obj \
   filesys.obj \
   fontcmn.obj \
+  fontmap.obj \
   framecmn.obj \
   fs_inet.obj \
   fs_zip.obj \
@@ -306,11 +310,11 @@ COMLIBOBJS1 = \
   imaggif.obj \
   imagjpeg.obj \
   imagpcx.obj \
-  imagpng.obj \
-  imagpnm.obj \
-  intl.obj
+  imagpng.obj
 
 COMLIBOBJS2 = \
+  imagpnm.obj \
+  intl.obj \
   ipcbase.obj \
   layout.obj \
   lboxcmn.obj \
@@ -319,12 +323,12 @@ COMLIBOBJS2 = \
   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 \
@@ -341,10 +345,8 @@ COMLIBOBJS2 = \
   stream.obj \
   string.obj \
   tbarbase.obj \
-  tbarsmpl.obj \
   textcmn.obj \
   textfile.obj \
-  time.obj \
   timercmn.obj \
   tokenzr.obj \
   txtstrm.obj \
@@ -352,10 +354,10 @@ COMLIBOBJS2 = \
   url.obj \
   utilscmn.obj \
   valgen.obj \
-  validate.obj \
-  valtext.obj
+  validate.obj
 
 COMLIBOBJS3 = \
+  valtext.obj \
   variant.obj \
   wfstream.obj \
   wincmn.obj \
@@ -393,9 +395,12 @@ OS2OBJS = \
   ..\os2\$D\filedlg.obj \
   ..\os2\$D\font.obj \
   ..\os2\$D\fontdlg.obj \
+  ..\os2\$D\fontenum.obj \
+  ..\os2\$D\fontutil.obj \
   ..\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 \
@@ -468,8 +473,11 @@ OS2LIBOBJS1 = \
   filedlg.obj \
   font.obj \
   fontdlg.obj \
+  fontenum.obj \
+  fontutil.obj \
   frame.obj \
   gauge.obj \
+  gdiimage.obj \
   gdiobj.obj \
   gsocket.obj \
   helpwin.obj \
@@ -482,12 +490,12 @@ OS2LIBOBJS1 = \
   menu.obj \
   menuitem.obj \
   metafile.obj \
-  minifram.obj \
-  msgdlg.obj \
-  nativdlg.obj \
-  notebook.obj
+  minifram.obj
 
 OS2LIBOBJS2 = \
+  msgdlg.obj \
+  nativdlg.obj \
+  notebook.obj \
   ownerdrw.obj \
   palette.obj \
   pen.obj \
@@ -518,6 +526,7 @@ OS2LIBOBJS2 = \
   window.obj
 
 HTMLOBJS = \
+  ..\html\$D\helpctrl.obj \
   ..\html\$D\helpdata.obj \
   ..\html\$D\helpfrm.obj \
   ..\html\$D\htmlcell.obj \
@@ -534,10 +543,10 @@ HTMLOBJS = \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_pre.obj \
   ..\html\$D\m_tables.obj \
-  ..\html\$D\search.obj \
   ..\html\$D\winpars.obj
 
 HTMLLIBOBJS = \
+  helpctrl.obj \
   helpdata.obj \
   helpfrm.obj \
   htmlcell.obj \
@@ -554,7 +563,6 @@ HTMLLIBOBJS = \
   m_list.obj \
   m_pre.obj \
   m_tables.obj \
-  search.obj \
   winpars.obj
 
 # Add $(NONESSENTIALOBJS) if wanting generic dialogs, PostScript etc.
@@ -577,7 +585,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\config.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
-  copy ..\common\$D\date.obj
+  copy ..\common\$D\datetime.obj
   copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.obj
   copy ..\common\$D\dbtable.obj
@@ -588,6 +596,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\docview.obj
   copy ..\common\$D\dynarray.obj
   copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
   copy ..\common\$D\extended.obj
   copy ..\common\$D\ffile.obj
@@ -596,6 +605,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\filefn.obj
   copy ..\common\$D\filesys.obj
   copy ..\common\$D\fontcmn.obj
+  copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj
   copy ..\common\$D\fs_zip.obj
@@ -612,10 +622,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
-  copy ..\common\$D\imagpnm.obj
-  copy ..\common\$D\intl.obj
 
 $(COMLIBOBJS2):
+  copy ..\common\$D\imagpnm.obj
+  copy ..\common\$D\intl.obj
   copy ..\common\$D\ipcbase.obj
   copy ..\common\$D\layout.obj
   copy ..\common\$D\lboxcmn.obj
@@ -624,12 +634,12 @@ $(COMLIBOBJS2):
   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\odbc.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
@@ -646,10 +656,8 @@ $(COMLIBOBJS2):
   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
@@ -658,9 +666,9 @@ $(COMLIBOBJS2):
   copy ..\common\$D\utilscmn.obj
   copy ..\common\$D\valgen.obj
   copy ..\common\$D\validate.obj
-  copy ..\common\$D\valtext.obj
 
 $(COMLIBOBJS3):
+  copy ..\common\$D\valtext.obj
   copy ..\common\$D\variant.obj
   copy ..\common\$D\wfstream.obj
   copy ..\common\$D\wincmn.obj
@@ -672,6 +680,7 @@ $(COMLIBOBJS3):
 
 $(GENLIBOBJS):
   copy ..\generic\$D\busyinfo.obj
+  copy ..\generic\$D\calctrl.obj
   copy ..\generic\$D\caret.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
@@ -703,6 +712,7 @@ $(GENLIBOBJS):
   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
@@ -719,7 +729,6 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_pre.obj
   copy ..\html\$D\m_tables.obj
-  copy ..\html\$D\search.obj
   copy ..\html\$D\winpars.obj
 
 $(OS2LIBOBJS1):
@@ -750,8 +759,11 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\filedlg.obj
   copy ..\os2\$D\font.obj
   copy ..\os2\$D\fontdlg.obj
+  copy ..\os2\$D\fontenum.obj
+  copy ..\os2\$D\fontutil.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
@@ -765,11 +777,11 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\menuitem.obj
   copy ..\os2\$D\metafile.obj
   copy ..\os2\$D\minifram.obj
+
+$(OS2LIBOBJS2):
   copy ..\os2\$D\msgdlg.obj
   copy ..\os2\$D\nativdlg.obj
   copy ..\os2\$D\notebook.obj
-
-$(OS2LIBOBJS2):
   copy ..\os2\$D\ownerdrw.obj
   copy ..\os2\$D\palette.obj
   copy ..\os2\$D\pen.obj