fixed fl makefiles that Julian didn't fix correctly

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index ed467f85ae10cbb30a8dd50489a9ae477b46881e..7419a88133031467d9fb495d7b466f6b491ced97 100644 (file)
--- a/src/os2/makefile.va
+++ b/src/os2/makefile.va
@@ -104,7 +104,9 @@ GENERICOBJS= \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\fontdlgg.obj \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\fontdlgg.obj \

+  ..\generic\$D\fdrepdlg.obj \

   ..\generic\$D\grid.obj \
   ..\generic\$D\grid.obj \

+  ..\generic\$D\gridctrl.obj \

   ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \
   ..\generic\$D\gridsel.obj \
   ..\generic\$D\helpext.obj \
   ..\generic\$D\helphtml.obj \


@@ -123,7 +125,8 @@ GENERICOBJS= \
   ..\generic\$D\propform.obj \
   ..\generic\$D\proplist.obj \
   ..\generic\$D\sashwin.obj \
   ..\generic\$D\propform.obj \
   ..\generic\$D\proplist.obj \
   ..\generic\$D\sashwin.obj \

-  ..\generic\$D\scrolwin.obj \
+  ..\generic\$D\scrlwing.obj \
+  ..\generic\$D\spinctlg.obj \

   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \
   ..\generic\$D\splitter.obj \
   ..\generic\$D\statusbr.obj \
   ..\generic\$D\tabg.obj \


@@ -148,7 +151,9 @@ GENLIBOBJS= \
   dirctrlg.obj \
   dragimgg.obj \
   fontdlgg.obj \
   dirctrlg.obj \
   dragimgg.obj \
   fontdlgg.obj \

+  fdrepdlg.obj \

   grid.obj \
   grid.obj \

+  gridctrl.obj \

   gridsel.obj \
   helpext.obj \
   helphtml.obj \
   gridsel.obj \
   helpext.obj \
   helphtml.obj \


@@ -167,7 +172,8 @@ GENLIBOBJS= \
   propform.obj \
   proplist.obj \
   sashwin.obj \
   propform.obj \
   proplist.obj \
   sashwin.obj \

-  scrolwin.obj \
+  scrlwing.obj \
+  spinctlg.obj \

   splitter.obj \
   statusbr.obj \
   tabg.obj \
   splitter.obj \
   statusbr.obj \
   tabg.obj \


@@ -186,11 +192,14 @@ NONESSENTIALOBJS= \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \

+  ..\common\$D\bmpbase.obj \

   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \

+  ..\common\$D\cmdproc.obj \

   ..\common\$D\config.obj \
   ..\common\$D\config.obj \

+  ..\common\$D\containr.obj \

   ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \
   ..\common\$D\cshelp.obj \
   ..\common\$D\ctrlcmn.obj \
   ..\common\$D\ctrlsub.obj \


@@ -199,6 +208,7 @@ COMMONOBJS = \
 !if "$(WXMAKINGDLL)" != "1"
 # don't have an ODBC database
   ..\common\$D\db.obj \
 !if "$(WXMAKINGDLL)" != "1"
 # don't have an ODBC database
   ..\common\$D\db.obj \

+  ..\common\$D\dbgrid.obj \

   ..\common\$D\dbtable.obj \
 !endif
   ..\common\$D\dcbase.obj \
   ..\common\$D\dbtable.obj \
 !endif
   ..\common\$D\dcbase.obj \


@@ -214,6 +224,7 @@ COMMONOBJS = \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
   ..\common\$D\extended.obj \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
   ..\common\$D\extended.obj \

+  ..\common\$D\fddlgcmn.obj \

   ..\common\$D\ffile.obj \
   ..\common\$D\file.obj \
   ..\common\$D\fileconf.obj \
   ..\common\$D\ffile.obj \
   ..\common\$D\file.obj \
   ..\common\$D\fileconf.obj \


@@ -227,6 +238,7 @@ COMMONOBJS = \
   ..\common\$D\fs_mem.obj \
   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \
   ..\common\$D\fs_mem.obj \
   ..\common\$D\fs_zip.obj \
   ..\common\$D\ftp.obj \

+  ..\common\$D\gaugecmn.obj \

   ..\common\$D\gdicmn.obj \
   ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \
   ..\common\$D\gdicmn.obj \
   ..\common\$D\geometry.obj \
   ..\common\$D\gifdecod.obj \


@@ -256,6 +268,7 @@ COMMONOBJS = \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \
   ..\common\$D\mimecmn.obj \
   ..\common\$D\module.obj \
   ..\common\$D\mstream.obj \

+  ..\common\$D\nbkbase.obj \

   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
 !if "$(WXMAKINGDLL)" != "1"
   ..\common\$D\object.obj \
   ..\common\$D\objstrm.obj \
 !if "$(WXMAKINGDLL)" != "1"


@@ -263,10 +276,13 @@ COMMONOBJS = \
   ..\common\$D\odbc.obj \
 !endif
   ..\common\$D\paper.obj \
   ..\common\$D\odbc.obj \
 !endif
   ..\common\$D\paper.obj \

+  ..\common\$D\popupcmn.obj \

   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
   ..\common\$D\quantize.obj \
   ..\common\$D\prntbase.obj \
   ..\common\$D\process.obj \
   ..\common\$D\protocol.obj \
   ..\common\$D\quantize.obj \

+  ..\common\$D\radiocmn.obj \
+  ..\common\$D\regex.obj \

   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \
   ..\common\$D\resource.obj \
   ..\common\$D\sckaddr.obj \
   ..\common\$D\sckfile.obj \


@@ -278,6 +294,7 @@ COMMONOBJS = \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \

+  ..\common\$D\sysopt.obj \

   ..\common\$D\tbarbase.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \
   ..\common\$D\tbarbase.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \


@@ -303,17 +320,21 @@ COMMONOBJS = \
 
 COMLIBOBJS1 = \
   appcmn.obj \
 
 COMLIBOBJS1 = \
   appcmn.obj \

+  bmpbase.obj \

   choiccmn.obj \
   clipcmn.obj \
   cmdline.obj \
   cmndata.obj \
   choiccmn.obj \
   clipcmn.obj \
   cmdline.obj \
   cmndata.obj \

+  cmdproc.obj \

   config.obj \
   config.obj \

+  containr.obj \

   cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
   datstrm.obj \
   db.obj \
   cshelp.obj \
   ctrlcmn.obj \
   ctrlsub.obj \
   datetime.obj \
   datstrm.obj \
   db.obj \

+  dbgrid.obj \

   dbtable.obj \
   dcbase.obj \
   dircmn.obj \
   dbtable.obj \
   dcbase.obj \
   dircmn.obj \


@@ -328,6 +349,7 @@ COMLIBOBJS1 = \
   encconv.obj \
   event.obj \
   extended.obj \
   encconv.obj \
   event.obj \
   extended.obj \

+  fddlgcmn.obj \

   ffile.obj \
   file.obj \
   fileconf.obj \
   ffile.obj \
   file.obj \
   fileconf.obj \


@@ -340,14 +362,15 @@ COMLIBOBJS1 = \
   fs_inet.obj \
   fs_mem.obj \
   fs_zip.obj \
   fs_inet.obj \
   fs_mem.obj \
   fs_zip.obj \

-  ftp.obj \
+  ftp.obj
+
+COMLIBOBJS2 = \
+  gaugecmn.obj \

   gdicmn.obj \
   geometry.obj \
   gifdecod.obj \
   hash.obj \
   gdicmn.obj \
   geometry.obj \
   gifdecod.obj \
   hash.obj \

-  helpbase.obj
-
-COMLIBOBJS2 = \
+  helpbase.obj \

   http.obj \
   imagall.obj \
   imagbmp.obj \
   http.obj \
   imagall.obj \
   imagbmp.obj \


@@ -372,14 +395,20 @@ COMLIBOBJS2 = \
   mimecmn.obj \
   module.obj \
   mstream.obj \
   mimecmn.obj \
   module.obj \
   mstream.obj \

+  nbkbase.obj \

   object.obj \
   objstrm.obj \
   odbc.obj \
   paper.obj \
   object.obj \
   objstrm.obj \
   odbc.obj \
   paper.obj \

+  popupcmn.obj \

   prntbase.obj \
   process.obj \
   protocol.obj \
   quantize.obj \
   prntbase.obj \
   process.obj \
   protocol.obj \
   quantize.obj \

+  radiocmn.obj \
+  regex.obj
+
+COMLIBOBJS3 = \

   resource.obj \
   sckaddr.obj \
   sckfile.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \


@@ -389,10 +418,9 @@ COMLIBOBJS2 = \
   sizer.obj \
   socket.obj \
   strconv.obj \
   sizer.obj \
   socket.obj \
   strconv.obj \

-  stream.obj
-
-COMLIBOBJS3 = \
+  stream.obj \

   string.obj \
   string.obj \

+  sysopt.obj \

   tbarbase.obj \
   textcmn.obj \
   textfile.obj \
   tbarbase.obj \
   textcmn.obj \
   textfile.obj \


@@ -646,17 +674,21 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj

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

   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj

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

   copy ..\common\$D\config.obj
   copy ..\common\$D\config.obj

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

   copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\datetime.obj
   copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.obj
   copy ..\common\$D\cshelp.obj
   copy ..\common\$D\ctrlcmn.obj
   copy ..\common\$D\ctrlsub.obj
   copy ..\common\$D\datetime.obj
   copy ..\common\$D\datstrm.obj
   copy ..\common\$D\db.obj

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

   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj
   copy ..\common\$D\dbtable.obj
   copy ..\common\$D\dcbase.obj
   copy ..\common\$D\dlgcmn.obj


@@ -671,6 +703,7 @@ $(COMLIBOBJS1):
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
   copy ..\common\$D\extended.obj
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
   copy ..\common\$D\extended.obj

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

   copy ..\common\$D\ffile.obj
   copy ..\common\$D\file.obj
   copy ..\common\$D\fileconf.obj
   copy ..\common\$D\ffile.obj
   copy ..\common\$D\file.obj
   copy ..\common\$D\fileconf.obj


@@ -684,13 +717,14 @@ $(COMLIBOBJS1):
   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

+
+$(COMLIBOBJS2):
+  copy ..\common\$D\gaugecmn.obj

   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\geometry.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj
   copy ..\common\$D\gdicmn.obj
   copy ..\common\$D\geometry.obj
   copy ..\common\$D\gifdecod.obj
   copy ..\common\$D\hash.obj
   copy ..\common\$D\helpbase.obj

-
-$(COMLIBOBJS2):

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


@@ -715,14 +749,20 @@ $(COMLIBOBJS2):
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj
   copy ..\common\$D\mimecmn.obj
   copy ..\common\$D\module.obj
   copy ..\common\$D\mstream.obj

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

   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.obj
   copy ..\common\$D\odbc.obj
   copy ..\common\$D\paper.obj
   copy ..\common\$D\object.obj
   copy ..\common\$D\objstrm.obj
   copy ..\common\$D\odbc.obj
   copy ..\common\$D\paper.obj

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

   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
   copy ..\common\$D\quantize.obj

+  copy ..\common\$D\radiocmn.obj
+  copy ..\common\$D\regex.obj
+
+$(COMLIBOBJS3):

   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj
   copy ..\common\$D\resource.obj
   copy ..\common\$D\sckaddr.obj
   copy ..\common\$D\sckfile.obj


@@ -733,9 +773,8 @@ $(COMLIBOBJS2):
   copy ..\common\$D\socket.obj
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj
   copy ..\common\$D\socket.obj
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj

-
-$(COMLIBOBJS3):

   copy ..\common\$D\string.obj
   copy ..\common\$D\string.obj

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

   copy ..\common\$D\tbarbase.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\tbarbase.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj


@@ -769,7 +808,9 @@ $(GENLIBOBJS):
   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.obj
   copy ..\generic\$D\dcpsg.obj
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.obj

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

   copy ..\generic\$D\grid.obj
   copy ..\generic\$D\grid.obj

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

   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


@@ -788,7 +829,8 @@ $(GENLIBOBJS):
   copy ..\generic\$D\propform.obj
   copy ..\generic\$D\proplist.obj
   copy ..\generic\$D\sashwin.obj
   copy ..\generic\$D\propform.obj
   copy ..\generic\$D\proplist.obj
   copy ..\generic\$D\sashwin.obj

-  copy ..\generic\$D\scrolwin.obj
+  copy ..\generic\$D\scrlwing.obj
+  copy ..\generic\$D\spinctlg.obj

   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj
   copy ..\generic\$D\splitter.obj
   copy ..\generic\$D\statusbr.obj
   copy ..\generic\$D\tabg.obj


@@ -1121,8 +1163,6 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(OS2DIR)\$D\*.obj
         erase /N $(COMMDIR)\$D\*.obj
         erase /N $(HTMLDIR)\$D\*.obj
         erase /N $(OS2DIR)\$D\*.obj

-        erase /N $(COMMDIR)\y_tab.c
-        erase /N $(COMMDIR)\lex_yy.c

         rd       $(D)
         rd      ..\generic\$D
         rd      ..\common\$D
         rd       $(D)
         rd      ..\generic\$D
         rd      ..\common\$D


@@ -1132,6 +1172,8 @@ clean:  $(PERIPH_CLEAN_TARGET) clean_png clean_zlib clean_jpeg clean_xpm clean_t
 !if "$(WXMAKINGDLL)" == "1"
         erase /N ..\..\lib\wx23.lib
 !endif
 !if "$(WXMAKINGDLL)" == "1"
         erase /N ..\..\lib\wx23.lib
 !endif

+        erase /N $(COMMDIR)\y_tab.c
+        erase /N $(COMMDIR)\lex_yy.c

 
 cleanall: clean
 
 
 cleanall: clean