Commit 9c20673e authored by Tor Lillqvist's avatar Tor Lillqvist Committed by Tor Lillqvist

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.
parent 512e493c
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
2000-10-28 Tor Lillqvist <tml@iki.fi>
* gtk/makefile.{mingw,msc}.in: Adjust to Tim's changes. Use
glib-genmarshal etc.
Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org> Fri Oct 27 20:15:00 2000 Tim Janik <timj@gtk.org>
* gtk/Makefile.am: added dependancies for testtextbuffer which broke * gtk/Makefile.am: added dependancies for testtextbuffer which broke
......
...@@ -113,7 +113,6 @@ gtk_OBJECTS = \ ...@@ -113,7 +113,6 @@ gtk_OBJECTS = \
gtklist.o \ gtklist.o \
gtklistitem.o \ gtklistitem.o \
gtkmain.o \ gtkmain.o \
gtkmarshal.o \
gtkmenu.o \ gtkmenu.o \
gtkmenubar.o \ gtkmenubar.o \
gtkmenufactory.o \ gtkmenufactory.o \
...@@ -182,7 +181,7 @@ gtk_OBJECTS = \ ...@@ -182,7 +181,7 @@ gtk_OBJECTS = \
gtkwindow.o gtkwindow.o
# Source headers which are non-autogenerated headers # Source headers which are non-autogenerated headers
source_headers = \ gtk_public_h_sources = \
gtk.h \ gtk.h \
gtkaccelgroup.h \ gtkaccelgroup.h \
gtkaccellabel.h \ gtkaccellabel.h \
...@@ -200,6 +199,7 @@ source_headers = \ ...@@ -200,6 +199,7 @@ source_headers = \
gtkcheckbutton.h \ gtkcheckbutton.h \
gtkcheckmenuitem.h \ gtkcheckmenuitem.h \
gtkclist.h \ gtkclist.h \
gtkclipboard.h \
gtkcolorsel.h \ gtkcolorsel.h \
gtkcolorseldialog.h \ gtkcolorseldialog.h \
gtkcombo.h \ gtkcombo.h \
...@@ -207,6 +207,11 @@ source_headers = \ ...@@ -207,6 +207,11 @@ source_headers = \
gtkcontainer.h \ gtkcontainer.h \
gtkctree.h \ gtkctree.h \
gtkcurve.h \ gtkcurve.h \
gtkcellrenderer.h \
gtkcellrenderertext.h \
gtkcellrenderertextpixbuf.h \
gtkcellrenderertoggle.h \
gtkcellrendererpixbuf.h \
gtkdata.h \ gtkdata.h \
gtkdebug.h \ gtkdebug.h \
gtkdialog.h \ gtkdialog.h \
...@@ -231,6 +236,7 @@ source_headers = \ ...@@ -231,6 +236,7 @@ source_headers = \
gtkhscrollbar.h \ gtkhscrollbar.h \
gtkhseparator.h \ gtkhseparator.h \
gtkhsv.h \ gtkhsv.h \
gtkiconfactory.h \
gtkimage.h \ gtkimage.h \
gtkimcontext.h \ gtkimcontext.h \
gtkimmulticontext.h \ gtkimmulticontext.h \
...@@ -242,13 +248,16 @@ source_headers = \ ...@@ -242,13 +248,16 @@ source_headers = \
gtklayout.h \ gtklayout.h \
gtklist.h \ gtklist.h \
gtklistitem.h \ gtklistitem.h \
gtkliststore.h \
gtkmain.h \ gtkmain.h \
gtkmenu.h \ gtkmenu.h \
gtkmenubar.h \ gtkmenubar.h \
gtkmenufactory.h \ gtkmenufactory.h \
gtkmenuitem.h \ gtkmenuitem.h \
gtkmenushell.h \ gtkmenushell.h \
gtkmessagedialog.h \
gtkmisc.h \ gtkmisc.h \
gtkmodelsimple.h \
gtknotebook.h \ gtknotebook.h \
gtkobject.h \ gtkobject.h \
gtkoptionmenu.h \ gtkoptionmenu.h \
...@@ -276,10 +285,14 @@ source_headers = \ ...@@ -276,10 +285,14 @@ source_headers = \
gtkspinbutton.h \ gtkspinbutton.h \
gtkstyle.h \ gtkstyle.h \
gtkstatusbar.h \ gtkstatusbar.h \
gtkstock.h \
gtktable.h \ gtktable.h \
gtktearoffmenuitem.h \ gtktearoffmenuitem.h \
gtktextbuffer.h \ gtktextbuffer.h \
gtktextchild.h \
gtktextdisplay.h \
gtktextiter.h \ gtktextiter.h \
gtktextlayout.h \
gtktextmark.h \ gtktextmark.h \
gtktexttag.h \ gtktexttag.h \
gtktexttagtable.h \ gtktexttagtable.h \
...@@ -292,6 +305,11 @@ source_headers = \ ...@@ -292,6 +305,11 @@ source_headers = \
gtktooltips.h \ gtktooltips.h \
gtktree.h \ gtktree.h \
gtktreeitem.h \ gtktreeitem.h \
gtktreemodel.h \
gtktreeselection.h \
gtktreestore.h \
gtktreeview.h \
gtktreeviewcolumn.h \
gtktypeutils.h \ gtktypeutils.h \
gtkvbbox.h \ gtkvbbox.h \
gtkvbox.h \ gtkvbox.h \
...@@ -339,8 +357,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id ...@@ -339,8 +357,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
# #
generated : $(GENERATED) generated : $(GENERATED)
gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
$(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) >gd.tmp
cat gd.tmp gtk-boxed.defs >gtk.defs cat gd.tmp gtk-boxed.defs >gtk.defs
rm gd.tmp rm gd.tmp
...@@ -358,14 +376,13 @@ gtktypebuiltins_ids.c: gtk.defs maketypes.awk ...@@ -358,14 +376,13 @@ gtktypebuiltins_ids.c: gtk.defs maketypes.awk
# generate enum value arrays # generate enum value arrays
gtktypebuiltins_evals.c: makeenums.pl gtk.defs 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 gtkmarshal.h : gtkmarshal.list
$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --header >gtkmarshal.h
-rm gtkmarshal.c
mv s-gmc gtkmarshal.c gtkmarshal.c : gtkmarshal.list
-rm gtkmarshal.h glib-genmarshal --prefix=gtk_marshal gtkmarshal.list --body >gtkmarshal.c
mv s-gmh gtkmarshal.h
# #
# Linking: # Linking:
......
...@@ -48,7 +48,7 @@ all : \ ...@@ -48,7 +48,7 @@ all : \
testtextbuffer.exe \ testtextbuffer.exe \
simple.exe simple.exe
gtk_OBJECTS = \ gtk_OBJECTS = \
fnmatch.obj \ fnmatch.obj \
gdk-pixbuf-loader.obj \ gdk-pixbuf-loader.obj \
gtkaccelgroup.obj \ gtkaccelgroup.obj \
...@@ -110,7 +110,6 @@ gtk_OBJECTS = \ ...@@ -110,7 +110,6 @@ gtk_OBJECTS = \
gtklist.obj \ gtklist.obj \
gtklistitem.obj \ gtklistitem.obj \
gtkmain.obj \ gtkmain.obj \
gtkmarshal.obj \
gtkmenu.obj \ gtkmenu.obj \
gtkmenubar.obj \ gtkmenubar.obj \
gtkmenufactory.obj \ gtkmenufactory.obj \
...@@ -179,7 +178,7 @@ gtk_OBJECTS = \ ...@@ -179,7 +178,7 @@ gtk_OBJECTS = \
gtkwindow.obj gtkwindow.obj
# Source headers which are non-autogenerated headers # Source headers which are non-autogenerated headers
source_headers = \ gtk_public_h_sources = \
gtk.h \ gtk.h \
gtkaccelgroup.h \ gtkaccelgroup.h \
gtkaccellabel.h \ gtkaccellabel.h \
...@@ -197,6 +196,7 @@ source_headers = \ ...@@ -197,6 +196,7 @@ source_headers = \
gtkcheckbutton.h \ gtkcheckbutton.h \
gtkcheckmenuitem.h \ gtkcheckmenuitem.h \
gtkclist.h \ gtkclist.h \
gtkclipboard.h \
gtkcolorsel.h \ gtkcolorsel.h \
gtkcolorseldialog.h \ gtkcolorseldialog.h \
gtkcombo.h \ gtkcombo.h \
...@@ -204,6 +204,11 @@ source_headers = \ ...@@ -204,6 +204,11 @@ source_headers = \
gtkcontainer.h \ gtkcontainer.h \
gtkctree.h \ gtkctree.h \
gtkcurve.h \ gtkcurve.h \
gtkcellrenderer.h \
gtkcellrenderertext.h \
gtkcellrenderertextpixbuf.h \
gtkcellrenderertoggle.h \
gtkcellrendererpixbuf.h \
gtkdata.h \ gtkdata.h \
gtkdebug.h \ gtkdebug.h \
gtkdialog.h \ gtkdialog.h \
...@@ -228,6 +233,7 @@ source_headers = \ ...@@ -228,6 +233,7 @@ source_headers = \
gtkhscrollbar.h \ gtkhscrollbar.h \
gtkhseparator.h \ gtkhseparator.h \
gtkhsv.h \ gtkhsv.h \
gtkiconfactory.h \
gtkimage.h \ gtkimage.h \
gtkimcontext.h \ gtkimcontext.h \
gtkimmulticontext.h \ gtkimmulticontext.h \
...@@ -239,13 +245,16 @@ source_headers = \ ...@@ -239,13 +245,16 @@ source_headers = \
gtklayout.h \ gtklayout.h \
gtklist.h \ gtklist.h \
gtklistitem.h \ gtklistitem.h \
gtkliststore.h \
gtkmain.h \ gtkmain.h \
gtkmenu.h \ gtkmenu.h \
gtkmenubar.h \ gtkmenubar.h \
gtkmenufactory.h \ gtkmenufactory.h \
gtkmenuitem.h \ gtkmenuitem.h \
gtkmenushell.h \ gtkmenushell.h \
gtkmessagedialog.h \
gtkmisc.h \ gtkmisc.h \
gtkmodelsimple.h \
gtknotebook.h \ gtknotebook.h \
gtkobject.h \ gtkobject.h \
gtkoptionmenu.h \ gtkoptionmenu.h \
...@@ -273,10 +282,14 @@ source_headers = \ ...@@ -273,10 +282,14 @@ source_headers = \
gtkspinbutton.h \ gtkspinbutton.h \
gtkstyle.h \ gtkstyle.h \
gtkstatusbar.h \ gtkstatusbar.h \
gtkstock.h \
gtktable.h \ gtktable.h \
gtktearoffmenuitem.h \ gtktearoffmenuitem.h \
gtktextbuffer.h \ gtktextbuffer.h \
gtktextchild.h \
gtktextdisplay.h \
gtktextiter.h \ gtktextiter.h \
gtktextlayout.h \
gtktextmark.h \ gtktextmark.h \
gtktexttag.h \ gtktexttag.h \
gtktexttagtable.h \ gtktexttagtable.h \
...@@ -289,6 +302,11 @@ source_headers = \ ...@@ -289,6 +302,11 @@ source_headers = \
gtktooltips.h \ gtktooltips.h \
gtktree.h \ gtktree.h \
gtktreeitem.h \ gtktreeitem.h \
gtktreemodel.h \
gtktreeselection.h \
gtktreestore.h \
gtktreeview.h \
gtktreeviewcolumn.h \
gtktypeutils.h \ gtktypeutils.h \
gtkvbbox.h \ gtkvbbox.h \
gtkvbox.h \ gtkvbox.h \
...@@ -337,8 +355,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id ...@@ -337,8 +355,8 @@ GENERATED = gtk.defs gtktypebuiltins.h gtktypebuiltins_vars.c gtktypebuiltins_id
generated : $(GENERATED) generated : $(GENERATED)
$(TOUCH) generated $(TOUCH) generated
gtk.defs : makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers) gtk.defs : makeenums.pl gtk-boxed.defs $(gtk_public_h_sources) $(gdk_headers)
$(PERL) makeenums.pl defs $(source_headers) $(gdk_headers) >gd.tmp $(PERL) makeenums.pl defs $(gtk_public_h_sources) $(gdk_headers) >gd.tmp
copy gd.tmp+gtk-boxed.defs gtk.defs copy gd.tmp+gtk-boxed.defs gtk.defs
@erase gd.tmp @erase gd.tmp
...@@ -356,7 +374,7 @@ gtktypebuiltins_ids.c: gtk.defs maketypes.awk ...@@ -356,7 +374,7 @@ gtktypebuiltins_ids.c: gtk.defs maketypes.awk
# generate enum value arrays # generate enum value arrays
gtktypebuiltins_evals.c: makeenums.pl gtk.defs 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 gtkmarshal.h gtkmarshal.c : gtkmarshal.list genmarshal.pl
$(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc $(PERL) genmarshal.pl gtkmarshal.list s-gmh s-gmc
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment