[monkey-bubble: 236/753] Moved to libgnome.

[Sven Herzberg <herzi src gnome org>]

commit 352d90fd0bf24cbe60329f1046c0b95b3a2e7080
Author: Martin Baulig <baulig suse de>
Date:   Mon Apr 30 12:37:15 2001 +0000

    Moved to libgnome.
    
    2001-04-30  Martin Baulig  <baulig suse de>
    
    	* gnomemarshal.list, gnomemarshal-main.c: Moved to libgnome.

 libgnomeui/.cvsignore    |    3 ---
 libgnomeui/ChangeLog     |    4 ++++
 libgnomeui/Makefile.am   |   19 +------------------
 libgnomeui/libgnomeuiP.h |    3 +--
 4 files changed, 6 insertions(+), 23 deletions(-)
---
diff --git a/libgnomeui/.cvsignore b/libgnomeui/.cvsignore
index 3ee9b28..3b6e21f 100644
--- a/libgnomeui/.cvsignore
+++ b/libgnomeui/.cvsignore
@@ -32,7 +32,4 @@ gnome-corba-rexec-common.c
 gnome-corba-rexec.h
 gnome-remote-bootstrap
 gnome-rexec-server
-gnomemarshal.h
-gnomemarshal.c
-stamp-gnomemarshal.h
 libgnomeui-2.0.pc
diff --git a/libgnomeui/ChangeLog b/libgnomeui/ChangeLog
index 0197b88..fe4710a 100644
--- a/libgnomeui/ChangeLog
+++ b/libgnomeui/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-30  Martin Baulig  <baulig suse de>
+
+	* gnomemarshal.list, gnomemarshal-main.c: Moved to libgnome.
+
 2001-04-29  Martin Baulig  <baulig suse de>
 
 	* gnome-dock*.[ch]: Removed; use BonoboDock instead.
diff --git a/libgnomeui/Makefile.am b/libgnomeui/Makefile.am
index b17f904..ebef8d8 100644
--- a/libgnomeui/Makefile.am
+++ b/libgnomeui/Makefile.am
@@ -104,7 +104,6 @@ libgnomeui_2_la_SOURCES = \
 	gnome-icon-text.c		\
 	gnome-vfs-util.c		\
 	gnome-window.c			\
-	gnomemarshal-main.c		\
 	wap-textfu.c			\
 	$(noinst_HEADERS)
 
@@ -163,9 +162,7 @@ BUILT_SOURCES = \
 	gnometypebuiltins.h		\
 	gnometypebuiltins_evals.c	\
 	gnometypebuiltins_ids.c		\
-	gnometypebuiltins_vars.c	\
-	gnomemarshal.h			\
-	gnomemarshal.c
+	gnometypebuiltins_vars.c
 
 # generate gnome.defs file from gnome-boxed.defs and *.h
 gnome.defs: $(GNOME_MAKEENUMS) gnome-boxed.defs $(gnome_headers)
@@ -198,19 +195,6 @@ gnometypebuiltins_evals.c: $(GNOME_MAKEENUMS) gnome.defs
 	&& $(GNOME_MAKEENUMS) arrays $(gnome_headers) > gtbe.tmp \
 	&& mv gtbe.tmp gnometypebuiltins_evals.c
 
-stamp-gnomemarshal.h: gnomemarshal.list
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=gnome_marshal gnomemarshal.list --header >> xgen-gmh \
-	&& (cmp -s xgen-gmh gnomemarshal.h || cp xgen-gmh gnomemarshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~ \
-	&& echo timestamp > $(@F)
-
-gnomemarshal.h gnomemarshal.c: stamp-gnomemarshal.h
-	cd $(srcdir) \
-	&& glib-genmarshal --prefix=gnome_marshal gnomemarshal.list --body >> xgen-gmc \
-	&& cp xgen-gmc gnomemarshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
 #######################
 
 gnome_segv_SOURCES = gnome_segv.c
@@ -226,7 +210,6 @@ EXTRA_DIST =					\
 	$(gtkrc_DATA)				\
 	AUTHORS					\
 	gnome.defs 				\
-	gnomemarshal.list			\
 	gnome-boxed.defs			\
 	gnometypebuiltins_vars.c		\
 	gnometypebuiltins_ids.c			\
diff --git a/libgnomeui/libgnomeuiP.h b/libgnomeui/libgnomeuiP.h
index 7263621..e641a7c 100644
--- a/libgnomeui/libgnomeuiP.h
+++ b/libgnomeui/libgnomeuiP.h
@@ -32,10 +32,9 @@
 #include <gtk/gtktypeutils.h>
 
 
-
+#include <libgnome/libgnome.h>
 #include "gnome-macros.h"
 #include "gnometypebuiltins.h"
-#include "gnomemarshal.h"
 
 G_BEGIN_DECLS