From 8afd2d8ecd677bbda3e13cb12630e8d80dee113b Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Thu, 26 Jun 2008 17:34:04 +0000 Subject: [PATCH] 2008-06-26 Dan Williams Patch from Michael Biebl * Clean up build system stuff git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3773 4912f4e0-d625-0410-9fb7-b9a5a253dbdc --- ChangeLog | 6 ++++++ callouts/Makefile.am | 2 +- libnm-glib/Makefile.am | 26 +++++++++++++------------- libnm-util/Makefile.am | 2 -- marshallers/Makefile.am | 10 ++-------- src/Makefile.am | 29 +++++++++++++---------------- src/backends/Makefile.am | 2 -- src/dhcp-manager/Makefile.am | 4 ---- src/ppp-manager/Makefile.am | 4 ++-- src/supplicant-manager/Makefile.am | 4 ---- src/vpn-manager/Makefile.am | 10 ++++------ system-settings/src/Makefile.am | 2 +- 12 files changed, 42 insertions(+), 59 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4ee8e49eb..df68a69ca1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-06-26 Dan Williams + + Patch from Michael Biebl + + * Clean up build system stuff + 2008-06-23 Christian Persch * vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c: diff --git a/callouts/Makefile.am b/callouts/Makefile.am index 330c463c23..70ce1fe6ea 100644 --- a/callouts/Makefile.am +++ b/callouts/Makefile.am @@ -44,7 +44,7 @@ nm_dispatcher_action_LDADD = \ $(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 diff --git a/libnm-glib/Makefile.am b/libnm-glib/Makefile.am index 4ffb6278fe..3b2fd8d313 100644 --- a/libnm-glib/Makefile.am +++ b/libnm-glib/Makefile.am @@ -100,43 +100,43 @@ libnm_glib_vpn_la_LIBADD = $(top_builddir)/libnm-util/libnm-util.la $(GLIB_LIBS) 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 diff --git a/libnm-util/Makefile.am b/libnm-util/Makefile.am index 94a00e9616..8f4255aee7 100644 --- a/libnm-util/Makefile.am +++ b/libnm-util/Makefile.am @@ -50,8 +50,6 @@ libnm_util_la_SOURCES= \ libnm_util_la_LDFLAGS= $(GLIB_LIBS) $(DBUS_LIBS) -libnm_util_la_CFLAGS=-fPIC - libnm_util_la_LIBADD = if WITH_GNUTLS diff --git a/marshallers/Makefile.am b/marshallers/Makefile.am index e877f17920..94be4bc6b9 100644 --- a/marshallers/Makefile.am +++ b/marshallers/Makefile.am @@ -20,16 +20,10 @@ 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~ + $(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 diff --git a/src/Makefile.am b/src/Makefile.am index 2a9b1d4d05..00a0036be1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -73,36 +73,36 @@ NetworkManager_SOURCES = \ 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 @@ built_sources = \ 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 @@ install-data-hook: $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir) -CLEANFILES = $(built_sources) +CLEANFILES = $(BUILT_SOURCES) diff --git a/src/backends/Makefile.am b/src/backends/Makefile.am index e988da56af..9ad2b3f326 100644 --- a/src/backends/Makefile.am +++ b/src/backends/Makefile.am @@ -63,8 +63,6 @@ libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS) libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(HAL_CFLAGS) \ - -g \ - -Wall \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index 78a3afaaa0..20f883d7e6 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -16,8 +16,6 @@ libdhcp_manager_la_CPPFLAGS = \ $(DBUS_CFLAGS) \ $(GTHREAD_CFLAGS) \ $(HAL_CFLAGS) \ - -g \ - -Wall \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DG_DISABLE_DEPRECATED \ -DBINDIR=\"$(bindir)\" \ @@ -32,5 +30,3 @@ libdhcp_manager_la_LIBADD = \ $(GTHREAD_LIBS) \ $(top_builddir)/marshallers/libmarshallers.la -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/ppp-manager/Makefile.am b/src/ppp-manager/Makefile.am index d36e09fac9..2503acc9ba 100644 --- a/src/ppp-manager/Makefile.am +++ b/src/ppp-manager/Makefile.am @@ -13,7 +13,7 @@ libppp_manager_la_SOURCES = \ 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 @@ nm_pppd_plugin_la_LIBADD = \ $(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 diff --git a/src/supplicant-manager/Makefile.am b/src/supplicant-manager/Makefile.am index 047bbec73f..6417c23517 100644 --- a/src/supplicant-manager/Makefile.am +++ b/src/supplicant-manager/Makefile.am @@ -31,7 +31,3 @@ libsupplicant_manager_la_LIBADD = \ $(GTHREAD_LIBS) \ $(top_builddir)/marshallers/libmarshallers.la -$(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES) - -CLEANFILES = $(BUILT_SOURCES) - diff --git a/src/vpn-manager/Makefile.am b/src/vpn-manager/Makefile.am index 18ad9a763e..d1741bc3d7 100644 --- a/src/vpn-manager/Makefile.am +++ b/src/vpn-manager/Makefile.am @@ -29,17 +29,15 @@ libvpn_manager_la_LIBADD = \ $(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) diff --git a/system-settings/src/Makefile.am b/system-settings/src/Makefile.am index a2025871da..5de45f88fc 100644 --- a/system-settings/src/Makefile.am +++ b/system-settings/src/Makefile.am @@ -52,7 +52,7 @@ nm_system_settings_LDADD = \ 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)