[Xfce4-commits] r26474 - in libxfcegui4/trunk: . libxfcegui4

[Nick Schermer]

Author: nick
Date: 2007-12-14 08:40:31 +0000 (Fri, 14 Dec 2007)
New Revision: 26474

Removed:
   libxfcegui4/trunk/libxfcegui4/netk-marshal.c
   libxfcegui4/trunk/libxfcegui4/netk-marshal.h
   libxfcegui4/trunk/libxfcegui4/xfce_marshal.c
   libxfcegui4/trunk/libxfcegui4/xfce_marshal.h
Modified:
   libxfcegui4/trunk/ChangeLog
   libxfcegui4/trunk/libxfcegui4/Makefile.am
Log:
	* libxfcegui4/{xfce_,netk-}marshal.{c,h}: Remove.
	* libxfcegui4/Makefile.am: Generate marshals during make and
	  add G_GNUC_INTERNAL.
	* libxfcegui4/Makefile.am: Don't add netk-marshal.h to the
	  included headers, mashals are only used internally.

Modified: libxfcegui4/trunk/ChangeLog
===================================================================
--- libxfcegui4/trunk/ChangeLog	2007-12-14 07:50:17 UTC (rev 26473)
+++ libxfcegui4/trunk/ChangeLog	2007-12-14 08:40:31 UTC (rev 26474)
@@ -1,5 +1,13 @@
 2007-12-13  Nick Schermer <nick at xfce.org>
 
+	* libxfcegui4/{xfce_,netk-}marshal.{c,h}: Remove.
+	* libxfcegui4/Makefile.am: Generate marshals during make and
+	  add G_GNUC_INTERNAL.
+	* libxfcegui4/Makefile.am: Don't add netk-marshal.h to the
+	  included headers, mashals are only used internally.
+
+2007-12-13  Nick Schermer <nick at xfce.org>
+
 	* libxfcegui4/netk-trayicon.h: Deprecated code. Last piece
 	  was used in xfce-mcs-plugin, but has been replaced by
 	  GtkStatusIcon.

Modified: libxfcegui4/trunk/libxfcegui4/Makefile.am
===================================================================
--- libxfcegui4/trunk/libxfcegui4/Makefile.am	2007-12-14 07:50:17 UTC (rev 26473)
+++ libxfcegui4/trunk/libxfcegui4/Makefile.am	2007-12-14 08:40:31 UTC (rev 26474)
@@ -26,12 +26,12 @@
 	netk-trayicon.h							
 
 netk_built_headers =							\
-	netk-enum-types.h						\
-	netk-marshal.h
+	netk-enum-types.h
 
 netk_built_sources =							\
 	$(netk_built_headers)						\
 	netk-enum-types.c						\
+	netk-marshal.h							\
 	netk-marshal.c
 
 gui_built_headers =							\
@@ -39,6 +39,8 @@
 
 gui_built_sources =							\
 	$(gui_built_headers)						\
+	xfce_marshal.h							\
+	xfce_marshal.c							\
 	gui-enum-types.c
 
 gui_headers =								\
@@ -53,7 +55,6 @@
 	xfce_iconbutton.h 						\
 	xfce_togglebutton.h 						\
 	xfce_menubutton.h 						\
-	xfce_marshal.h							\
 	xfce_systemtray.h						\
 	xfce-appmenuitem.h						\
 	xfce-colorbutton.h						\
@@ -115,8 +116,6 @@
 	xfce_togglebutton.h 						\
 	xfce_menubutton.c 						\
 	xfce_menubutton.h 						\
-	xfce_marshal.c							\
-	xfce_marshal.h							\
 	xfce_systemtray.c						\
 	xfce_systemtray.h						\
 	gtk_style.c 							\
@@ -273,7 +272,8 @@
 stamp-netk-marshal.h: netk-marshal.list Makefile
 	( cd $(srcdir) && glib-genmarshal \
 		--prefix=p_netk_marshal \
-		--header netk-marshal.list ) >> xgen-nmh \
+		--header netk-marshal.list \
+	    | sed -e 's/marshal_data);$$/marshal_data) G_GNUC_INTERNAL;/' ) >> xgen-nmh \
 	&& (cmp -s xgen-nmh netk-marshal.h || cp xgen-nmh netk-marshal.h) \
 	&& rm -f xgen-nmh \
 	&& echo timestamp > $(@F)
@@ -286,6 +286,26 @@
 		--body netk-marshal.list ) >> xgen-nmc \
 	&& cp xgen-nmc netk-marshal.c \
 	&& rm -f xgen-nmc
+	
+xfce_marshal.h: stamp-xfce_marshal.h
+	@true
+stamp-xfce_marshal.h: xfce_marshal.list Makefile
+	( cd $(srcdir) && glib-genmarshal \
+		--prefix=p_xfce_marshal \
+		--header xfce_marshal.list \
+	    | sed -e 's/marshal_data);$$/marshal_data) G_GNUC_INTERNAL;/' ) >> xgen-xmh \
+	&& (cmp -s xgen-xmh xfce_marshal.h || cp xgen-xmh xfce_marshal.h) \
+	&& rm -f xgen-xmh \
+	&& echo timestamp > $(@F)
+
+xfce_marshal.c: xfce_marshal.list Makefile
+	( cd $(srcdir) \
+		&& echo "#include <libxfcegui4/libxfcegui4.h>" \
+		&& glib-genmarshal \
+		--prefix=p_xfce_marshal \
+		--body xfce_marshal.list ) >> xgen-xmc \
+	&& cp xgen-xmc xfce_marshal.c \
+	&& rm -f xgen-xmc
 endif
 
 netk-inlinepixbufs.h: $(srcdir)/default_icon.png

Deleted: libxfcegui4/trunk/libxfcegui4/netk-marshal.c

Deleted: libxfcegui4/trunk/libxfcegui4/netk-marshal.h

Deleted: libxfcegui4/trunk/libxfcegui4/xfce_marshal.c

Deleted: libxfcegui4/trunk/libxfcegui4/xfce_marshal.h