fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 05:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

2008-06-26 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Michael Biebl <biebl@debian.org>

	* Clean up build system stuff



git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3773 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2008-06-26 17:34:04 +00:00
parent 1ad0ec8a31
commit 8afd2d8ecd
12 changed files with 42 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2008-06-26 Dan Williams <dcbw@redhat.com>
Patch from Michael Biebl <biebl@debian.org>
* Clean up build system stuff
2008-06-23 Christian Persch <chpe@gnome.org> 2008-06-23 Christian Persch <chpe@gnome.org>
* vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c: * vpn-daemons/openvpn/auth-dialog/gnome-two-password-dialog.c:

2
callouts/Makefile.am
View file

@ -44,7 +44,7 @@ nm_dispatcher_action_LDADD = \
$(top_builddir)/libnm-util/libnm-util.la $(top_builddir)/libnm-util/libnm-util.la
nm-dispatcher-glue.h: nm-dispatcher.xml 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 dbusactivationdir = $(datadir)/dbus-1/system-services
dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in

26
libnm-glib/Makefile.am
View file

@ -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 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 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 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 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 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 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 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 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 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 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 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 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 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 pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc pkgconfig_DATA = libnm_glib.pc libnm_glib_vpn.pc

2
libnm-util/Makefile.am
View file

@ -50,8 +50,6 @@ libnm_util_la_SOURCES= \
libnm_util_la_LDFLAGS= $(GLIB_LIBS) $(DBUS_LIBS) libnm_util_la_LDFLAGS= $(GLIB_LIBS) $(DBUS_LIBS)
libnm_util_la_CFLAGS=-fPIC
libnm_util_la_LIBADD = libnm_util_la_LIBADD =
if WITH_GNUTLS if WITH_GNUTLS

10
marshallers/Makefile.am
View file

@ -20,16 +20,10 @@ EXTRA_DIST = nm-marshal.list
CLEANFILES = $(BUILT_SOURCES) CLEANFILES = $(BUILT_SOURCES)
nm-marshal.h: nm-marshal.list nm-marshal.h: nm-marshal.list
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --header > \ $(GLIB_GENMARSHAL) $< --prefix=nm_marshal --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 nm-marshal.c: nm-marshal.list
$(GLIB_GENMARSHAL) --prefix=nm_marshal $(srcdir)/nm-marshal.list --body > \ $(GLIB_GENMARSHAL) $< --prefix=nm_marshal --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-marshal-main.c: nm-marshal.c nm-marshal.h

29
src/Makefile.am
View file

@ -73,36 +73,36 @@ NetworkManager_SOURCES = \
nm-netlink.h nm-netlink.h
nm-access-point-glue.h: $(top_srcdir)/introspection/nm-access-point.xml 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 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 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 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 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 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 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 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 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 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-access-point-glue.h \
nm-manager-glue.h \ nm-manager-glue.h \
nm-device-interface-glue.h \ nm-device-interface-glue.h \
@ -112,10 +112,7 @@ built_sources = \
nm-cdma-device-glue.h \ nm-cdma-device-glue.h \
nm-gsm-device-glue.h \ nm-gsm-device-glue.h \
nm-ip4-config-glue.h \ nm-ip4-config-glue.h \
nm-active-connection-glue.h \ nm-active-connection-glue.h
$(NULL)
$(NetworkManager_OBJECTS): $(built_sources)
NetworkManager_CPPFLAGS = \ NetworkManager_CPPFLAGS = \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
@ -181,5 +178,5 @@ install-data-hook:
$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir) $(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir) $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
CLEANFILES = $(built_sources) CLEANFILES = $(BUILT_SOURCES)

2
src/backends/Makefile.am
View file

@ -63,8 +63,6 @@ libnmbackend_la_LIBADD += $(DBUS_LIBS) $(GTHREAD_LIBS)
libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \ libnmbackend_la_CPPFLAGS = $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
$(HAL_CFLAGS) \ $(HAL_CFLAGS) \
-g \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \

4
src/dhcp-manager/Makefile.am
View file

@ -16,8 +16,6 @@ libdhcp_manager_la_CPPFLAGS = \
$(DBUS_CFLAGS) \ $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \ $(GTHREAD_CFLAGS) \
$(HAL_CFLAGS) \ $(HAL_CFLAGS) \
-g \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \
@ -32,5 +30,3 @@ libdhcp_manager_la_LIBADD = \
$(GTHREAD_LIBS) \ $(GTHREAD_LIBS) \
$(top_builddir)/marshallers/libmarshallers.la $(top_builddir)/marshallers/libmarshallers.la
CLEANFILES = $(BUILT_SOURCES)

4
src/ppp-manager/Makefile.am
View file

@ -13,7 +13,7 @@ libppp_manager_la_SOURCES = \
nm-ppp-status.h nm-ppp-status.h
nm-ppp-manager-glue.h: $(top_srcdir)/introspection/nm-ppp-manager.xml 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 built_sources = nm-ppp-manager-glue.h
@ -52,7 +52,7 @@ nm_pppd_plugin_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la $(top_builddir)/libnm-util/libnm-util.la
nm-pppd-plugin-glue.h: nm-pppd-plugin.xml 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 BUILT_SOURCES = nm-pppd-plugin-glue.h nm-ppp-manager-glue.h

4
src/supplicant-manager/Makefile.am
View file

@ -31,7 +31,3 @@ libsupplicant_manager_la_LIBADD = \
$(GTHREAD_LIBS) \ $(GTHREAD_LIBS) \
$(top_builddir)/marshallers/libmarshallers.la $(top_builddir)/marshallers/libmarshallers.la
$(libsupplicant_manager_la_OBJECTS): $(BUILT_SOURCES)
CLEANFILES = $(BUILT_SOURCES)

10
src/vpn-manager/Makefile.am
View file

@ -29,17 +29,15 @@ libvpn_manager_la_LIBADD = \
$(top_builddir)/libnm-util/libnm-util.la $(top_builddir)/libnm-util/libnm-util.la
nm-vpn-connection-glue.h: $(top_srcdir)/introspection/nm-vpn-connection.xml 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 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-connection-glue.h \
nm-vpn-plugin-bindings.h nm-vpn-plugin-bindings.h
$(libvpn_manager_la_OBJECTS): $(built_sources) CLEANFILES = $(BUILT_SOURCES)
CLEANFILES = $(built_sources)

2
system-settings/src/Makefile.am
View file

@ -52,7 +52,7 @@ nm_system_settings_LDADD = \
nm_system_settings_LDFLAGS = -rdynamic nm_system_settings_LDFLAGS = -rdynamic
nm-settings-system-glue.h: $(top_srcdir)/introspection/nm-settings-system.xml 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) dbusservicedir = $(DBUS_SYS_DIR)