2007-10-01 Dan Williams <dcbw@redhat.com>

* configure.in
	  src/marshallers/Makefile.am
	  src/marshallers/nm-marshal.list
	  src/marshallers/nm-marshal-main.c
		- Consolidate glib marshallers into one place

	* src/dhcp-manager/Makefile.am
	  src/dhcp-manager/nm-dhcp-manager.c
	  src/supplicant-manager/Makefile.am
	  src/supplicant-manager/nm-supplicant-manager.c
	  src/supplicant-manager/nm-supplicant-interface.c
	  src/ppp-manager/Makefile.am
	  src/ppp-manager/nm-ppp-manager.c
	  src/vpn-manager/Makefile.am
	  src/vpn-manager/nm-vpn-connection.c
	  src/Makefile.am
		- Use consolidated marshallers

	* src/dhcp-manager/nm-dhcp-marshal.list
	  src/dhcp-manager/nm-dhcp-marshal-main.c
	  src/supplicant-manager/nm-supplicant-marshal-main.c
	  src/supplicant-manager/nm-supplicant-marshal.list
	  src/nm-marshal-main.c
	  src/nm-marshal.list
	  src/ppp-manager/nm-ppp-marshal-main.c
	  src/ppp-manager/nm-ppp-marshal.list
	  src/vpn-manager/nm-vpn-marshal-main.c
	  src/vpn-manager/nm-vpn-marshal.list
		- Remove



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2920 4912f4e0-d625-0410-9fb7-b9a5a253dbdc

src/dhcp-manager/Makefile.am

@@ -1,50 +1,36 @@
-INCLUDES = -I${top_srcdir}                       \
-           -I${top_srcdir}/include               \
-           -I${top_srcdir}/libnm-util            \
-           -I${top_srcdir}/src                   \
-           -I${top_srcdir}/src/named-manager
+INCLUDES = \
+	-I${top_srcdir} \
+	-I${top_srcdir}/include \
+	-I${top_builddir}/src/marshallers \
+	-I${top_srcdir}/libnm-util \
+	-I${top_srcdir}/src \
+	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libdhcp-manager.la
 
-BUILT_SOURCES = \
-	nm-dhcp-marshal.h \
-	nm-dhcp-marshal.c
-
 libdhcp_manager_la_SOURCES = \
 	nm-dhcp-manager.c \
-	nm-dhcp-manager.h \
-	nm-dhcp-marshal-main.c
+	nm-dhcp-manager.h
 
-libdhcp_manager_la_CPPFLAGS =	$(DBUS_CFLAGS)					\
-						$(GTHREAD_CFLAGS)				\
-						$(HAL_CFLAGS)					\
-						-g							\
-						-Wall						\
-						-DDBUS_API_SUBJECT_TO_CHANGE		\
-						-DG_DISABLE_DEPRECATED			\
-						-DBINDIR=\"$(bindir)\"			\
-						-DDATADIR=\"$(datadir)\"			\
-						-DSYSCONFDIR=\"$(sysconfdir)\"	\
-						-DLIBEXECDIR=\"$(libexecdir)\"	\
-						-DLOCALSTATEDIR=\"$(localstatedir)\"
+libdhcp_manager_la_CPPFLAGS = \
+	$(DBUS_CFLAGS) \
+	$(GTHREAD_CFLAGS) \
+	$(HAL_CFLAGS) \
+	-g \
+	-Wall \
+	-DDBUS_API_SUBJECT_TO_CHANGE \
+	-DG_DISABLE_DEPRECATED \
+	-DBINDIR=\"$(bindir)\" \
+	-DDATADIR=\"$(datadir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\" \
+	-DLOCALSTATEDIR=\"$(localstatedir)\"
 
 
-libdhcp_manager_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
+libdhcp_manager_la_LIBADD = \
+	$(DBUS_LIBS) \
+	$(GTHREAD_LIBS) \
+	$(top_builddir)/src/marshallers/libmarshallers.la
 
-EXTRA_DIST = nm-dhcp-marshal.list
 CLEANFILES = $(BUILT_SOURCES)
 
-nm-dhcp-marshal.h: nm-dhcp-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_dhcp_marshal $(srcdir)/nm-dhcp-marshal.list --header > \
-		xgen-gmh \
-	&& (cmp -s xgen-gmh nm-dhcp-marshal.h || cp xgen-gmh nm-dhcp-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-dhcp-marshal.c: nm-dhcp-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_dhcp_marshal $(srcdir)/nm-dhcp-marshal.list --body > \
-		xgen-gmc \
-	&& cp xgen-gmc nm-dhcp-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-dhcp-marshal-main.c: nm-dhcp-marshal.c nm-dhcp-marshal.h
-

src/dhcp-manager/nm-dhcp-manager.c

@@ -29,7 +29,7 @@
 #include <string.h>
 
 #include "nm-dhcp-manager.h"
-#include "nm-dhcp-marshal.h"
+#include "nm-marshal.h"
 #include "nm-utils.h"
 #include "NetworkManagerUtils.h"
 #include "nm-dbus-manager.h"
@@ -157,7 +157,7 @@ nm_dhcp_manager_class_init (NMDHCPManagerClass *manager_class)
 					  G_SIGNAL_RUN_FIRST,
 					  G_STRUCT_OFFSET (NMDHCPManagerClass, state_changed),
 					  NULL, NULL,
-					  nm_dhcp_marshal_VOID__STRING_UCHAR,
+					  nm_marshal_VOID__STRING_UCHAR,
 					  G_TYPE_NONE, 2,
 					  G_TYPE_STRING,
 					  G_TYPE_UCHAR);

src/dhcp-manager/nm-dhcp-marshal-main.c

@@ -1,3 +0,0 @@
-#include "nm-dhcp-marshal.h"
-#include "nm-dhcp-marshal.c"
-

src/dhcp-manager/nm-dhcp-marshal.list

@@ -1,2 +0,0 @@
-VOID:STRING,UCHAR
-