X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/631fd4122ac6d19b5785345d25eb70d54bbdb523..17483066d2fb8c6381ec90265f2f3b2d4fb1f88a:/distrib/msw/tmake/gtk.t?ds=sidebyside

diff --git a/distrib/msw/tmake/gtk.t b/distrib/msw/tmake/gtk.t
index 7049dc4583..6a1e34079c 100644
--- a/distrib/msw/tmake/gtk.t
+++ b/distrib/msw/tmake/gtk.t
@@ -1,219 +1,120 @@
-#!#############################################################################
+#!################################################################################
 #! File:    gtk.t
-#! Purpose: tmake template file from which Makefile is generated by running
-#!          tmake -t gtk wxwin.pro -o Makefile
-#! Author:  Vadim Zeitlin, Robert Roebling, Julian Smart
-#! Created: 14.07.99
+#! Purpose: tmake template file from which src/gtk/files.lst containing the
+#!          list of files for wxGTK library is generated by tmake
+#! Author:  Vadim Zeitlin
+#! Created: 28.01.00
 #! Version: $Id$
-#!#############################################################################
-
+#!################################################################################
 #${
     #! include the code which parses filelist.txt file and initializes
-    #! %wxCommon, %wxGeneric, %wxHtml, %wxUnix and %wxGTK hashes.
+    #! %wxCommon, %wxGeneric, %wxHtml, %wxUNIX, %wxGTK, %wxMOTIF and
+    #! %wxOS2PM hashes.
     IncludeTemplate("filelist.t");
 
-    #! now transform these hashes into $project tags
-    foreach $file (sort keys %wxGeneric) {
-        next if $wxGeneric{$file} =~ /\bR\b/;
+    #! find all our sources
+    $project{"COMMONOBJS"} .= "parser.o ";
 
-        $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXGENERICOBJS"} .= '$(GENDIR)/' . $file . " "
+    foreach $file (sort keys %wxGeneric) {
+        next if $wxGeneric{$file} =~ /\bNotGTK\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"GTK_SOURCES"} .= "generic/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+
+        #! also add it to the list of object files used by wxUniv if there
+        #! is no file with the same name among wxUniv own objects
+        my $filereal = $file;
+        if ( $file =~ /^([^.]+)g.cpp$/ ) {
+            $filereal = "$1.cpp";
+        }
+        if ( !exists $wxUNIV{$filereal} ) {
+            $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+        }
     }
 
     foreach $file (sort keys %wxCommon) {
-        next if $wxCommon{$file} =~ /\bR\b/;
+        next if $wxCommon{$file} =~ /\bNotGTK\b/;
+
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
 
-        $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXCOMMONOBJS"} .= '$(COMMDIR)/' . $file . " "
+        $project{"GTK_SOURCES"} .= "common/" . $file . " ";
+        $project{"COMMONOBJS"} .= $fileobj . " ";
     }
 
     foreach $file (sort keys %wxGTK) {
-        $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXGTKOBJS"} .= '$(GTKDIR)/' . $file . " "
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"GTK_SOURCES"} .= "gtk/" . $file . " ";
+        $project{"GUIOBJS"} .= $fileobj . " ";
+
+        if ( $wxGTK{$file} =~ /\bL\b/ ) {
+            $project{"GUI_LOWLEVEL_OBJS"} .= $fileobj . " ";
+        }
+    }
+
+    foreach $file (sort keys %wxUNIX) {
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"GTK_SOURCES"} .= "unix/" . $file . " ";
+        $project{"UNIXOBJS"} .= $fileobj . " ";
     }
 
     foreach $file (sort keys %wxHTML) {
-        $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXHTMLOBJS"} .= '$(HTMLDIR)/' . $file . " "
+        ($fileobj = $file) =~ s/cp?p?$/\o/;
+
+        $project{"GTK_SOURCES"} .= "html/" . $file . " ";
+        $project{"HTMLOBJS"} .= $fileobj . " ";
     }
 
-    foreach $file (sort keys %wxUNIX) {
-        $file =~ s/cp?p?$/\$(OBJSUFF)/;
-        $project{"WXUNIXOBJS"} .= '$(UNIXDIR)/' . $file . " "
+    #! find all our headers
+    foreach $file (sort keys %wxWXINCLUDE) {
+        next if $wxWXINCLUDE{$file} =~ /\bNotGTK\b/;
+
+        $project{"GTK_HEADERS"} .= $file . " "
+    }
+
+    foreach $file (sort keys %wxGTKINCLUDE) {
+        $project{"GTK_HEADERS"} .= "gtk/" . $file . " "
+    }
+
+    foreach $file (sort keys %wxGENERICINCLUDE) {
+        $project{"GTK_HEADERS"} .= "generic/" . $file . " "
     }
-#$}
-# This file was automatically generated by tmake at #$ Now()
-# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
 
-#
-# File:     Makefile
-# Author:   Julian Smart, Robert Roebling, Vadim Zeitlin
-# Created:  1993
-# Updated:  1999
-# Copyright:(c) 1993, AIAI, University of Edinburgh,
-# Copyright:(c) 1999, Vadim Zeitlin
-# Copyright:(c) 1999, Robert Roebling
-#
-# Makefile for libwx_gtk.a
+    foreach $file (sort keys %wxUNIXINCLUDE) {
+        $project{"GTK_HEADERS"} .= "unix/" . $file . " "
+    }
 
-WXDIR = ../..
+    foreach $file (sort keys %wxHTMLINCLUDE) {
+        $project{"GTK_HEADERS"} .= "html/" . $file . " "
+    }
 
-include $(WXDIR)/src/gtk.env
+    foreach $file (sort keys %wxPROTOCOLINCLUDE) {
+        $project{"GTK_HEADERS"} .= "protocol/" . $file . " "
+    }
+#$}
+# This file was automatically generated by tmake 
+# DO NOT CHANGE THIS FILE, YOUR CHANGES WILL BE LOST! CHANGE GTK.T!
+ALL_SOURCES = \
+		#$ ExpandList("GTK_SOURCES");
 
-# Subordinate library possibilities
+ALL_HEADERS = \
+		#$ ExpandList("GTK_HEADERS");
 
-GENDIR  = $(WXDIR)/src/generic
-COMMDIR = $(WXDIR)/src/common
-HTMLDIR = $(WXDIR)/src/html
-UNIXDIR = $(WXDIR)/src/unix
-PNGDIR  = $(WXDIR)/src/png
-JPEGDIR = $(WXDIR)/src/jpeg
-ZLIBDIR = $(WXDIR)/src/zlib
-GTKDIR  = $(WXDIR)/src/gtk
+COMMONOBJS = \
+		#$ ExpandList("COMMONOBJS");
 
-DOCDIR = $(WXDIR)\docs
+GUIOBJS = \
+		#$ ExpandList("GUIOBJS");
 
-GENERICOBJS = \
-                #$ ExpandList("WXGENERICOBJS");
+GUI_LOWLEVEL_OBJS = \
+		#$ ExpandList("GUI_LOWLEVEL_OBJS");
 
-COMMONOBJS  = \
-		$(COMMDIR)/parser.$(OBJSUFF) \
-		#$ ExpandList("WXCOMMONOBJS");
+UNIXOBJS = \
+		#$ ExpandList("UNIXOBJS");
 
 HTMLOBJS = \
-                #$ ExpandList("WXHTMLOBJS");
-
-GTKOBJS     = \
-		#$ ExpandList("WXGTKOBJS");
-
-UINXOBJS     = \
-		#$ ExpandList("WXUNIXOBJS");
-
-ZLIBOBJS    = \
-		$(ZLIBDIR)/adler32.$(OBJSUFF) \
-		$(ZLIBDIR)/compress.$(OBJSUFF) \
-		$(ZLIBDIR)/crc32.$(OBJSUFF) \
-		$(ZLIBDIR)/gzio.$(OBJSUFF) \
-		$(ZLIBDIR)/uncompr.$(OBJSUFF) \
-		$(ZLIBDIR)/deflate.$(OBJSUFF) \
-		$(ZLIBDIR)/trees.$(OBJSUFF) \
-		$(ZLIBDIR)/zutil.$(OBJSUFF) \
-		$(ZLIBDIR)/inflate.$(OBJSUFF) \
-		$(ZLIBDIR)/infblock.$(OBJSUFF) \
-		$(ZLIBDIR)/inftrees.$(OBJSUFF) \
-		$(ZLIBDIR)/infcodes.$(OBJSUFF) \
-		$(ZLIBDIR)/infutil.$(OBJSUFF) \
-		$(ZLIBDIR)/inffast.$(OBJSUFF)
-
-PNGOBJS     = \
-		$(PNGDIR)/png.$(OBJSUFF) \
-		$(PNGDIR)/pngread.$(OBJSUFF) \
-		$(PNGDIR)/pngrtran.$(OBJSUFF) \
-		$(PNGDIR)/pngrutil.$(OBJSUFF) \
-		$(PNGDIR)/pngpread.$(OBJSUFF) \
-		$(PNGDIR)/pngtrans.$(OBJSUFF) \
-		$(PNGDIR)/pngwrite.$(OBJSUFF) \
-		$(PNGDIR)/pngwtran.$(OBJSUFF) \
-		$(PNGDIR)/pngwutil.$(OBJSUFF) \
-		$(PNGDIR)/pngerror.$(OBJSUFF) \
-		$(PNGDIR)/pngmem.$(OBJSUFF) \
-		$(PNGDIR)/pngwio.$(OBJSUFF) \
-		$(PNGDIR)/pngrio.$(OBJSUFF) \
-		$(PNGDIR)/pngget.$(OBJSUFF) \
-		$(PNGDIR)/pngset.$(OBJSUFF)
-
-
-JPEGOBJS    = \
-		$(JPEGDIR)/jcomapi.$(OBJSUFF) \
-		$(JPEGDIR)/jutils.$(OBJSUFF) \
-		$(JPEGDIR)/jerror.$(OBJSUFF) \
-		$(JPEGDIR)/jmemmgr.$(OBJSUFF) \
-		$(JPEGDIR)/jmemnobs.$(OBJSUFF) \
-		$(JPEGDIR)/jcapimin.$(OBJSUFF) \
-		$(JPEGDIR)/jcapistd.$(OBJSUFF) \
-		$(JPEGDIR)/jctrans.$(OBJSUFF) \
-		$(JPEGDIR)/jcparam.$(OBJSUFF) \
-		$(JPEGDIR)/jdatadst.$(OBJSUFF) \
-		$(JPEGDIR)/jcinit.$(OBJSUFF) \
-		$(JPEGDIR)/jcmaster.$(OBJSUFF) \
-		$(JPEGDIR)/jcmarker.$(OBJSUFF) \
-		$(JPEGDIR)/jcmainct.$(OBJSUFF) \
-		$(JPEGDIR)/jcprepct.$(OBJSUFF) \
-		$(JPEGDIR)/jccoefct.$(OBJSUFF) \
-		$(JPEGDIR)/jccolor.$(OBJSUFF) \
-		$(JPEGDIR)/jcsample.$(OBJSUFF) \
-		$(JPEGDIR)/jchuff.$(OBJSUFF) \
-		$(JPEGDIR)/jcphuff.$(OBJSUFF) \
-		$(JPEGDIR)/jcdctmgr.$(OBJSUFF) \
-		$(JPEGDIR)/jfdctfst.$(OBJSUFF) \
-		$(JPEGDIR)/jfdctflt.$(OBJSUFF) \
-		$(JPEGDIR)/jfdctint.$(OBJSUFF) \
-		$(JPEGDIR)/jdapimin.$(OBJSUFF) \
-		$(JPEGDIR)/jdapistd.$(OBJSUFF) \
-		$(JPEGDIR)/jdtrans.$(OBJSUFF) \
-		$(JPEGDIR)/jdatasrc.$(OBJSUFF) \
-		$(JPEGDIR)/jdmaster.$(OBJSUFF) \
-		$(JPEGDIR)/jdinput.$(OBJSUFF) \
-		$(JPEGDIR)/jdmarker.$(OBJSUFF) \
-		$(JPEGDIR)/jdhuff.$(OBJSUFF) \
-		$(JPEGDIR)/jdphuff.$(OBJSUFF) \
-		$(JPEGDIR)/jdmainct.$(OBJSUFF) \
-		$(JPEGDIR)/jdcoefct.$(OBJSUFF) \
-		$(JPEGDIR)/jdpostct.$(OBJSUFF) \
-		$(JPEGDIR)/jddctmgr.$(OBJSUFF) \
-		$(JPEGDIR)/jidctfst.$(OBJSUFF) \
-		$(JPEGDIR)/jidctflt.$(OBJSUFF) \
-		$(JPEGDIR)/jidctint.$(OBJSUFF) \
-		$(JPEGDIR)/jidctred.$(OBJSUFF) \
-		$(JPEGDIR)/jdsample.$(OBJSUFF) \
-		$(JPEGDIR)/jdcolor.$(OBJSUFF) \
-		$(JPEGDIR)/jquant1.$(OBJSUFF) \
-		$(JPEGDIR)/jquant2.$(OBJSUFF) \
-		$(JPEGDIR)/jdmerge.$(OBJSUFF)
-
-OBJECTS = $(GTKOBJS) $(COMMONOBJS) $(GENERICOBJS) $(HTMLOBJ) $(UNIXOBJS) \
-	  $(JPEGOBJS) $(PNGOBJS) $(ZLIBOBJS)
-
-all:    $(OBJECTS) $(WXLIB)
-
-$(WXLIB): $(OBJECTS)
-	ar $(AROPTIONS) $@ $(OBJECTS)
-	$(RANLIB) $@
-
-$(OBJECTS):	$(WXDIR)/include/wx/defs.h $(WXDIR)/include/wx/object.h $(WXDIR)/include/wx/setup.h
-
-$(COMMDIR)/parser.$(OBJSUFF):    $(COMMDIR)/parser.c $(COMMDIR)/lexer.c
-	$(CCLEX) -c $(CFLAGS) -o $@ $(COMMDIR)/parser.c
-
-$(COMMDIR)/parser.c:	$(COMMDIR)/parser.y $(COMMDIR)/lexer.c
-	$(YACC) $(COMMDIR)/parser.y
-	@sed -e "s;$(COMMDIR)/y.tab.c;parser.y;g" < y.tab.c | \
-	sed -e "s/BUFSIZ/5000/g"            | \
-	sed -e "s/YYLMAX 200/YYLMAX 5000/g" | \
-	sed -e "s/yy/PROIO_yy/g"            | \
-	sed -e "s/input/PROIO_input/g"      | \
-	sed -e "s/unput/PROIO_unput/g"      > $(COMMDIR)/parser.c
-	@$(RM) y.tab.c
-
-$(COMMDIR)/lexer.c:	$(COMMDIR)/lexer.l
-	$(LEX) $(COMMDIR)/lexer.l
-	@sed -e "s;$(COMMDIR)/lex.yy.c;lexer.l;g" < lex.yy.c | \
-	sed -e "s/yy/PROIO_yy/g"            | \
-	sed -e "s/input/PROIO_input/g"      | \
-	sed -e "s/unput/PROIO_unput/g"      > $(COMMDIR)/lexer.c
-	@$(RM) lex.yy.c
-
-clean:
-	rm -f $(GTKDIR)/*.$(OBJSUFF)
-	rm -f $(COMMDIR)/parser.c
-	rm -f $(COMMDIR)/lexer.c
-	rm -f $(COMMDIR)/*.$(OBJSUFF)
-	rm -f $(GENDIR)/*.$(OBJSUFF)
-	rm -f $(PNGDIR)/*.$(OBJSUFF)
-	rm -f $(ZLIBDIR)/*.$(OBJSUFF)
-	rm -f $(JPEGDIR)/*.$(OBJSUFF)
-	rm -f $(UNIXDIR)/*.$(OBJSUFF)
-	rm -f $(HTMLDIR)/*.$(OBJSUFF)
-	rm -f $(WXWIN)/lib/libwx_$(GUI).a
-
-cleanall: clean
+		#$ ExpandList("HTMLOBJS");
+