devhelp r1074 - in trunk: . src

[rhult svn gnome org]

Author: rhult
Date: Wed Oct  1 20:34:26 2008
New Revision: 1074
URL: http://svn.gnome.org/viewvc/devhelp?rev=1074&view=rev

Log:
2008-10-01  Richard Hult  <richard imendio com>

	* src/Makefile.am:
	* src/dh-book-tree.c: (book_tree_class_init):
	* src/dh-marshal-main.c:
	* src/dh-search.c: (search_class_init): Get rid of the
	marshal-main file.


Removed:
   trunk/src/dh-marshal-main.c
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am
   trunk/src/dh-book-tree.c
   trunk/src/dh-search.c

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Oct  1 20:34:26 2008
@@ -38,7 +38,8 @@
 libdevhelp_1_la_SOURCES =				\
 	bacon-message-connection.c			\
 	bacon-message-connection.h			\
-	dh-marshal-main.c				\
+	dh-marshal.c					\
+	dh-marshal.h					\
 	dh-base.c					\
 	dh-book-tree.c					\
 	dh-error.c					\
@@ -67,27 +68,25 @@
 libdevhelp_1_la_LDFLAGS =				\
 	$(ZLIB_LDFLAGS)
 
-dh-marshal.h: dh-marshal.list
+MARSHAL=dh
+$(MARSHAL)-marshal.h: $(MARSHAL)-marshal.list
 	(cd $(srcdir) && \
-	@GLIB_GENMARSHAL@ --prefix=dh_marshal dh-marshal.list --header) > xgen-gmh \
-	&& (cmp -s xgen-gmh dh-marshal.h || cp xgen-gmh dh-marshal.h) \
+	$(GLIB_GENMARSHAL) --prefix=_$(MARSHAL)_marshal $(MARSHAL)-marshal.list --header) > xgen-gmh \
+	&& (cmp -s xgen-gmh $(MARSHAL)-marshal.h || cp xgen-gmh $(MARSHAL)-marshal.h) \
 	&& rm -f xgen-gmh xgen-gmh~
 
-dh-marshal.c: dh-marshal.list
+$(MARSHAL)-marshal.c: $(MARSHAL)-marshal.list
 	(cd $(srcdir) && \
-	@GLIB_GENMARSHAL@ --prefix=dh_marshal dh-marshal.list --body) > xgen-gmc \
-	&& cp xgen-gmc dh-marshal.c \
+	echo "#include \"$(MARSHAL)-marshal.h\""; \
+	$(GLIB_GENMARSHAL) --prefix=_$(MARSHAL)_marshal $(MARSHAL)-marshal.list --body) > xgen-gmc \
+	&& cp xgen-gmc $(MARSHAL)-marshal.c \
 	&& rm -f xgen-gmc xgen-gmc~
 
-dh-marshal-main.c: dh-marshal.c dh-marshal.h
-
-BUILT_SOURCES =						\
-	dh-marshal.h					\
-	dh-marshal.c
-
-EXTRA_DIST =						\
-	dh-marshal.list					
-
-#	$(devhelpinclude_HEADERS)
-
-CLEANFILES = $(BUILT_SOURCES)
+BUILT_SOURCES = 			\
+	$(MARSHAL)-marshal.h		\
+	$(MARSHAL)-marshal.c		\
+	$(NULL)
+
+EXTRA_DIST =				\
+	$(MARSHAL)-marshal.list		\
+	$(NULL)

Modified: trunk/src/dh-book-tree.c
==============================================================================
--- trunk/src/dh-book-tree.c	(original)
+++ trunk/src/dh-book-tree.c	Wed Oct  1 20:34:26 2008
@@ -121,7 +121,7 @@
 			      G_STRUCT_OFFSET (DhBookTreeClass,
 					       link_selected),
 			      NULL, NULL,
-			      dh_marshal_VOID__POINTER,
+			      _dh_marshal_VOID__POINTER,
 			      G_TYPE_NONE,
 			      1, G_TYPE_POINTER);
 }

Modified: trunk/src/dh-search.c
==============================================================================
--- trunk/src/dh-search.c	(original)
+++ trunk/src/dh-search.c	Wed Oct  1 20:34:26 2008
@@ -155,7 +155,7 @@
 			      G_SIGNAL_RUN_LAST,
 			      G_STRUCT_OFFSET (DhSearchClass, link_selected),
 			      NULL, NULL,
-			      dh_marshal_VOID__POINTER,
+			      _dh_marshal_VOID__POINTER,
 			      G_TYPE_NONE,
 			      1, G_TYPE_POINTER);
 }