A few tweaks and cleanups

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index e8c55fb4d0020ef9e05e6adce2e0659387bc1d9f..003352d9492c633adb0beab413ab977a6eeb862b 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -100,6 +100,7 @@ GENERICOBJS= \
   ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \
   ..\generic\$D\caret.obj \
   ..\generic\$D\choicdgg.obj \
   ..\generic\$D\colrdlgg.obj \

+  ..\generic\$D\dcbuffer.obj \

   ..\generic\$D\dcpsg.obj \
   ..\generic\$D\dirdlgg.obj \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dcpsg.obj \
   ..\generic\$D\dirdlgg.obj \
   ..\generic\$D\dirctrlg.obj \


@@ -111,7 +112,6 @@ GENERICOBJS= \
   ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \

-  ..\generic\$D\helpwxht.obj \

   ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \
   ..\generic\$D\listctrl.obj \
   ..\generic\$D\imaglist.obj \
   ..\generic\$D\laywin.obj \
   ..\generic\$D\listctrl.obj \


@@ -147,6 +147,7 @@ GENLIBOBJS= \
   caret.obj \
   choicdgg.obj \
   colrdlgg.obj \
   caret.obj \
   choicdgg.obj \
   colrdlgg.obj \

+  dcbuffer.obj \

   dcpsg.obj \
   dirdlgg.obj \
   dirctrlg.obj \
   dcpsg.obj \
   dirdlgg.obj \
   dirctrlg.obj \


@@ -158,7 +159,6 @@ GENLIBOBJS= \
   gridsel.obj \
   helpext.obj \
   helphtml.obj \
   gridsel.obj \
   helpext.obj \
   helphtml.obj \

-  helpwxht.obj \

   imaglist.obj \
   laywin.obj \
   listctrl.obj \
   imaglist.obj \
   laywin.obj \
   listctrl.obj \


@@ -191,6 +191,8 @@ NONESSENTIALOBJS= \
   ..\generic\$D\msgdlgg.obj
 
 COMMONOBJS = \
   ..\generic\$D\msgdlgg.obj
 
 COMMONOBJS = \

+  ..\common\$D\artprov.obj \
+  ..\common\$D\artstd.obj \

   ..\common\$D\appcmn.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
   ..\common\$D\appcmn.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \


@@ -248,9 +250,11 @@ COMMONOBJS = \
   ..\common\$D\hashmap.obj \
   ..\common\$D\helpbase.obj \
   ..\common\$D\http.obj \
   ..\common\$D\hashmap.obj \
   ..\common\$D\helpbase.obj \
   ..\common\$D\http.obj \

+  ..\common\$D\iconbndl.obj \

   ..\common\$D\imagall.obj \
   ..\common\$D\imagbmp.obj \
   ..\common\$D\image.obj \
   ..\common\$D\imagall.obj \
   ..\common\$D\imagbmp.obj \
   ..\common\$D\image.obj \

+  ..\common\$D\imagfill.obj \

   ..\common\$D\imaggif.obj \
   ..\common\$D\imagiff.obj \
   ..\common\$D\imagjpeg.obj \
   ..\common\$D\imaggif.obj \
   ..\common\$D\imagiff.obj \
   ..\common\$D\imagjpeg.obj \


@@ -324,6 +328,8 @@ COMMONOBJS = \
   ..\common\$D\zstream.obj
 
 COMLIBOBJS1 = \
   ..\common\$D\zstream.obj
 
 COMLIBOBJS1 = \

+  artprov.obj \
+  artstd.obj \

   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \
   appcmn.obj \
   choiccmn.obj \
   clipcmn.obj \


@@ -364,11 +370,11 @@ COMLIBOBJS1 = \
   filename.obj \
   filesys.obj \
   fontcmn.obj \
   filename.obj \
   filesys.obj \
   fontcmn.obj \

-  fontmap.obj \
-  framecmn.obj \
-  fs_inet.obj
+  fontmap.obj

 
 COMLIBOBJS2 = \
 
 COMLIBOBJS2 = \

+  framecmn.obj \
+  fs_inet.obj \

   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \
   fs_mem.obj \
   fs_zip.obj \
   ftp.obj \


@@ -380,9 +386,11 @@ COMLIBOBJS2 = \
   hashmap.obj \
   helpbase.obj \
   http.obj \
   hashmap.obj \
   helpbase.obj \
   http.obj \

+  iconbndl.obj \

   imagall.obj \
   imagbmp.obj \
   image.obj \
   imagall.obj \
   imagbmp.obj \
   image.obj \

+  imagfill.obj \

   imaggif.obj \
   imagiff.obj \
   imagjpeg.obj \
   imaggif.obj \
   imagiff.obj \
   imagjpeg.obj \


@@ -406,13 +414,13 @@ COMLIBOBJS2 = \
   mstream.obj \
   nbkbase.obj \
   object.obj \
   mstream.obj \
   nbkbase.obj \
   object.obj \

-  odbc.obj \
+  odbc.obj
+
+COMLIBOBJS3 = \

   paper.obj \
   popupcmn.obj \
   prntbase.obj \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \

-  process.obj
-
-COMLIBOBJS3 = \
+  process.obj \

   protocol.obj \
   quantize.obj \
   radiocmn.obj \
   protocol.obj \
   quantize.obj \
   radiocmn.obj \


@@ -690,6 +698,8 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
 
 $(COMLIBOBJS1):
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummydll.obj /Tp dummydll.cpp
 
 $(COMLIBOBJS1):

+  copy ..\common\$D\artprov.obj
+  copy ..\common\$D\artstd.obj

   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
   copy ..\common\$D\appcmn.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj


@@ -731,10 +741,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\filesys.obj
   copy ..\common\$D\fontcmn.obj
   copy ..\common\$D\fontmap.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

 
 $(COMLIBOBJS2):
 
 $(COMLIBOBJS2):

+  copy ..\common\$D\framecmn.obj
+  copy ..\common\$D\fs_inet.obj

   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj
   copy ..\common\$D\fs_mem.obj
   copy ..\common\$D\fs_zip.obj
   copy ..\common\$D\ftp.obj


@@ -746,9 +756,11 @@ $(COMLIBOBJS2):
   copy ..\common\$D\hashmap.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj
   copy ..\common\$D\hashmap.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\http.obj

+  copy ..\common\$D\iconbndl.obj

   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj
   copy ..\common\$D\imagall.obj
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj

+  copy ..\common\$D\imagfill.obj

   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagiff.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imaggif.obj
   copy ..\common\$D\imagiff.obj
   copy ..\common\$D\imagjpeg.obj


@@ -773,12 +785,12 @@ $(COMLIBOBJS2):
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\odbc.obj
   copy ..\common\$D\nbkbase.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\odbc.obj

+
+$(COMLIBOBJS3):

   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj

-
-$(COMLIBOBJS3):

   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
   copy ..\common\$D\radiocmn.obj
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
   copy ..\common\$D\radiocmn.obj


@@ -827,6 +839,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
   copy ..\generic\$D\dragimgg.obj
   copy ..\generic\$D\choicdgg.obj
   copy ..\generic\$D\colrdlgg.obj
   copy ..\generic\$D\dragimgg.obj

+  copy ..\generic\$D\dcbuffer.obj

   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirdlgg.obj
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirdlgg.obj
   copy ..\generic\$D\dirctrlg.obj


@@ -837,7 +850,6 @@ $(GENLIBOBJS):
   copy ..\generic\$D\gridsel.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj
   copy ..\generic\$D\gridsel.obj
   copy ..\generic\$D\helpext.obj
   copy ..\generic\$D\helphtml.obj

-  copy ..\generic\$D\helpwxht.obj

   copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj
   copy ..\generic\$D\listctrl.obj
   copy ..\generic\$D\imaglist.obj
   copy ..\generic\$D\laywin.obj
   copy ..\generic\$D\listctrl.obj