NetworkManager r3773 - in trunk: . callouts libnm-glib libnm-util marshallers src src/backends src/dhcp-manager src/ppp-manager src/supplicant-manager src/vpn-manager system-settings/src

[dcbw svn gnome org]

Author: dcbw
Date: Thu Jun 26 17:34:04 2008
New Revision: 3773
URL: http://svn.gnome.org/viewvc/NetworkManager?rev=3773&view=rev

Log:
2008-06-26  Dan Williams <dcbw redhat com>

	Patch from Michael Biebl <biebl debian org>

	* Clean up build system stuff



Modified:
   trunk/ChangeLog
   trunk/callouts/Makefile.am
   trunk/libnm-glib/Makefile.am
   trunk/libnm-util/Makefile.am
   trunk/marshallers/Makefile.am
   trunk/src/Makefile.am
   trunk/src/backends/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
   trunk/system-settings/src/Makefile.am

Modified: trunk/callouts/Makefile.am
==============================================================================
--- trunk/callouts/Makefile.am	(original)
+++ trunk/callouts/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -44,7 +44,7 @@
 	$(top_builddir)/libnm-util/libnm-util.la
 
 nm-dispatcher-glue.h: nm-dispatcher.xml
-	dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=nm-dispatcher-glue.h $(top_srcdir)/callouts/nm-dispatcher.xml
+	dbus-binding-tool --prefix=nm_dispatcher --mode=glib-server --output=$@ $<
 
 dbusactivationdir = $(datadir)/dbus-1/system-services
 dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in

Modified: trunk/libnm-glib/Makefile.am
==============================================================================
--- trunk/libnm-glib/Makefile.am	(original)
+++ trunk/libnm-glib/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -100,43 +100,43 @@
 
 
 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
+	dbus-binding-tool --prefix=nm_client --mode=glib-client --output=$@ $<
 
 nm-device-bindings.h: $(top_srcdir)/introspection/nm-device.xml
-	dbus-binding-tool --prefix=nm_device --mode=glib-client --output=nm-device-bindings.h $(top_srcdir)/introspection/nm-device.xml
+	dbus-binding-tool --prefix=nm_device --mode=glib-client --output=$@ $<
 
 nm-device-ethernet-bindings.h: $(top_srcdir)/introspection/nm-device-ethernet.xml
-	dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-client --output=nm-device-ethernet-bindings.h $(top_srcdir)/introspection/nm-device-ethernet.xml
+	dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-client --output=$@ $<
 
 nm-device-wifi-bindings.h: $(top_srcdir)/introspection/nm-device-wifi.xml
-	dbus-binding-tool --prefix=nm_device_wifi --mode=glib-client --output=nm-device-wifi-bindings.h $(top_srcdir)/introspection/nm-device-wifi.xml
+	dbus-binding-tool --prefix=nm_device_wifi --mode=glib-client --output=$@ $<
 
 nm-access-point-bindings.h: $(top_srcdir)/introspection/nm-access-point.xml
-	dbus-binding-tool --prefix=nm_access_point --mode=glib-client --output=nm-access-point-bindings.h $(top_srcdir)/introspection/nm-access-point.xml
+	dbus-binding-tool --prefix=nm_access_point --mode=glib-client --output=$@ $<
 
 nm-settings-glue.h: $(top_srcdir)/introspection/nm-settings.xml
-	dbus-binding-tool --prefix=nm_settings --mode=glib-server --output=nm-settings-glue.h $(top_srcdir)/introspection/nm-settings.xml
+	dbus-binding-tool --prefix=nm_settings --mode=glib-server --output=$@ $<
 
 nm-settings-bindings.h: $(top_srcdir)/introspection/nm-settings.xml
-	dbus-binding-tool --prefix=nm_settings --mode=glib-client --output=nm-settings-bindings.h $(top_srcdir)/introspection/nm-settings.xml
+	dbus-binding-tool --prefix=nm_settings --mode=glib-client --output=$@ $<
 
 nm-settings-system-bindings.h: $(top_srcdir)/introspection/nm-settings-system.xml
-	dbus-binding-tool --prefix=nm_settings_system --mode=glib-client --output=nm-settings-system-bindings.h $(top_srcdir)/introspection/nm-settings-system.xml
+	dbus-binding-tool --prefix=nm_settings_system --mode=glib-client --output=$@ $<
 
 nm-exported-connection-glue.h: $(top_srcdir)/introspection/nm-exported-connection.xml
-	dbus-binding-tool --prefix=nm_exported_connection --mode=glib-server --output=nm-exported-connection-glue.h $(top_srcdir)/introspection/nm-exported-connection.xml
+	dbus-binding-tool --prefix=nm_exported_connection --mode=glib-server --output=$@ $<
 
 nm-exported-connection-bindings.h: $(top_srcdir)/introspection/nm-exported-connection.xml
-	dbus-binding-tool --prefix=nm_exported_connection --mode=glib-client --output=nm-exported-connection-bindings.h $(top_srcdir)/introspection/nm-exported-connection.xml
+	dbus-binding-tool --prefix=nm_exported_connection --mode=glib-client --output=$@ $<
 
 nm-vpn-connection-bindings.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
-	dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-client --output=nm-vpn-connection-bindings.h $(top_srcdir)/introspection/nm-vpn-connection.xml
+	dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-client --output=$@ $<
 
 nm-vpn-plugin-glue.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
-	dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=nm-vpn-plugin-glue.h $(top_srcdir)/introspection/nm-vpn-plugin.xml
+	dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-server --output=$@ $<
 
 nm-active-connection-bindings.h: $(top_srcdir)/introspection/nm-active-connection.xml
-	dbus-binding-tool --prefix=nm_active_connection --mode=glib-client --output=nm-active-connection-bindings.h $(top_srcdir)/introspection/nm-active-connection.xml
+	dbus-binding-tool --prefix=nm_active_connection --mode=glib-client --output=$@ $<
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc

Modified: trunk/libnm-util/Makefile.am
==============================================================================
--- trunk/libnm-util/Makefile.am	(original)
+++ trunk/libnm-util/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -50,8 +50,6 @@
 
 libnm_util_la_LDFLAGS= $(GLIB_LIBS) $(DBUS_LIBS)
 
-libnm_util_la_CFLAGS=-fPIC
-
 libnm_util_la_LIBADD = 
 
 if WITH_GNUTLS

Modified: trunk/marshallers/Makefile.am
==============================================================================
--- trunk/marshallers/Makefile.am	(original)
+++ trunk/marshallers/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -20,16 +20,10 @@
 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~
+	$(GLIB_GENMARSHAL) $< --prefix=nm_marshal --header > $@
 
 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~
+	$(GLIB_GENMARSHAL) $< --prefix=nm_marshal --body > $@
 
 nm-marshal-main.c: nm-marshal.c nm-marshal.h
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -73,36 +73,36 @@
 		nm-netlink.h
 
 nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml
-	dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=nm-access-point-glue.h $(top_srcdir)/introspection/nm-access-point.xml
+	dbus-binding-tool --prefix=nm_access_point --mode=glib-server --output=$@ $<
 
 nm-manager-glue.h: $(top_srcdir)/introspection/nm-manager.xml
-	dbus-binding-tool --prefix=nm_manager --mode=glib-server --output=nm-manager-glue.h $(top_srcdir)/introspection/nm-manager.xml
+	dbus-binding-tool --prefix=nm_manager --mode=glib-server --output=$@ $<
 
 nm-device-interface-glue.h: $(top_srcdir)/introspection/nm-device.xml
-	dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=nm-device-interface-glue.h $(top_srcdir)/introspection/nm-device.xml
+	dbus-binding-tool --prefix=nm_device_interface --mode=glib-server --output=$@ $<
 
 nm-device-ethernet-glue.h: $(top_srcdir)/introspection/nm-device-ethernet.xml
-	dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-server --output=nm-device-ethernet-glue.h $(top_srcdir)/introspection/nm-device-ethernet.xml
+	dbus-binding-tool --prefix=nm_device_ethernet --mode=glib-server --output=$@ $<
 
 nm-device-wifi-glue.h: $(top_srcdir)/introspection/nm-device-wifi.xml
-	dbus-binding-tool --prefix=nm_device_wifi --mode=glib-server --output=nm-device-wifi-glue.h $(top_srcdir)/introspection/nm-device-wifi.xml
+	dbus-binding-tool --prefix=nm_device_wifi --mode=glib-server --output=$@ $<
 
 nm-serial-device-glue.h: $(top_srcdir)/introspection/nm-device-serial.xml
-	dbus-binding-tool --prefix=nm_serial_device --mode=glib-server --output=nm-serial-device-glue.h $(top_srcdir)/introspection/nm-device-serial.xml
+	dbus-binding-tool --prefix=nm_serial_device --mode=glib-server --output=$@ $<
 
 nm-cdma-device-glue.h: $(top_srcdir)/introspection/nm-device-cdma.xml
-	dbus-binding-tool --prefix=nm_cdma_device --mode=glib-server --output=nm-cdma-device-glue.h $(top_srcdir)/introspection/nm-device-cdma.xml
+	dbus-binding-tool --prefix=nm_cdma_device --mode=glib-server --output=$@ $<
 
 nm-gsm-device-glue.h: $(top_srcdir)/introspection/nm-device-gsm.xml
-	dbus-binding-tool --prefix=nm_gsm_device --mode=glib-server --output=nm-gsm-device-glue.h $(top_srcdir)/introspection/nm-device-gsm.xml
+	dbus-binding-tool --prefix=nm_gsm_device --mode=glib-server --output=$@ $<
 
 nm-ip4-config-glue.h: $(top_srcdir)/introspection/nm-ip4-config.xml
-	dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=nm-ip4-config-glue.h $(top_srcdir)/introspection/nm-ip4-config.xml
+	dbus-binding-tool --prefix=nm_ip4_config --mode=glib-server --output=$@ $<
 
 nm-active-connection-glue.h: $(top_srcdir)/introspection/nm-active-connection.xml
-	dbus-binding-tool --prefix=nm_active_connection --mode=glib-server --output=nm-active-connection-glue.h $(top_srcdir)/introspection/nm-active-connection.xml
+	dbus-binding-tool --prefix=nm_active_connection --mode=glib-server --output=$@ $<
 
-built_sources = 					\
+BUILT_SOURCES = 					\
 	nm-access-point-glue.h				\
 	nm-manager-glue.h				\
 	nm-device-interface-glue.h			\
@@ -112,10 +112,7 @@
 	nm-cdma-device-glue.h \
 	nm-gsm-device-glue.h \
 	nm-ip4-config-glue.h				\
-	nm-active-connection-glue.h \
-	$(NULL)
-
-$(NetworkManager_OBJECTS): $(built_sources)
+	nm-active-connection-glue.h
 
 NetworkManager_CPPFLAGS = 							\
 	$(DBUS_CFLAGS)									\
@@ -181,5 +178,5 @@
 	   $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
 	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
 
-CLEANFILES = $(built_sources)
+CLEANFILES = $(BUILT_SOURCES)
 

Modified: trunk/src/backends/Makefile.am
==============================================================================
--- trunk/src/backends/Makefile.am	(original)
+++ trunk/src/backends/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -63,8 +63,6 @@
 libnmbackend_la_CPPFLAGS =	$(DBUS_CFLAGS)				\
 					$(GTHREAD_CFLAGS)				\
 					$(HAL_CFLAGS)					\
-					-g							\
-					-Wall						\
 					-DDBUS_API_SUBJECT_TO_CHANGE		\
 					-DG_DISABLE_DEPRECATED			\
 					-DBINDIR=\"$(bindir)\"			\

Modified: trunk/src/dhcp-manager/Makefile.am
==============================================================================
--- trunk/src/dhcp-manager/Makefile.am	(original)
+++ trunk/src/dhcp-manager/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -16,8 +16,6 @@
 	$(DBUS_CFLAGS) \
 	$(GTHREAD_CFLAGS) \
 	$(HAL_CFLAGS) \
-	-g \
-	-Wall \
 	-DDBUS_API_SUBJECT_TO_CHANGE \
 	-DG_DISABLE_DEPRECATED \
 	-DBINDIR=\"$(bindir)\" \
@@ -32,5 +30,3 @@
 	$(GTHREAD_LIBS) \
 	$(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	Thu Jun 26 17:34:04 2008
@@ -13,7 +13,7 @@
 	nm-ppp-status.h
 
 nm-ppp-manager-glue.h: $(top_srcdir)/introspection/nm-ppp-manager.xml
-	dbus-binding-tool --prefix=nm_ppp_manager --mode=glib-server --output=nm-ppp-manager-glue.h $(top_srcdir)/introspection/nm-ppp-manager.xml
+	dbus-binding-tool --prefix=nm_ppp_manager --mode=glib-server --output=$@ $<
 
 built_sources = nm-ppp-manager-glue.h
 
@@ -52,7 +52,7 @@
 	$(top_builddir)/libnm-util/libnm-util.la
 
 nm-pppd-plugin-glue.h: nm-pppd-plugin.xml
-	dbus-binding-tool --prefix=nm_pppd_plugin --mode=glib-server --output=nm-pppd-plugin-glue.h $(top_srcdir)/src/ppp-manager/nm-pppd-plugin.xml
+	dbus-binding-tool --prefix=nm_pppd_plugin --mode=glib-server --output=$@ $<
 
 BUILT_SOURCES = nm-pppd-plugin-glue.h nm-ppp-manager-glue.h
 

Modified: trunk/src/supplicant-manager/Makefile.am
==============================================================================
--- trunk/src/supplicant-manager/Makefile.am	(original)
+++ trunk/src/supplicant-manager/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -31,7 +31,3 @@
 	$(GTHREAD_LIBS) \
 	$(top_builddir)/marshallers/libmarshallers.la
 
-$(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES)
-
-CLEANFILES = $(BUILT_SOURCES)
-

Modified: trunk/src/vpn-manager/Makefile.am
==============================================================================
--- trunk/src/vpn-manager/Makefile.am	(original)
+++ trunk/src/vpn-manager/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -29,17 +29,15 @@
 	$(top_builddir)/libnm-util/libnm-util.la
 
 nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml
-	dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-server --output=nm-vpn-connection-glue.h $(top_srcdir)/introspection/nm-vpn-connection.xml
+	dbus-binding-tool --prefix=nm_vpn_connection --mode=glib-server --output=$@ $<
 
 nm-vpn-plugin-bindings.h: $(top_srcdir)/introspection/nm-vpn-plugin.xml
-	dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-client --output=nm-vpn-plugin-bindings.h $(top_srcdir)/introspection/nm-vpn-plugin.xml
+	dbus-binding-tool --prefix=nm_vpn_plugin --mode=glib-client --output=$@ $<
 
 
-built_sources = \
+BUILT_SOURCES = \
 	nm-vpn-connection-glue.h \
 	nm-vpn-plugin-bindings.h
 
-$(libvpn_manager_la_OBJECTS): $(built_sources)
-
-CLEANFILES = $(built_sources)
+CLEANFILES = $(BUILT_SOURCES)
 

Modified: trunk/system-settings/src/Makefile.am
==============================================================================
--- trunk/system-settings/src/Makefile.am	(original)
+++ trunk/system-settings/src/Makefile.am	Thu Jun 26 17:34:04 2008
@@ -52,7 +52,7 @@
 nm_system_settings_LDFLAGS = -rdynamic
 
 nm-settings-system-glue.h: $(top_srcdir)/introspection/nm-settings-system.xml
-	dbus-binding-tool --prefix=nm_settings_system --mode=glib-server --output=nm-settings-system-glue.h $(top_srcdir)/introspection/nm-settings-system.xml
+	dbus-binding-tool --prefix=nm_settings_system --mode=glib-server --output=$@ $<
 
 
 dbusservicedir = $(DBUS_SYS_DIR)