[monkey-bubble: 233/753] Moved here from libgnomeui.

[Sven Herzberg <herzi src gnome org>]

commit 654d629f0ba3b584a17b76fd862b0bd6e88c72df
Author: Martin Baulig <baulig suse de>
Date:   Mon Apr 30 12:28:48 2001 +0000

    Moved here from libgnomeui.
    
    2001-04-30  Martin Baulig  <baulig suse de>
    
    	* gnome-marshal.list, gnome-marshal-main.c: Moved here
    	from libgnomeui.
    
    	* Makefile.am: Create gnome-marshal.[ch] from gnome-marshal.list.
    
    	* libgnome.h: #include <libgnome/gnome-marshal.h>.

 libgnome/ChangeLog            |    9 +++++++++
 libgnome/Makefile.am          |   21 +++++++++++++++++++--
 libgnome/gnome-marshal-main.c |    2 +-
 libgnome/libgnome.h           |    1 +
 4 files changed, 30 insertions(+), 3 deletions(-)
---
diff --git a/libgnome/ChangeLog b/libgnome/ChangeLog
index e545034..ef95bda 100644
--- a/libgnome/ChangeLog
+++ b/libgnome/ChangeLog
@@ -1,3 +1,12 @@
+2001-04-30  Martin Baulig  <baulig suse de>
+
+	* gnome-marshal.list, gnome-marshal-main.c: Moved here
+	from libgnomeui.
+
+	* Makefile.am: Create gnome-marshal.[ch] from gnome-marshal.list.
+
+	* libgnome.h: #include <libgnome/gnome-marshal.h>.
+
 2001-04-29  Martin Baulig  <baulig suse de>
 
 	* Makefile.am: Use the new glib-mkenums instead of our own
diff --git a/libgnome/Makefile.am b/libgnome/Makefile.am
index 194969e..04943fe 100644
--- a/libgnome/Makefile.am
+++ b/libgnome/Makefile.am
@@ -35,7 +35,8 @@ INCLUDES = \
 	-DG_LOG_DOMAIN=\"Gnome\"
 
 libgnome_2_la_SOURCES = \
-	$(BUILT_SOURCES)	\
+	libgnometypebuiltins.h	\
+	libgnometypebuiltins.c	\
 	gnome-program.c		\
 	gnome-config.c		\
 	gnome-ditem.c		\
@@ -67,6 +68,7 @@ libgnome_headers = \
 	gnome-util.h   		\
 	gnome-paper.h		\
 	gnome-preferences.h	\
+	gnome-marshal-main.c	\
 	libgnome-init.h		\
 	libgnome.h
 
@@ -131,13 +133,28 @@ $(srcdir)/libgnometypebuiltins.h: @REBUILD@ Makefile.am $(libgnome_headers)
 	&& cp xgen-gth $(@F) \
 	&& rm -f xgen-gth
 
+$(srcdir)/stamp-gnome-marshal.h: gnome-marshal.list
+	cd $(srcdir) \
+	&& glib-genmarshal --prefix=gnome_marshal gnome-marshal.list --header >> xgen-gmh \
+	&& (cmp -s xgen-gmh gnome-marshal.h || cp xgen-gmh gnome-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~ \
+	&& echo timestamp > $(@F)
+
+$(srcdir)/gnome-marshal.h $(srcdir)/gnome-marshal.c: stamp-gnome-marshal.h
+	cd $(srcdir) \
+	&& glib-genmarshal --prefix=gnome_marshal gnome-marshal.list --body >> xgen-gmc \
+	&& cp xgen-gmc gnome-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
 EXTRA_DIST = \
 	parse-path.cP			\
 	libgnome-2.0.pc.in
 
 BUILT_SOURCES = \
 	libgnometypebuiltins.h		\
-	libgnometypebuiltins.c
+	libgnometypebuiltins.c		\
+	gnome-marshal.h			\
+	gnome-marshal.c
 
 #just to be sure, add an explicit dependency
 gnome-config.o: parse-path.cP
diff --git a/libgnome/gnome-marshal-main.c b/libgnome/gnome-marshal-main.c
index ebc2fb7..f664007 100644
--- a/libgnome/gnome-marshal-main.c
+++ b/libgnome/gnome-marshal-main.c
@@ -24,7 +24,7 @@
   @NOTATION@
  */
 
-#include <libgnomeuiP.h>
+#include <libgnomeP.h>
 
 #include <gobject/genums.h>
 #include <gobject/gvaluetypes.h>
diff --git a/libgnome/libgnome.h b/libgnome/libgnome.h
index d508d23..9a0c346 100644
--- a/libgnome/libgnome.h
+++ b/libgnome/libgnome.h
@@ -42,6 +42,7 @@
 #include <libgnome/gnome-ditem.h>
 
 #include <libgnome/gnome-preferences.h>
+#include <libgnome/gnome-marshal.h>
 
 #include <libgnome/libgnome-init.h>