corrected path splitting for mac relative paths

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

diff --git a/src/os2/makefile.va b/src/os2/makefile.va
index 7419a88133031467d9fb495d7b466f6b491ced97..70f947a85bffc6964066ff653f29b6cdabd320bc 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\dirdlgg.obj \
   ..\generic\$D\dirctrlg.obj \
   ..\generic\$D\dragimgg.obj \
   ..\generic\$D\fontdlgg.obj \
@@ -148,6 +149,7 @@ GENLIBOBJS= \
   choicdgg.obj \
   colrdlgg.obj \
   dcpsg.obj \
+  dirdlgg.obj \
   dirctrlg.obj \
   dragimgg.obj \
   fontdlgg.obj \
@@ -192,9 +194,9 @@ NONESSENTIALOBJS= \
 
 COMMONOBJS = \
   ..\common\$D\appcmn.obj \
-  ..\common\$D\bmpbase.obj \
   ..\common\$D\choiccmn.obj \
   ..\common\$D\clipcmn.obj \
+  ..\common\$D\clntdata.obj \
   ..\common\$D\cmdline.obj \
   ..\common\$D\cmndata.obj \
   ..\common\$D\cmdproc.obj \
@@ -218,8 +220,10 @@ COMMONOBJS = \
   ..\common\$D\dobjcmn.obj \
   ..\common\$D\docmdi.obj \
   ..\common\$D\docview.obj \
+  ..\common\$D\dseldlg.obj \
   ..\common\$D\dynarray.obj \
   ..\common\$D\dynlib.obj \
+  ..\common\$D\dynload.obj \
   ..\common\$D\effects.obj \
   ..\common\$D\encconv.obj \
   ..\common\$D\event.obj \
@@ -249,6 +253,7 @@ COMMONOBJS = \
   ..\common\$D\imagbmp.obj \
   ..\common\$D\image.obj \
   ..\common\$D\imaggif.obj \
+  ..\common\$D\imagiff.obj \
   ..\common\$D\imagjpeg.obj \
   ..\common\$D\imagpcx.obj \
   ..\common\$D\imagpng.obj \
@@ -270,7 +275,6 @@ COMMONOBJS = \
   ..\common\$D\mstream.obj \
   ..\common\$D\nbkbase.obj \
   ..\common\$D\object.obj \
-  ..\common\$D\objstrm.obj \
 !if "$(WXMAKINGDLL)" != "1"
 # don't have an ODBC database
   ..\common\$D\odbc.obj \
@@ -288,18 +292,20 @@ COMMONOBJS = \
   ..\common\$D\sckfile.obj \
   ..\common\$D\sckipc.obj \
   ..\common\$D\sckstrm.obj \
-  ..\common\$D\serbase.obj \
   ..\common\$D\sizer.obj \
   ..\common\$D\socket.obj \
+  ..\common\$D\statbar.obj \
   ..\common\$D\strconv.obj \
   ..\common\$D\stream.obj \
   ..\common\$D\string.obj \
   ..\common\$D\sysopt.obj \
   ..\common\$D\tbarbase.obj \
+  ..\common\$D\textbuf.obj \
   ..\common\$D\textcmn.obj \
   ..\common\$D\textfile.obj \
   ..\common\$D\timercmn.obj \
   ..\common\$D\tokenzr.obj \
+  ..\common\$D\toplvcmn.obj \
   ..\common\$D\treebase.obj \
   ..\common\$D\txtstrm.obj \
   ..\common\$D\unzip.obj \
@@ -320,9 +326,9 @@ COMMONOBJS = \
 
 COMLIBOBJS1 = \
   appcmn.obj \
-  bmpbase.obj \
   choiccmn.obj \
   clipcmn.obj \
+  clntdata.obj \
   cmdline.obj \
   cmndata.obj \
   cmdproc.obj \
@@ -343,8 +349,10 @@ COMLIBOBJS1 = \
   dobjcmn.obj \
   docmdi.obj \
   docview.obj \
+  dseldlg.obj \
   dynarray.obj \
   dynlib.obj \
+  dynload.obj \
   effects.obj \
   encconv.obj \
   event.obj \
@@ -359,12 +367,12 @@ COMLIBOBJS1 = \
   fontcmn.obj \
   fontmap.obj \
   framecmn.obj \
-  fs_inet.obj \
-  fs_mem.obj \
-  fs_zip.obj \
-  ftp.obj
+  fs_inet.obj
 
 COMLIBOBJS2 = \
+  fs_mem.obj \
+  fs_zip.obj \
+  ftp.obj \
   gaugecmn.obj \
   gdicmn.obj \
   geometry.obj \
@@ -376,6 +384,7 @@ COMLIBOBJS2 = \
   imagbmp.obj \
   image.obj \
   imaggif.obj \
+  imagiff.obj \
   imagjpeg.obj \
   imagpcx.obj \
   imagpng.obj \
@@ -397,35 +406,36 @@ COMLIBOBJS2 = \
   mstream.obj \
   nbkbase.obj \
   object.obj \
-  objstrm.obj \
   odbc.obj \
   paper.obj \
   popupcmn.obj \
   prntbase.obj \
   process.obj \
-  protocol.obj \
-  quantize.obj \
-  radiocmn.obj \
-  regex.obj
+  protocol.obj
 
 COMLIBOBJS3 = \
+  quantize.obj \
+  radiocmn.obj \
+  regex.obj \
   resource.obj \
   sckaddr.obj \
   sckfile.obj \
   sckipc.obj \
   sckstrm.obj \
-  serbase.obj \
   sizer.obj \
   socket.obj \
+  statbar.obj \
   strconv.obj \
   stream.obj \
   string.obj \
   sysopt.obj \
   tbarbase.obj \
+  textbuf.obj \
   textcmn.obj \
   textfile.obj \
   timercmn.obj \
   tokenzr.obj \
+  toplvcmn.obj \
   treebase.obj \
   txtstrm.obj \
   unzip.obj \
@@ -468,7 +478,6 @@ OS2OBJS = \
   ..\os2\$D\dcscreen.obj \
   ..\os2\$D\dialog.obj \
   ..\os2\$D\dir.obj \
-  ..\os2\$D\dirdlg.obj \
   ..\os2\$D\dnd.obj \
   ..\os2\$D\filedlg.obj \
   ..\os2\$D\font.obj \
@@ -520,6 +529,7 @@ OS2OBJS = \
   ..\os2\$D\timer.obj \
   ..\os2\$D\toolbar.obj \
   ..\os2\$D\tooltip.obj \
+  ..\os2\$D\toplevel.obj \
   ..\os2\$D\utils.obj \
   ..\os2\$D\utilsexc.obj \
   ..\os2\$D\wave.obj \
@@ -550,7 +560,6 @@ OS2LIBOBJS1 = \
   dcscreen.obj \
   dialog.obj \
   dir.obj \
-  dirdlg.obj \
   dnd.obj \
   filedlg.obj \
   font.obj \
@@ -571,10 +580,10 @@ OS2LIBOBJS1 = \
   main.obj \
   mdi.obj \
   menu.obj \
-  menuitem.obj
+  menuitem.obj \
+  metafile.obj
 
 OS2LIBOBJS2 = \
-  metafile.obj \
   mimetype.obj \
   minifram.obj \
   msgdlg.obj \
@@ -604,6 +613,7 @@ OS2LIBOBJS2 = \
   timer.obj \
   toolbar.obj \
   tooltip.obj \
+  toplevel.obj \
   utils.obj \
   utilsexc.obj \
   wave.obj \
@@ -629,6 +639,7 @@ HTMLOBJS = \
   ..\html\$D\m_list.obj \
   ..\html\$D\m_meta.obj \
   ..\html\$D\m_pre.obj \
+  ..\html\$D\m_style.obj \
   ..\html\$D\m_tables.obj \
   ..\html\$D\winpars.obj
 
@@ -651,6 +662,7 @@ HTMLLIBOBJS = \
   m_list.obj \
   m_meta.obj \
   m_pre.obj \
+  m_style.obj \
   m_tables.obj \
   winpars.obj
 
@@ -658,7 +670,7 @@ HTMLLIBOBJS = \
 OBJECTS = $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJS) $(NONESSENTIALOBJS) $(OS2OBJS)
 
 # Normal, static library
-all:  $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
+all:  $(WXDIR)\include\wx\setup.h $(DUMMYOBJ) $(OBJECTS) $(PERIPH_TARGET) zlib png jpeg xpm tiff $(LIBTARGET)
 
 dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 
@@ -666,6 +678,13 @@ dirs: $(OS2DIR)\$D $(COMMDIR)\$D $(GENDIR)\$D $(HTMLDIR)\$D
 test:   $(OS2DIR)\$D\wave.obj
 test2:  ..\common\Debug\config.obj
 
+# If taking wxWindows from CVS, setup.h doesn't exist yet.
+$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h
+    copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
+
+$(WXDIR)\include\wx\setup.h: $(WXDIR)\include\wx\os2\setup.h
+    copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\setup.h
+
 $D\dummy.obj: dummy.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\wx\os2\setup.h
         icc $(CPPFLAGS) $(MAKEPRECOMP) /Fo$D\dummy.obj /Tp dummy.cpp
 
@@ -674,9 +693,9 @@ $D\dummydll.obj: dummydll.$(SRCSUFF) $(WXDIR)\include\wx\wx.h $(WXDIR)\include\w
 
 $(COMLIBOBJS1):
   copy ..\common\$D\appcmn.obj
-  copy ..\common\$D\bmpbase.obj
   copy ..\common\$D\choiccmn.obj
   copy ..\common\$D\clipcmn.obj
+  copy ..\common\$D\clntdata.obj
   copy ..\common\$D\cmdline.obj
   copy ..\common\$D\cmndata.obj
   copy ..\common\$D\cmdproc.obj
@@ -697,8 +716,10 @@ $(COMLIBOBJS1):
   copy ..\common\$D\dobjcmn.obj
   copy ..\common\$D\docmdi.obj
   copy ..\common\$D\docview.obj
+  copy ..\common\$D\dseldlg.obj
   copy ..\common\$D\dynarray.obj
   copy ..\common\$D\dynlib.obj
+  copy ..\common\$D\dynload.obj
   copy ..\common\$D\effects.obj
   copy ..\common\$D\encconv.obj
   copy ..\common\$D\event.obj
@@ -714,11 +735,11 @@ $(COMLIBOBJS1):
   copy ..\common\$D\fontmap.obj
   copy ..\common\$D\framecmn.obj
   copy ..\common\$D\fs_inet.obj
+
+$(COMLIBOBJS2):
   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
@@ -730,6 +751,7 @@ $(COMLIBOBJS2):
   copy ..\common\$D\imagbmp.obj
   copy ..\common\$D\image.obj
   copy ..\common\$D\imaggif.obj
+  copy ..\common\$D\imagiff.obj
   copy ..\common\$D\imagjpeg.obj
   copy ..\common\$D\imagpcx.obj
   copy ..\common\$D\imagpng.obj
@@ -751,35 +773,36 @@ $(COMLIBOBJS2):
   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\popupcmn.obj
   copy ..\common\$D\prntbase.obj
   copy ..\common\$D\process.obj
   copy ..\common\$D\protocol.obj
+
+$(COMLIBOBJS3):
   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\sckipc.obj
   copy ..\common\$D\sckstrm.obj
-  copy ..\common\$D\serbase.obj
   copy ..\common\$D\sizer.obj
   copy ..\common\$D\socket.obj
+  copy ..\common\$D\statbar.obj
   copy ..\common\$D\strconv.obj
   copy ..\common\$D\stream.obj
   copy ..\common\$D\string.obj
   copy ..\common\$D\sysopt.obj
   copy ..\common\$D\tbarbase.obj
+  copy ..\common\$D\textbuf.obj
   copy ..\common\$D\textcmn.obj
   copy ..\common\$D\textfile.obj
   copy ..\common\$D\timercmn.obj
   copy ..\common\$D\tokenzr.obj
+  copy ..\common\$D\toplvcmn.obj
   copy ..\common\$D\treebase.obj
   copy ..\common\$D\txtstrm.obj
   copy ..\common\$D\unzip.obj
@@ -806,6 +829,7 @@ $(GENLIBOBJS):
   copy ..\generic\$D\colrdlgg.obj
   copy ..\generic\$D\dragimgg.obj
   copy ..\generic\$D\dcpsg.obj
+  copy ..\generic\$D\dirdlgg.obj
   copy ..\generic\$D\dirctrlg.obj
   copy ..\generic\$D\fontdlgg.obj
   copy ..\generic\$D\fdrepdlg.obj
@@ -861,6 +885,7 @@ $(HTMLLIBOBJS):
   copy ..\html\$D\m_list.obj
   copy ..\html\$D\m_meta.obj
   copy ..\html\$D\m_pre.obj
+  copy ..\html\$D\m_style.obj
   copy ..\html\$D\m_tables.obj
   copy ..\html\$D\winpars.obj
 
@@ -888,7 +913,6 @@ $(OS2LIBOBJS1):
   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
   copy ..\os2\$D\font.obj
@@ -910,9 +934,9 @@ $(OS2LIBOBJS1):
   copy ..\os2\$D\mdi.obj
   copy ..\os2\$D\menu.obj
   copy ..\os2\$D\menuitem.obj
+  copy ..\os2\$D\metafile.obj
 
 $(OS2LIBOBJS2):
-  copy ..\os2\$D\metafile.obj
   copy ..\os2\$D\mimetype.obj
   copy ..\os2\$D\minifram.obj
   copy ..\os2\$D\msgdlg.obj
@@ -942,6 +966,7 @@ $(OS2LIBOBJS2):
   copy ..\os2\$D\timer.obj
   copy ..\os2\$D\toolbar.obj
   copy ..\os2\$D\tooltip.obj
+  copy ..\os2\$D\toplevel.obj
   copy ..\os2\$D\utils.obj
   copy ..\os2\$D\utilsexc.obj
   copy ..\os2\$D\wave.obj
@@ -1080,11 +1105,6 @@ $(WXDIR)\lib\wx23.dll: $(OBJECTS)
 
 !endif
 
-# If taking wxWindows from CVS, setup.h doesn't exist yet.
-$(WXDIR)\include\wx\os2\setup.h: $(WXDIR)\include\wx\os2\setup0.h
-    copy "$(WXDIR)"\include\wx\os2\setup.h "$(WXDIR)"\include\wx\os2\setup.bak
-    copy "$(WXDIR)"\include\wx\os2\setup0.h "$(WXDIR)"\include\wx\os2\setup.h
-
 ..\common\$D\extended.obj:     ..\common\extended.c
         icc @<<
 $(CPPFLAGS2) /Fo$@ $(COMMDIR)\extended.c