Adjust to Tim's changes. Use glib-genmarshal etc.

2000-10-28  Tor Lillqvist  <tml@iki.fi>

	* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
	glib-genmarshal etc.

1 files changed, 24 insertions, 6 deletions

diff --git a/gtk/makefile.msc.in b/gtk/makefile.msc.in
index 0a624e84ee..c28c0a90a8 100644
--- a/gtk/makefile.msc.in
+++ b/gtk/makefile.msc.in
@@ -48,7 +48,7 @@ all :						\
 	testtextbuffer.exe			\
 	simple.exe
 
-gtk_OBJECTS = \
+gtk_OBJECTS = 					\
 	fnmatch.obj				\
 	gdk-pixbuf-loader.obj			\
 	gtkaccelgroup.obj			\
@@ -110,7 +110,6 @@ gtk_OBJECTS = \
 	gtklist.obj				\
 	gtklistitem.obj				\
 	gtkmain.obj				\
-	gtkmarshal.obj				\
 	gtkmenu.obj				\
 	gtkmenubar.obj				\
 	gtkmenufactory.obj			\
@@ -179,7 +178,7 @@ gtk_OBJECTS = \
 	gtkwindow.obj
 
 # Source headers which are non-autogenerated headers
-source_headers = \
+gtk_public_h_sources =		\
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
@@ -197,6 +196,7 @@ source_headers = \
 	gtkcheckbutton.h	\
 	gtkcheckmenuitem.h	\
 	gtkclist.h		\
+	gtkclipboard.h		\
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
 	gtkcombo.h		\
@@ -204,6 +204,11 @@ source_headers = \
 	gtkcontainer.h		\
 	gtkctree.h		\
 	gtkcurve.h		\
+	gtkcellrenderer.h	\
+	gtkcellrenderertext.h	\
+	gtkcellrenderertextpixbuf.h	\
+	gtkcellrenderertoggle.h	\
+	gtkcellrendererpixbuf.h	\
 	gtkdata.h		\
 	gtkdebug.h		\
 	gtkdialog.h		\
@@ -228,6 +233,7 @@ source_headers = \
 	gtkhscrollbar.h		\
 	gtkhseparator.h		\
 	gtkhsv.h		\
+	gtkiconfactory.h	\
 	gtkimage.h		\
 	gtkimcontext.h		\
 	gtkimmulticontext.h	\
@@ -239,13 +245,16 @@ source_headers = \
 	gtklayout.h		\
 	gtklist.h		\
 	gtklistitem.h		\
+	gtkliststore.h		\
 	gtkmain.h		\
 	gtkmenu.h		\
 	gtkmenubar.h		\
 	gtkmenufactory.h	\
 	gtkmenuitem.h		\
 	gtkmenushell.h		\
+	gtkmessagedialog.h	\
 	gtkmisc.h		\
+	gtkmodelsimple.h	\
 	gtknotebook.h		\
 	gtkobject.h		\
 	gtkoptionmenu.h		\
@@ -273,10 +282,14 @@ source_headers = \
 	gtkspinbutton.h		\
 	gtkstyle.h		\
 	gtkstatusbar.h		\
+	gtkstock.h		\
 	gtktable.h		\
 	gtktearoffmenuitem.h	\
 	gtktextbuffer.h		\
+	gtktextchild.h		\
+	gtktextdisplay.h	\
 	gtktextiter.h		\
+	gtktextlayout.h		\
 	gtktextmark.h		\
 	gtktexttag.h		\
 	gtktexttagtable.h	\
@@ -289,6 +302,11 @@ source_headers = \
 	gtktooltips.h		\
 	gtktree.h		\
 	gtktreeitem.h		\
+	gtktreemodel.h		\
+	gtktreeselection.h	\
+	gtktreestore.h		\
+	gtktreeview.h		\
+	gtktreeviewcolumn.h	\
 	gtktypeutils.h		\
 	gtkvbbox.h		\
 	gtkvbox.h		\
@@ -337,8 +355,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
 generated : $(GENERATED)
 	$(TOUCH) generated
 
-gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
-	$(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp
+gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
+	$(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) >gd.tmp
 	copy gd.tmp+gtk-boxed.defs gtk.defs
 	@erase gd.tmp
 
@@ -356,7 +374,7 @@ gtktypebuiltins_ids.c: gtk.defs maketypes.awk
 
 # generate enum value arrays
 gtktypebuiltins_evals.c: makeenums.pl gtk.defs
-	$(PERL) makeenums.pl arrays $(source_headers) $(gdk_headers) >gtktypebuiltins_evals.c
+	$(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
 
 gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
 	$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc