GNOME.org
 

NetworkManager r3533 - in trunk: . libnm-glib marshallers src src/dhcp-manager src/marshallers src/ppp-manager src/supplicant-manager src/vpn-manager

Author: dcbw
Date: Sat Apr  5 17:28:24 2008
New Revision: 3533
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3533&view=rev

Log:
2008-04-05  Dan Williams  <dcbw redhat com>

	* Makefile.am
	  configure.in
	  marshallers/Makefile.am
	  marshallers/nm-marshal-main.c
	  marshallers/nm-marshal.list
		- Consolidate marshallers

	* libnm-glib/nm-marshal-main.c
	  libnm-glib/nm-marshal.list
	  src/marshallers/Makefile.am
	  src/marshallers/nm-marshal-main.c
	  src/marshallers/nm-marshal.list
		- Remove

	* libnm-glib/Makefile.am
	  src/Makefile.am
	  src/dhcp-manager/Makefile.am
	  src/ppp-manager/Makefile.am
	  src/supplicant-manager/Makefile.am
	  src/vpn-manager/Makefile.am
		- Use consolidated marshallers



Added:
   trunk/marshallers/
   trunk/marshallers/Makefile.am
   trunk/marshallers/nm-marshal-main.c
   trunk/marshallers/nm-marshal.list
Removed:
   trunk/libnm-glib/nm-marshal-main.c
   trunk/libnm-glib/nm-marshal.list
   trunk/src/marshallers/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/configure.in
   trunk/libnm-glib/Makefile.am
   trunk/src/Makefile.am
   trunk/src/dhcp-manager/Makefile.am
   trunk/src/ppp-manager/Makefile.am
   trunk/src/supplicant-manager/Makefile.am
   trunk/src/vpn-manager/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -22,6 +22,7 @@
 endif
 
 SUBDIRS = 				\
+	   marshallers			\
 	   libnm-util			\
 	   libnm-glib			\
 	   src				\

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Apr  5 17:28:24 2008
@@ -289,7 +289,7 @@
 Makefile
 include/Makefile
 src/Makefile
-src/marshallers/Makefile
+marshallers/Makefile
 src/named-manager/Makefile
 src/vpn-manager/Makefile
 src/dhcp-manager/Makefile

Modified: trunk/libnm-glib/Makefile.am
==============================================================================
--- trunk/libnm-glib/Makefile.am	(original)
+++ trunk/libnm-glib/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -1,4 +1,7 @@
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libnm-util
+INCLUDES = \
+	-I$(top_srcdir)/include \
+	-I$(top_srcdir)/libnm-util \
+	-I$(top_builddir)/marshallers
 
 BUILT_SOURCES = \
 	nm-access-point-bindings.h \
@@ -6,8 +9,6 @@
 	nm-device-bindings.h \
 	nm-device-802-3-ethernet-bindings.h \
 	nm-device-802-11-wireless-bindings.h \
-	nm-marshal.h \
-	nm-marshal.c \
 	nm-exported-connection-glue.h \
 	nm-settings-glue.h \
 	nm-vpn-connection-bindings.h \
@@ -59,7 +60,6 @@
 	nm-gsm-device.c	\
 	nm-cdma-device.c	\
 	nm-vpn-connection.c	\
-	nm-marshal-main.c \
 	nm-types.c \
 	nm-types-private.h \
 	nm-object-cache.c \
@@ -68,6 +68,7 @@
 
 libnm_glib_la_LIBADD = \
 	$(top_builddir)/libnm-util/libnm-util.la	\
+	$(top_builddir)/marshallers/libmarshallers.la	\
 	$(GLIB_LIBS)					\
 	$(GTHREAD_LIBS)					\
 	$(DBUS_LIBS)					\
@@ -85,20 +86,6 @@
 libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) $(DBUS_LIBS)
 
 
-nm-marshal.h: Makefile.am nm-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
-	xgen-gmh \
-	&& (cmp -s xgen-gmh nm-marshal.h || cp xgen-gmh nm-marshal.h) \
-	&& rm -f xgen-gmh xgen-gmh~
-
-nm-marshal.c: Makefile.am nm-marshal.list
-	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \
-	xgen-gmc \
-	&& cp xgen-gmc nm-marshal.c \
-	&& rm -f xgen-gmc xgen-gmc~
-
-nm-marshal-main.c: nm-marshal.c nm-marshal.h
-
 nm-client-bindings.h: $(top_srcdir)/introspection/nm-manager-client.xml
 	dbus-binding-tool --prefix=nm_client --mode=glib-client --output=nm-client-bindings.h $(top_srcdir)/introspection/nm-manager-client.xml
 
@@ -134,7 +121,7 @@
 
 DISTCLEANFILES = libnm_glib.pc
 
-EXTRA_DIST = libnm_glib.pc.in nm-marshal.list
+EXTRA_DIST = libnm_glib.pc.in
 
 CLEANFILES = \
 	$(BUILT_SOURCES)

Added: trunk/marshallers/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/marshallers/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -0,0 +1,35 @@
+noinst_LTLIBRARIES = libmarshallers.la
+
+BUILT_SOURCES = \
+	nm-marshal.h \
+	nm-marshal.c
+
+libmarshallers_la_SOURCES = \
+	nm-marshal-main.c
+
+libmarshallers_la_CPPFLAGS = \
+	$(GTHREAD_CFLAGS) \
+	-g \
+	-Wall \
+	-DG_DISABLE_DEPRECATED
+
+
+libmarshallers_la_LIBADD = $(GTHREAD_LIBS)
+
+EXTRA_DIST = nm-marshal.list
+CLEANFILES = $(BUILT_SOURCES)
+
+nm-marshal.h: nm-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \
+		xgen-gmh \
+	&& (cmp -s xgen-gmh nm-marshal.h || cp xgen-gmh nm-marshal.h) \
+	&& rm -f xgen-gmh xgen-gmh~
+
+nm-marshal.c: nm-marshal.list
+	$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \
+		xgen-gmc \
+	&& cp xgen-gmc nm-marshal.c \
+	&& rm -f xgen-gmc xgen-gmc~
+
+nm-marshal-main.c: nm-marshal.c nm-marshal.h
+

Added: trunk/marshallers/nm-marshal-main.c
==============================================================================
--- (empty file)
+++ trunk/marshallers/nm-marshal-main.c	Sat Apr  5 17:28:24 2008
@@ -0,0 +1,2 @@
+#include "nm-marshal.h"
+#include "nm-marshal.c"

Added: trunk/marshallers/nm-marshal.list
==============================================================================
--- (empty file)
+++ trunk/marshallers/nm-marshal.list	Sat Apr  5 17:28:24 2008
@@ -0,0 +1,13 @@
+VOID:OBJECT
+VOID:OBJECT,STRING
+VOID:OBJECT,UINT
+VOID:OBJECT,POINTER
+VOID:POINTER
+VOID:STRING,STRING,STRING
+VOID:UINT,UINT
+VOID:STRING,STRING
+VOID:STRING,UCHAR
+VOID:STRING,OBJECT
+VOID:OBJECT,UINT,UINT
+VOID:STRING,INT
+

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -1,5 +1,4 @@
 SUBDIRS= \
-	marshallers \
 	named-manager \
 	vpn-manager \
 	dhcp-manager \
@@ -9,7 +8,7 @@
 
 INCLUDES = -I${top_srcdir}                   \
            -I${top_srcdir}/include           \
-           -I${top_builddir}/src/marshallers   \
+           -I${top_builddir}/marshallers   \
            -I${top_srcdir}/src/named-manager \
            -I${top_srcdir}/src/vpn-manager   \
            -I${top_srcdir}/src/dhcp-manager  \
@@ -134,7 +133,7 @@
 			$(GTHREAD_LIBS)					\
 			$(HAL_LIBS)						\
 			$(LIBNL_LIBS)						\
-			./marshallers/libmarshallers.la	\
+			$(top_builddir)/marshallers/libmarshallers.la	\
 			./named-manager/libnamed-manager.la	\
 			./vpn-manager/libvpn-manager.la		\
 			./dhcp-manager/libdhcp-manager.la		\

Modified: trunk/src/dhcp-manager/Makefile.am
==============================================================================
--- trunk/src/dhcp-manager/Makefile.am	(original)
+++ trunk/src/dhcp-manager/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -1,7 +1,7 @@
 INCLUDES = \
 	-I${top_srcdir} \
 	-I${top_srcdir}/include \
-	-I${top_builddir}/src/marshallers \
+	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/src/named-manager
@@ -30,7 +30,7 @@
 libdhcp_manager_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GTHREAD_LIBS) \
-	$(top_builddir)/src/marshallers/libmarshallers.la
+	$(top_builddir)/marshallers/libmarshallers.la
 
 CLEANFILES = $(BUILT_SOURCES)
 

Modified: trunk/src/ppp-manager/Makefile.am
==============================================================================
--- trunk/src/ppp-manager/Makefile.am	(original)
+++ trunk/src/ppp-manager/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -3,7 +3,7 @@
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src \
-	-I${top_builddir}/src/marshallers
+	-I${top_builddir}/marshallers
 
 noinst_LTLIBRARIES = libppp-manager.la
 
@@ -30,7 +30,7 @@
 libppp_manager_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GLIB_LIBS) \
-	$(top_builddir)/src/marshallers/libmarshallers.la
+	$(top_builddir)/marshallers/libmarshallers.la
 
 pppd_plugindir = $(PPPD_PLUGIN_DIR)
 pppd_plugin_LTLIBRARIES = nm-pppd-plugin.la

Modified: trunk/src/supplicant-manager/Makefile.am
==============================================================================
--- trunk/src/supplicant-manager/Makefile.am	(original)
+++ trunk/src/supplicant-manager/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -2,7 +2,7 @@
 	-I${top_srcdir}/src \
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/libnm-util \
-	-I${top_builddir}/src/marshallers \
+	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/src/named-manager
 
 noinst_LTLIBRARIES = libsupplicant-manager.la
@@ -29,7 +29,7 @@
 libsupplicant_manager_la_LIBADD = \
 	$(DBUS_LIBS) \
 	$(GTHREAD_LIBS) \
-	$(top_builddir)/src/marshallers/libmarshallers.la
+	$(top_builddir)/marshallers/libmarshallers.la
 
 $(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES)
 

Modified: trunk/src/vpn-manager/Makefile.am
==============================================================================
--- trunk/src/vpn-manager/Makefile.am	(original)
+++ trunk/src/vpn-manager/Makefile.am	Sat Apr  5 17:28:24 2008
@@ -3,7 +3,7 @@
 	-I${top_srcdir}/include \
 	-I${top_srcdir}/libnm-util \
 	-I${top_srcdir}/src \
-	-I${top_builddir}/src/marshallers \
+	-I${top_builddir}/marshallers \
 	-I${top_srcdir}/src/named-manager \
 	-DVPN_NAME_FILES_DIR=\""$(sysconfdir)/NetworkManager/VPN"\"
 
@@ -25,7 +25,7 @@
 libvpn_manager_la_LIBADD =	\
 	$(DBUS_LIBS)		\
 	$(GTHREAD_LIBS)		\
-	$(top_builddir)/src/marshallers/libmarshallers.la \
+	$(top_builddir)/marshallers/libmarshallers.la \
 	$(top_builddir)/libnm-util/libnm-util.la
 
 nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]