compilation fix

[wxWidgets.git] / distrib / msw / tmake / unx.t

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 6e7d6cd0ceeb125191ba1c0b857cdc60a7a9ad97..597ef9634dea1167b76cd1b3692eda2b6d316d47 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -12,7 +12,7 @@
     IncludeTemplate("filelist.t");
 
     #! Generic
     IncludeTemplate("filelist.t");
 
     #! Generic

-    
+

     foreach $file (sort keys %wxGeneric) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version
     foreach $file (sort keys %wxGeneric) {
         #! native wxDirDlg can't be compiled due to GnuWin32/OLE limitations,
         #! so take the generic version


@@ -48,8 +48,18 @@
         $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
     }
 
         $project{"WXMOTIF_GENERICDEPS"} .= $file2 . " "
     }
 

+    #! Base
+
+    foreach $file (sort keys %wxBase) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+        ($filedep = $file) =~ s/cp?p?$/\d/;
+
+        $project{"BASE_OBJS"} .= $fileobj . " ";
+        $project{"BASE_DEPS"} .= $filedep . " ";
+    }
+

     #! Common
     #! Common

-    
+

     foreach $file (sort keys %wxCommon) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
         ($filedep = $file) =~ s/cp?p?$/\d/;
     foreach $file (sort keys %wxCommon) {
         ($fileobj = $file) =~ s/cp?p?$/\o/;
         ($filedep = $file) =~ s/cp?p?$/\d/;


@@ -60,9 +70,6 @@
             $project{"BASE_DEPS"} .= $filedep . " ";
         }
 
             $project{"BASE_DEPS"} .= $filedep . " ";
         }
 

-        #! if it's the wxBase-only file, nothing more to do with it
-        next if $wxCommon{$file} =~ /\bBO\b/;
-

         if ( $wxCommon{$file} !~ /\bR\b/ ) {    #! unless not for GTK
             $project{"WXGTK_COMMONOBJS"} .= $fileobj . " ";
             $project{"WXGTK_COMMONDEPS"} .= $filedep . " "
         if ( $wxCommon{$file} !~ /\bR\b/ ) {    #! unless not for GTK
             $project{"WXGTK_COMMONOBJS"} .= $fileobj . " ";
             $project{"WXGTK_COMMONDEPS"} .= $filedep . " "


@@ -80,7 +87,7 @@
     }
 
     #! GUI
     }
 
     #! GUI

-    
+

     foreach $file (sort keys %wxMSW) {
         #! Mingw32 doesn't have the OLE headers and has some troubles with
         #! socket code
     foreach $file (sort keys %wxMSW) {
         #! Mingw32 doesn't have the OLE headers and has some troubles with
         #! socket code


@@ -550,7 +557,7 @@ CREATE_INSTALLED_LINKS:  $(libdir)/@WX_LIBRARY_NAME_SHARED@
        $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
        
        $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK2@
        $(LN_S) @WX_LIBRARY_NAME_SHARED@ $(libdir)/@WX_LIBRARY_LINK3@
        

-$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
+$(OBJECTS):    $(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h

 
 parser.o:    parser.c lexer.c
        $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c
 
 parser.o:    parser.c lexer.c
        $(CCLEX) -c $(CFLAGS) $(PICFLAGS) -o $@ parser.c


@@ -575,7 +582,7 @@ lexer.c:    $(COMMDIR)/lexer.l
 
 -include $(DEPFILES)
 
 
 -include $(DEPFILES)
 

-preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(top_builddir)/setup.h
+preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config

        @echo " "
        @echo " Installing wxWindows..."
        @echo " "
        @echo " "
        @echo " Installing wxWindows..."
        @echo " "


@@ -592,7 +599,7 @@ preinstall: $(top_builddir)/lib/@WX_TARGET_LIBRARY@ $(top_builddir)/wx-config $(
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@
        $(INSTALL) -d $(libdir)/wx/include
        $(INSTALL) -d $(libdir)/wx/include/wx
        $(INSTALL) -d $(libdir)/wx/include/wx/@TOOLKIT_DIR@

-       $(INSTALL_DATA) $(top_builddir)/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h
+       $(INSTALL_DATA) $(top_builddir)/include/wx/@TOOLKIT_DIR@/setup.h $(libdir)/wx/include/wx/@TOOLKIT_DIR@/setup.h

        
        $(INSTALL) -d $(datadir)/wx
        $(INSTALL) -d $(datadir)/wx/afm
        
        $(INSTALL) -d $(datadir)/wx
        $(INSTALL) -d $(datadir)/wx/afm


@@ -666,6 +673,7 @@ ALL_DIST:
        mkdir _dist_dir
        mkdir $(DISTDIR)
        cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)
        mkdir _dist_dir
        mkdir $(DISTDIR)
        cp $(WXDIR)/wx$(TOOLKIT).spec $(DISTDIR)

+       cp $(WXDIR)/configure.in $(DISTDIR)

        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)
        cp $(WXDIR)/configure $(DISTDIR)
        cp $(WXDIR)/config.sub $(DISTDIR)
        cp $(WXDIR)/config.guess $(DISTDIR)


@@ -854,10 +862,7 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
        mkdir $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/help/helpfiles/*.??? $(DISTDIR)/samples/html/help/helpfiles
        mkdir $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/Makefile.in $(DISTDIR)/samples/html/printing

-       cp $(SAMPDIR)/html/printing/*.xpm $(DISTDIR)/samples/html/printing

        cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing
        cp $(SAMPDIR)/html/printing/*.cpp $(DISTDIR)/samples/html/printing

-       cp $(SAMPDIR)/html/printing/*.h $(DISTDIR)/samples/html/printing
-       cp $(SAMPDIR)/html/printing/*.png $(DISTDIR)/samples/html/printing

        cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
        mkdir $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/printing/*.htm $(DISTDIR)/samples/html/printing
        mkdir $(DISTDIR)/samples/html/test
        cp $(SAMPDIR)/html/test/Makefile.in $(DISTDIR)/samples/html/test


@@ -904,24 +909,29 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.cpp $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.h $(DISTDIR)/samples/listctrl
        cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl

-       mkdir $(DISTDIR)/samples/listctrl/bitmap
-       cp $(SAMPDIR)/listctrl/*.xpm $(DISTDIR)/samples/listctrl/bitmaps
+       mkdir $(DISTDIR)/samples/listctrl/bitmaps
+       cp $(SAMPDIR)/listctrl/bitmaps/*.xpm $(DISTDIR)/samples/listctrl/bitmaps

        mkdir $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi
        mkdir $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/Makefile.in $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.cpp $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.h $(DISTDIR)/samples/mdi
        cp $(SAMPDIR)/mdi/*.xpm $(DISTDIR)/samples/mdi

+       mkdir $(DISTDIR)/samples/mdi/bitmaps
+       cp $(SAMPDIR)/mdi/bitmaps/*.xpm $(DISTDIR)/samples/mdi/bitmaps

        mkdir $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram
        mkdir $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/Makefile.in $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.cpp $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.h $(DISTDIR)/samples/minifram
        cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram

-       mkdir $(DISTDIR)/samples/minifram/bitmap
-       cp $(SAMPDIR)/minifram/*.xpm $(DISTDIR)/samples/minifram/bitmaps
+       mkdir $(DISTDIR)/samples/minifram/bitmaps
+       cp $(SAMPDIR)/minifram/bitmaps/*.xpm $(DISTDIR)/samples/minifram/bitmaps

        mkdir $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal
        mkdir $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/Makefile.in $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.cpp $(DISTDIR)/samples/minimal
        cp $(SAMPDIR)/minimal/*.xpm $(DISTDIR)/samples/minimal

+       mkdir $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/Makefile.in $(DISTDIR)/samples/nettest
+       cp $(SAMPDIR)/nettest/*.cpp $(DISTDIR)/samples/nettest

        mkdir $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid
        mkdir $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/Makefile.in $(DISTDIR)/samples/newgrid
        cp $(SAMPDIR)/newgrid/*.cpp $(DISTDIR)/samples/newgrid


@@ -958,6 +968,9 @@ SAMPLES_DIST:
        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll
        mkdir $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/Makefile.in $(DISTDIR)/samples/scroll
        cp $(SAMPDIR)/scroll/*.cpp $(DISTDIR)/samples/scroll

+       mkdir $(DISTDIR)/samples/scrollsub
+       cp $(SAMPDIR)/scrollsub/Makefile.in $(DISTDIR)/samples/scrollsub
+       cp $(SAMPDIR)/scrollsub/*.cpp $(DISTDIR)/samples/scrollsub

        mkdir $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter
        mkdir $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/Makefile.in $(DISTDIR)/samples/splitter
        cp $(SAMPDIR)/splitter/*.cpp $(DISTDIR)/samples/splitter


@@ -973,8 +986,8 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.cpp $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.h $(DISTDIR)/samples/toolbar
        cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar

-       mkdir $(DISTDIR)/samples/toolbar/bitmap
-       cp $(SAMPDIR)/toolbar/*.xpm $(DISTDIR)/samples/toolbar/bitmaps
+       mkdir $(DISTDIR)/samples/toolbar/bitmaps
+       cp $(SAMPDIR)/toolbar/bitmaps/*.xpm $(DISTDIR)/samples/toolbar/bitmaps

        mkdir $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl
        mkdir $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/Makefile.in $(DISTDIR)/samples/treectrl
        cp $(SAMPDIR)/treectrl/*.cpp $(DISTDIR)/samples/treectrl