mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-19 03:58:11 +02:00
ff0fd77b08
* libnm-glib/Makefile.am: Link with libnm-util to gain access to NMConnection. * libnm-glib/nm-device-802-11-wireless.c: (nm_device_802_3_ethernet_activate): Remove. * libnm-glib/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_activate): Remove. * libnm-glib/nm-device.c (nm_device_activate): Implement. * src/nm-device-802-3-ethernet.c: Implement the new activation using NMConnection. * src/nm-device-802-11-wireless.c: Store an activation AP once the activation has started. Implement the new activation using NMConnection. * src/nm-activation-request.c: Store a generic connection object instead of a wireless-specific AP. * src/NetworkManagerPolicy.c (create_connection): Implement. Depending on device type, create a device specific connection object suitable for device activation. * src/nm-device.c (nm_device_activate): Re-implement. Call the device specific check to validate the connection and on success start the activation. * src/nm-device-interface.h: Add a activate virtual function to the interface definition. * src/nm-device-interface.c (nm_device_interface_activate): Implement. (impl_device_activate): Implement. * introspection/nm-device.xml: Add a generic device activation interface that accepts an abstract NMConnection structure that has device-specific information in it. * introspection/nm-device-802-3-ethernet.xml: Remove the wired-specific activation interface. * introspection/nm-device-802-11-wireless.xml: Remove the wireless-specific activation interface. git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2569 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
49 lines
1.4 KiB
Makefile
49 lines
1.4 KiB
Makefile
INCLUDES = -I${top_srcdir} \
|
|
-I${top_srcdir}/include \
|
|
-I${top_srcdir}/utils \
|
|
-I${top_srcdir}/libnm-util \
|
|
-I${top_srcdir}/src \
|
|
-I${top_srcdir}/src/named-manager
|
|
|
|
noinst_LTLIBRARIES = libdhcp-manager.la
|
|
|
|
BUILT_SOURCES = \
|
|
nm-dhcp-marshal.h \
|
|
nm-dhcp-marshal.c
|
|
|
|
libdhcp_manager_la_SOURCES = \
|
|
nm-dhcp-manager.c \
|
|
nm-dhcp-manager.h \
|
|
nm-dhcp-marshal-main.c
|
|
|
|
libdhcp_manager_la_CPPFLAGS = $(DBUS_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(HAL_CFLAGS) \
|
|
-g \
|
|
-Wall \
|
|
-DDBUS_API_SUBJECT_TO_CHANGE \
|
|
-DG_DISABLE_DEPRECATED \
|
|
-DBINDIR=\"$(bindir)\" \
|
|
-DDATADIR=\"$(datadir)\" \
|
|
-DSYSCONFDIR=\"$(sysconfdir)\"
|
|
|
|
|
|
libdhcp_manager_la_LIBADD = $(DBUS_LIBS) $(GTHREAD_LIBS)
|
|
|
|
EXTRA_DIST = nm-dhcp-marshal.list
|
|
CLEANFILES = $(BUILT_SOURCES)
|
|
|
|
nm-dhcp-marshal.h: nm-dhcp-marshal.list
|
|
$(GLIB_GENMARSHAL) --prefix=nm_dhcp_marshal $(srcdir)/nm-dhcp-marshal.list --header > \
|
|
xgen-gmh \
|
|
&& (cmp -s xgen-gmh nm-dhcp-marshal.h || cp xgen-gmh nm-dhcp-marshal.h) \
|
|
&& rm -f xgen-gmh xgen-gmh~
|
|
|
|
nm-dhcp-marshal.c: nm-dhcp-marshal.list
|
|
$(GLIB_GENMARSHAL) --prefix=nm_dhcp_marshal $(srcdir)/nm-dhcp-marshal.list --body > \
|
|
xgen-gmc \
|
|
&& cp xgen-gmc nm-dhcp-marshal.c \
|
|
&& rm -f xgen-gmc xgen-gmc~
|
|
|
|
nm-dhcp-marshal-main.c: nm-dhcp-marshal.c nm-dhcp-marshal.h
|
|
|