From 49f7215796908beae869ad674e1c80d78ec54c02 Mon Sep 17 00:00:00 2001
From: Robert Roebling <robert@roebling.de>
Date: Sat, 9 Feb 2002 18:43:37 +0000
Subject: [PATCH]   Updates to tmake for X11. Damn lock in CVS.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14082 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 distrib/msw/tmake/filelist.t   |  2 --
 distrib/msw/tmake/filelist.txt | 10 +++++-----
 distrib/msw/tmake/gtk.t        |  6 +++---
 distrib/msw/tmake/makeall.sh   |  4 ++++
 distrib/msw/tmake/motif.t      |  6 +++---
 5 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/distrib/msw/tmake/filelist.t b/distrib/msw/tmake/filelist.t
index ee2b8b196e..4c1b83f364 100644
--- a/distrib/msw/tmake/filelist.t
+++ b/distrib/msw/tmake/filelist.t
@@ -47,8 +47,6 @@
         $fileflags =~ s/OLE/O/;
         $fileflags =~ s/Socket/S/;
         $fileflags =~ s/NotMSW/U/;
-        $fileflags =~ s/NotGTK/R/;
-        $fileflags =~ s/NotX/X/;
         $fileflags =~ s/NotOS2/P/;
         $fileflags =~ s/LowLevel/L/;
 
diff --git a/distrib/msw/tmake/filelist.txt b/distrib/msw/tmake/filelist.txt
index fbb6c2842e..bd478ea482 100644
--- a/distrib/msw/tmake/filelist.txt
+++ b/distrib/msw/tmake/filelist.txt
@@ -91,9 +91,9 @@ laywin.cpp	Generic
 listctrl.cpp	Generic	NotWin32
 logg.cpp	Generic
 msgdlgg.cpp	Generic	Generic
-notebook.cpp	Generic	NotWin32,NotGTK,NotOS2,NotMGL,NotMac,NotMicro
+notebook.cpp	Generic	NotWin32,NotGTK,NotOS2,NotMGL,NotX11,NotMac,NotMicro
 numdlgg.cpp	Generic
-paletteg.cpp	Generic	NotMSW,NotX,NotX11,NotOS2,NotMGL,NotMac,NotMicro
+paletteg.cpp	Generic	NotMSW,NotX,NotOS2,NotMGL,NotX11,NotMac,NotMicro
 panelg.cpp	Generic
 printps.cpp	Generic	NotMSW,NotX11
 prntdlgg.cpp	Generic	NotMSW
@@ -106,9 +106,9 @@ scrlwing.cpp	Generic
 spinctlg.cpp	Generic
 splash.cpp	Generic
 splitter.cpp	Generic
-statline.cpp	Generic	NotMSW,NotGTK,NotOS2,NotMGL,NotMac,NotMicro
-statusbr.cpp	Generic	NotMGL,NotMicro
-tabg.cpp	Generic	NotWin32,NotOS2,NotX11
+statline.cpp	Generic	NotMSW,NotGTK,NotOS2,NotMGL,NotX11,NotMac,NotMicro
+statusbr.cpp	Generic	NotMGL,NotX11,NotMicro
+tabg.cpp	Generic	NotWin32,NotOS2
 tbarsmpl.cpp	Generic
 textdlgg.cpp	Generic
 tipdlg.cpp	Generic
diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t
index 45aacb564b..6a1e34079c 100644
--- a/distrib/msw/tmake/gtk.t
+++ b/distrib/msw/tmake/gtk.t
@@ -16,7 +16,7 @@
     $project{"COMMONOBJS"} .= "parser.o ";
 
     foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bR\b/;
+        next if $wxGeneric{$file} =~ /\bNotGTK\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -35,7 +35,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
+        next if $wxCommon{$file} =~ /\bNotGTK\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -70,7 +70,7 @@
 
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
-        next if $wxWXINCLUDE{$file} =~ /\bR\b/;
+        next if $wxWXINCLUDE{$file} =~ /\bNotGTK\b/;
 
         $project{"GTK_HEADERS"} .= $file . " "
     }
diff --git a/distrib/msw/tmake/makeall.sh b/distrib/msw/tmake/makeall.sh
index 7b12de560a..39d15ef158 100755
--- a/distrib/msw/tmake/makeall.sh
+++ b/distrib/msw/tmake/makeall.sh
@@ -99,6 +99,10 @@ do
 	    echo "Generating $topdir/src/mgl/files.lst for MGL and Configure..."
 	    tmake -t mgl wxwin.pro -o $topdir/src/mgl/files.lst;;
 
+	x11.t)
+	    echo "Generating $topdir/src/x11/files.lst for X11 and Configure..."
+	    tmake -t x11 wxwin.pro -o $topdir/src/x11/files.lst;;
+
 	watmgl.t)
 	    echo "Generating $topdir/src/mgl/makefile.wat for Watcom C++ and MGL+DOS..."
 	    tmake -t watmgl wxwin.pro -o $topdir/src/mgl/makefile.wat;;
diff --git a/distrib/msw/tmake/motif.t b/distrib/msw/tmake/motif.t
index 146306e881..dbca7fc9e5 100644
--- a/distrib/msw/tmake/motif.t
+++ b/distrib/msw/tmake/motif.t
@@ -17,7 +17,7 @@
     $project{"GUIOBJS"} .= "xmcombo.o ";
 
     foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bX\b/;
+        next if $wxGeneric{$file} =~ /\bNotX\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -26,7 +26,7 @@
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bX\b/;
+        next if $wxCommon{$file} =~ /\bNotX\b/;
 
         ($fileobj = $file) =~ s/cp?p?$/\o/;
 
@@ -56,7 +56,7 @@
     }
     #! find all our headers
     foreach $file (sort keys %wxWXINCLUDE) {
-        next if $wxWXINCLUDE{$file} =~ /\bX\b/;
+        next if $wxWXINCLUDE{$file} =~ /\bNotX\b/;
 
         $project{"MOTIF_HEADERS"} .= $file . " "
     }