AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-23 20:30:15 +00:00
Code Issues Projects Releases Wiki Activity

fixups for glib-mkenums and glib-genmarshal (not tested yet because with

Browse Source 
2001-06-07  Havoc Pennington  <hp@redhat.com>

	* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
	(not tested yet because with absolute path to srcdir I can't build
	atk, but it was broken anyway so this may help)
This commit is contained in:
Havoc Pennington 2001-06-07 20:43:05 +00:00 committed by Havoc Pennington
parent d0351d1529
commit 138d95a9a5
10 changed files with 80 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
(not tested yet because with absolute path to srcdir I can't build
atk, but it was broken anyway so this may help)
2001-06-07 Havoc Pennington <hp@redhat.com>
* configure.in: output m4macros/Makefile

4
gdk-pixbuf/ChangeLog
View File

@ -1,3 +1,7 @@
2001-06-07 Havoc Pennington <hp@redhat.com>
* Makefile.am (gdk-pixbuf-marshal.c): fix up the glib-genmarshal path
2001-06-05 Havoc Pennington <hp@redhat.com>
* test-loaders.c (main): use putenv not setenv, reported by

16
gdk-pixbuf/Makefile.am
View File

@ -241,15 +241,21 @@ EXTRA_DIST = \
gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
cwd=`pwd` \
&& cd $(srcdir) \
&& $$cwd/@GLIB_GENMARSHAL@ --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \
case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \
&& (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
&& rm -f xgen-gmh xgen-gmh~
gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
cwd=`pwd` \
case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
esac; \
&& cd $(srcdir) \
&& $$cwd/@GLIB_GENMARSHAL@ --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
&& $$glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
&& (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \
&& rm -f xgen-gmc xgen-gmc~

35
gtk/Makefile.am
View File

@ -429,9 +429,12 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h: # never add deps here
# srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules.
$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
cwd=`pwd` \
&& cd $(srcdir) \
&& $$cwd/@GLIB_MKENUMS@ --comments ";; @comment@" \
case @GLIB_MKENUMS@ in \
/*) glib_mkenums=@GLIB_MKENUMS@ ;; \
*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums --comments ";; @comment@" \
--fprod "; enumerations from \"@filename@\"\n " \
--vhead "(define-@type@ @EnumName@" \
--vprod " (@valuenick@ @VALUENAME@)" \
@ -442,16 +445,21 @@ $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sourc
&& rm -f xgen-gdef \
&& echo timestamp > $(@F)
$(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
cwd=`pwd` \
&& cd $(srcdir) \
&& $$cwd/@GLIB_GENMARSHAL@ --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
cwd=`pwd` \
&& cd $(srcdir) \
&& $$cwd/@GLIB_GENMARSHAL@ --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
esac; \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gtkmarshal.c \
&& rm -f xgen-gmc xgen-gmc~
$(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
@ -471,9 +479,12 @@ $(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.def
&& cp xgen-gtbic $(@F) \
&& rm -f xgen-gtbic
$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
cwd=`pwd` \
&& cd $(srcdir) \
&& $$cwd/@GLIB_MKENUMS@ \
case @GLIB_MKENUMS@ in \
/*) glib_mkenums=@GLIB_MKENUMS@ ;; \
*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums \
--fprod "\n/* enumerations from \"@filename@\" */" \
--vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
--vprod " { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \