added HTML printing

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

diff --git a/distrib/msw/tmake/unx.t b/distrib/msw/tmake/unx.t
index 29e03dac1ae3aee2ed0340a2c8a9b3d4b9700836..13b1f1e07d33d0df21cbca4d7b4f12915ee6ce6e 100644 (file)
--- a/distrib/msw/tmake/unx.t
+++ b/distrib/msw/tmake/unx.t
@@ -12,7 +12,7 @@
     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
@@ -48,8 +48,18 @@
         $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
-    
+
     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 . " ";
         }
 
-        #! 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 . " "
@@ -80,7 +87,7 @@
     }
 
     #! GUI
-    
+
     foreach $file (sort keys %wxMSW) {
         #! Mingw32 doesn't have the OLE headers and has some troubles with
         #! socket code
@@ -489,7 +496,7 @@ JPEGOBJS    = \
                jquant2.o \
                jdmerge.o
 
-IODBCOBJS = \
+IODBC_OBJS = \
                catalog.o \
                connect.o \
                dlf.o \
@@ -515,8 +522,9 @@ GENERICOBJS = @GENERICOBJS@
 GENERICDEPS = @GENERICDEPS@
 UNIXOBJS = @UNIXOBJS@
 UNIXDEPS = @UNIXDEPS@
+IODBCOBJS = @IODBCOBJS@
 
-OBJECTS = @ALL_OBJECTS@ $(IODBCOBJS)
+OBJECTS = @ALL_OBJECTS@
 
 DEPFILES = @ALL_DEPFILES@
 
@@ -934,6 +942,18 @@ SAMPLES_DIST:
        cp $(SAMPDIR)/png/*.cpp $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.h $(DISTDIR)/samples/png
        cp $(SAMPDIR)/png/*.png $(DISTDIR)/samples/png
+       mkdir $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/Makefile.in $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.cpp $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.h $(DISTDIR)/samples/resource
+       cp $(SAMPDIR)/resource/*.wxr $(DISTDIR)/samples/resource
+       mkdir $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/Makefile.in $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.cpp $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.h $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/*.xpm $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/README $(DISTDIR)/samples/richedit
+       cp $(SAMPDIR)/richedit/TODO $(DISTDIR)/samples/richedit
        mkdir $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/Makefile.in $(DISTDIR)/samples/proplist
        cp $(SAMPDIR)/proplist/*.cpp $(DISTDIR)/samples/proplist