[glom] Make libegg object files depend on eggmarshalers

[Daniel Elstner <daniel src gnome org>]

commit 29741615f19d8177b54df3590db64f08e1113595
Author: Daniel Elstner <danielk openismus com>
Date:   Thu Jul 23 20:14:09 2009 +0200

    Make libegg object files depend on eggmarshalers
    
    * Makefile.am ($(*libegg*_a_OBJECTS)): Make all object files of
    libeggutil.a and libeggtoolpalette.a depend on the generated source
    files eggmarshalers.[ch].  This ensures that the marshaler files are
    generated before any of the libegg objects are compiled, but avoids
    having to resort to BUILT_SOURCES for that purpose.
    (*_libeggtoolpalette_a_LIBADD): Remove dependency on libeggutil.a
    again, as it is not required for linking the static library itself.

 ChangeLog   |   12 ++++++++++++
 Makefile.am |    8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 51dfb55..b0cb020 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-07-23  Daniel Elstner  <danielk openismus com>
 
+	Make libegg object files depend on eggmarshalers
+
+	* Makefile.am ($(*libegg*_a_OBJECTS)): Make all object files of
+	libeggutil.a and libeggtoolpalette.a depend on the generated source
+	files eggmarshalers.[ch].  This ensures that the marshaler files are
+	generated before any of the libegg objects are compiled, but avoids
+	having to resort to BUILT_SOURCES for that purpose.
+	(*_libeggtoolpalette_a_LIBADD): Remove dependency on libeggutil.a
+	again, as it is not required for linking the static library itself.
+
+2009-07-23  Daniel Elstner  <danielk openismus com>
+
 	* Makefile.am (*_libeggtoolpalette_a_LIBADD): List libeggutil.a as
 	dependency.
 
diff --git a/Makefile.am b/Makefile.am
index cc9b551..5142795 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -248,8 +248,6 @@ glom_utility_widgets_egg_toolpalette_libeggtoolpalette_a_SOURCES =	\
 	glom/utility_widgets/egg/toolpalette/eggtoolpaletteprivate.h
 
 glom_utility_widgets_egg_toolpalette_libeggtoolpalette_a_CPPFLAGS = $(libegg_cppflags)
-glom_utility_widgets_egg_toolpalette_libeggtoolpalette_a_LIBADD = \
-	glom/utility_widgets/egg/util/libeggutil.a
 
 glom_utility_widgets_egg_util_libeggutil_a_SOURCES =	\
 	glom/utility_widgets/egg/util/egg-marshal.c	\
@@ -743,7 +741,11 @@ uninstall-update-mime-database:
 	@$(POST_UNINSTALL)
 	test -n "$(DESTDIR)" || $(update_mime_database) "$(mimedir)"
 
-$(eggutildir)/egg-marshal.c: $(eggutildir)/eggmarshalers.c $(eggutildir)/eggmarshalers.h
+# Make all object files of libeggutil and libeggtoolpalette depend on
+# eggmarshalers.[ch], in preference to resorting to BUILT_SOURCES.
+$(glom_utility_widgets_egg_util_libeggutil_a_OBJECTS) \
+$(glom_utility_widgets_egg_toolpalette_libeggtoolpalette_a_OBJECTS): \
+	$(eggutildir)/eggmarshalers.c $(eggutildir)/eggmarshalers.h
 
 $(eggutildir)/eggmarshalers.h: $(eggmarshalers_list)
 	$(GLIB_GENMARSHAL) --prefix=_egg_marshal --header "$(eggmarshalers_list)" >'$@'