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, 29 insertions, 12 deletions

diff --git a/gtk/makefile.mingw.in b/gtk/makefile.mingw.in
index 9a40de6f15..21c9d1523c 100644
--- a/gtk/makefile.mingw.in
+++ b/gtk/makefile.mingw.in
@@ -113,7 +113,6 @@ gtk_OBJECTS =					\
 	gtklist.o				\
 	gtklistitem.o				\
 	gtkmain.o				\
-	gtkmarshal.o				\
 	gtkmenu.o				\
 	gtkmenubar.o				\
 	gtkmenufactory.o			\
@@ -182,7 +181,7 @@ gtk_OBJECTS =					\
 	gtkwindow.o
 
 # Source headers which are non-autogenerated headers
-source_headers =				\
+gtk_public_h_sources =		\
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
@@ -200,6 +199,7 @@ source_headers =				\
 	gtkcheckbutton.h	\
 	gtkcheckmenuitem.h	\
 	gtkclist.h		\
+	gtkclipboard.h		\
 	gtkcolorsel.h		\
 	gtkcolorseldialog.h	\
 	gtkcombo.h		\
@@ -207,6 +207,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		\
@@ -231,6 +236,7 @@ source_headers =				\
 	gtkhscrollbar.h		\
 	gtkhseparator.h		\
 	gtkhsv.h		\
+	gtkiconfactory.h	\
 	gtkimage.h		\
 	gtkimcontext.h		\
 	gtkimmulticontext.h	\
@@ -242,13 +248,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		\
@@ -276,10 +285,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	\
@@ -292,6 +305,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		\
@@ -339,8 +357,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
 #
 generated : $(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
 	cat gd.tmp gtk-boxed.defs >gtk.defs
 	rm gd.tmp
 
@@ -358,14 +376,13 @@ 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
-
-gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
-	$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc
-	-rm gtkmarshal.c
-	mv s-gmc gtkmarshal.c
-	-rm gtkmarshal.h
-	mv s-gmh gtkmarshal.h
+	$(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) >gtktypebuiltins_evals.c
+
+gtkmarshal.h : gtkmarshal.list
+	glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
+
+gtkmarshal.c : gtkmarshal.list
+	glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
 
 #
 # Linking: