mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-26 13:18:12 +02:00
636b1140c5
* libnm-glib/Makefile.am: Add NMObject to build, remove nm-utils.[ch]. * nm-utils.[ch]: Remove. * libnm-glib/nm-object.c: Implement a base class for all libnm-glib dbus-aware objects for easy property access and dbus connection handling. * libnm-glib/nm-client.c: Derive from NMObject. * libnm-glib/nm-device.c: Ditto. * libnm-glib/nm-device-802-3-ethernet.c: Changes for being based on NMObject. * libnm-glib/nm-device-802-11-wireless.c: Ditto. * libnm-glib/nm-ip4-config.c: Ditto. * libnm-glib/nm-access-point.c: Ditto. * libnm-util/nm-connection.c (nm_connection_compare): Add a stub for connection comparision. Currently used by the device activation code to determine if the new activation is the same as the old one. * src/nm-dbus-nmi.c (nm_dbus_get_user_key_for_network): Don't use the obsolete and wrong way of getting the dbus path for AP. Fixes the issue where the applet isn't able to ask password for the AP. * src/nm-device.c (nm_device_activate): Change the logic here - instead of giving up if the device is already connected, tear down it's connection (if it isn't the same as new one) and start the activation. * src/nm-manager.c: Add the beginnings of NMConnection storage and signals. * src/NetworkManagerAP.c (nm_ap_init): Set the default values to AP memebers, fixes the issue where all APs are always listed as encrypted. * src/NetworkManagerDbus.c (nm_dbus_get_object_path_for_network): Remove. APs have their own registered paths. * test/nm-tool.c (detail_device): Don't try to get active network from wireless device if it's not connected - dbus-glib will happily crash trying to marshal NULL. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2615 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
91 lines
2.9 KiB
Makefile
91 lines
2.9 KiB
Makefile
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libnm-util
|
|
|
|
BUILT_SOURCES = \
|
|
nm-client-bindings.h \
|
|
nm-device-bindings.h \
|
|
nm-device-802-3-ethernet-bindings.h \
|
|
nm-device-802-11-wireless-bindings.h \
|
|
nm-access-point-bindings.h \
|
|
nm-marshal.h \
|
|
nm-marshal.c
|
|
|
|
lib_LTLIBRARIES = libnm-glib.la
|
|
|
|
libnm_glib_la_CFLAGS = \
|
|
$(GLIB_CFLAGS) \
|
|
$(DBUS_CFLAGS)
|
|
|
|
libnmincludedir = $(includedir)/libnm-glib
|
|
|
|
libnminclude_HEADERS = \
|
|
nm-object.h \
|
|
nm-client.h \
|
|
nm-device.h \
|
|
nm-device-802-3-ethernet.h \
|
|
nm-device-802-11-wireless.h \
|
|
nm-access-point.h \
|
|
nm-ip4-config.h \
|
|
nm-vpn-connection.h
|
|
|
|
libnm_glib_la_SOURCES = \
|
|
nm-object.c \
|
|
nm-client.c \
|
|
nm-device.c \
|
|
nm-device-private.h \
|
|
nm-device-802-3-ethernet.c \
|
|
nm-device-802-11-wireless.c \
|
|
nm-access-point.c \
|
|
nm-ip4-config.c \
|
|
nm-vpn-connection.c \
|
|
nm-marshal-main.c
|
|
|
|
libnm_glib_la_LIBADD = \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(GLIB_LIBS) \
|
|
$(DBUS_LIBS)
|
|
|
|
noinst_PROGRAMS = libnm-glib-test
|
|
|
|
libnm_glib_test_SOURCES = libnm-glib-test.c
|
|
libnm_glib_test_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
|
|
libnm_glib_test_LDADD = libnm-glib.la $(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.xml
|
|
dbus-binding-tool --prefix=nm_client --mode=glib-client --output=nm-client-bindings.h $(top_srcdir)/introspection/nm-manager.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
|
|
|
|
nm-device-802-3-ethernet-bindings.h: $(top_srcdir)/introspection/nm-device-802-3-ethernet.xml
|
|
dbus-binding-tool --prefix=nm_device_802_3_ethernet --mode=glib-client --output=nm-device-802-3-ethernet-bindings.h $(top_srcdir)/introspection/nm-device-802-3-ethernet.xml
|
|
|
|
nm-device-802-11-wireless-bindings.h: $(top_srcdir)/introspection/nm-device-802-11-wireless.xml
|
|
dbus-binding-tool --prefix=nm_device_802_11_wireless --mode=glib-client --output=nm-device-802-11-wireless-bindings.h $(top_srcdir)/introspection/nm-device-802-11-wireless.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
|
|
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = libnm-glib.pc
|
|
|
|
DISTCLEANFILES = libnm-glib.pc
|
|
|
|
EXTRA_DIST = libnm-glib.pc.in nm-marshal.list
|
|
|
|
CLEANFILES = \
|
|
$(BUILT_SOURCES)
|