mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-27 05:50:08 +01:00
* src/supplicant-manager/nm-supplicant-types.h - new file; move all supplicant manager object typedefs here for #include sanity * src/supplicant-manager/nm-supplicant-interface.c src/supplicant-manager/nm-supplicant-interface.h - new file; an object that interfaces an NMDevice object to the supplicant and handles signals from the supplicant. This object does all necessary DBus communication with wpa_supplicant. * src/supplicant-manager/nm-supplicant-manager.c src/supplicant-manager/nm-supplicant-manager.h - Actually do something. Track the state of the wpa_supplicant service and deal with its comings & goings. Handle life events of supplicant interfaces too. - Move NMSupplicantManager typedef to nm-supplicant-types.h * src/supplicant-manager/nm-supplicant-connection.h - Move NMSupplicantConnection typedef to nm-supplicant-types.h * src/supplicant-manager/Makefile.am - Add new files to build, and add libnm-util to includes * src/nm-marshal.list - New marshaler type: VOID:UINT,UINT * src/nm-device-802-3-ethernet.c - (real_init): grab a supplicant interface - (nm_device_802_3_ethernet_dispose): release the supplicant interface - (supplicant_iface_state_cb): new function, stub for handling supplicant interface state changes * src/nm-device-802-11-wireless.c - (real_init): grab a supplicant interface - (nm_device_802_11_wireless_dispose): release the supplicant interface - (supplicant_iface_state_cb): new function, stub for handling supplicant interface state changes * src/NetworkManager.c - (main): create and keep the supplicant manager around for the lifetime of NetworkManager * src/Makefile.am - Link to the supplicant manager sub-library and use the supplicant manager includes git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2125 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
164 lines
4.4 KiB
Makefile
164 lines
4.4 KiB
Makefile
SUBDIRS=named-manager vpn-manager dhcp-manager supplicant-manager backends
|
|
|
|
INCLUDES = -I${top_srcdir} \
|
|
-I${top_srcdir}/include \
|
|
-I${top_srcdir}/src/named-manager \
|
|
-I${top_srcdir}/src/vpn-manager \
|
|
-I${top_srcdir}/src/dhcp-manager \
|
|
-I${top_srcdir}/src/supplicant-manager \
|
|
-I${top_srcdir}/utils \
|
|
-I${top_srcdir}/libnm-util
|
|
|
|
sbin_PROGRAMS = NetworkManager
|
|
|
|
NetworkManager_SOURCES = \
|
|
nm-device.c \
|
|
nm-device.h \
|
|
nm-device-private.h \
|
|
nm-device-802-3-ethernet.c \
|
|
nm-device-802-3-ethernet.h \
|
|
nm-device-802-11-wireless.c \
|
|
nm-device-802-11-wireless.h \
|
|
NetworkManagerAP.c \
|
|
NetworkManagerAP.h \
|
|
NetworkManagerAPList.c \
|
|
NetworkManagerAPList.h \
|
|
NetworkManagerDbus.c \
|
|
NetworkManagerDbus.h \
|
|
NetworkManagerDbusUtils.c \
|
|
NetworkManagerDialup.h \
|
|
NetworkManagerDbusUtils.h \
|
|
nm-dbus-manager.h \
|
|
nm-dbus-manager.c \
|
|
nm-dbus-nm.c \
|
|
nm-dbus-nm.h \
|
|
nm-dbus-device.c \
|
|
nm-dbus-device.h \
|
|
nm-dbus-net.c \
|
|
nm-dbus-net.h \
|
|
nm-dbus-nmi.c \
|
|
nm-dbus-nmi.h \
|
|
nm-ip4-config.c \
|
|
nm-ip4-config.h \
|
|
NetworkManager.c \
|
|
NetworkManagerMain.h \
|
|
NetworkManagerPolicy.c \
|
|
NetworkManagerPolicy.h \
|
|
NetworkManagerUtils.c \
|
|
NetworkManagerUtils.h \
|
|
NetworkManagerSystem.c \
|
|
NetworkManagerSystem.h \
|
|
nm-logging.c \
|
|
nm-logging.h \
|
|
nm-netlink-monitor.c \
|
|
nm-netlink-monitor.h \
|
|
nm-activation-request.c \
|
|
nm-activation-request.h \
|
|
autoip.c \
|
|
autoip.h \
|
|
nm-ap-security.c \
|
|
nm-ap-security.h \
|
|
nm-ap-security-private.h \
|
|
nm-ap-security-wep.c \
|
|
nm-ap-security-wep.h \
|
|
nm-ap-security-wpa-eap.c \
|
|
nm-ap-security-wpa-eap.h \
|
|
nm-ap-security-wpa-psk.c \
|
|
nm-ap-security-wpa-psk.h \
|
|
nm-ap-security-leap.c \
|
|
nm-ap-security-leap.h \
|
|
nm-marshal-main.c \
|
|
kernel-types.h \
|
|
wpa.c \
|
|
wpa.h \
|
|
wpa_ctrl.c \
|
|
wpa_ctrl.h
|
|
|
|
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
|
|
|
|
built_sources = \
|
|
nm-marshal.h \
|
|
nm-marshal.c \
|
|
$(NULL)
|
|
|
|
$(NetworkManager_OBJECTS): $(built_sources)
|
|
|
|
NetworkManager_CPPFLAGS = \
|
|
$(DBUS_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(HAL_CFLAGS) \
|
|
$(OPENSSL_CFLAGS) \
|
|
$(LIBNL_CFLAGS) \
|
|
-DWPA_SUPPLICANT_BIN=\"$(WPA_SUPPLICANT_BINARY_PATH)\" \
|
|
-DDBUS_API_SUBJECT_TO_CHANGE \
|
|
-DG_DISABLE_DEPRECATED \
|
|
-DBINDIR=\"$(bindir)\" \
|
|
-DSBINDIR=\"$(sbindir)\" \
|
|
-DLIBEXECDIR=\"$(libexecdir)\" \
|
|
-DDATADIR=\"$(datadir)\" \
|
|
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
|
-DLOCALSTATEDIR=\"$(localstatedir)\" \
|
|
-DNM_RUN_DIR=\"$(rundir)\" \
|
|
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
|
|
-DARP_DEBUG
|
|
|
|
NetworkManager_LDADD = \
|
|
$(DBUS_LIBS) \
|
|
$(GTHREAD_LIBS) \
|
|
$(HAL_LIBS) \
|
|
$(IWLIB) \
|
|
$(LIBNL_LIBS) \
|
|
$(top_builddir)/utils/libnmutils.la \
|
|
./named-manager/libnamed-manager.la \
|
|
./vpn-manager/libvpn-manager.la \
|
|
./dhcp-manager/libdhcp-manager.la \
|
|
./supplicant-manager/libsupplicant-manager.la \
|
|
./backends/libnmbackend.la \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
NetworkManager_LDFLAGS = -rdynamic
|
|
|
|
libexec_PROGRAMS = nm-crash-logger
|
|
nm_crash_logger_SOURCES = nm-crash-logger.c
|
|
nm_crash_logger_CPPFLAGS = \
|
|
$(GTHREAD_CFLAGS) \
|
|
-DG_DISABLE_DEPRECATED \
|
|
-DBINDIR=\"$(bindir)\" \
|
|
-DSBINDIR=\"$(sbindir)\" \
|
|
-DDATADIR=\"$(datadir)\" \
|
|
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
|
-DLOCALSTATEDIR=\"$(localstatedir)\"
|
|
nm_crash_logger_LDADD = $(GTHREAD_LIBS)
|
|
|
|
|
|
NetworkManagerdir = $(datadir)/NetworkManager
|
|
NetworkManager_DATA = gdb-cmd
|
|
|
|
dbusservicedir = $(DBUS_SYS_DIR)
|
|
dbusservice_DATA = NetworkManager.conf
|
|
|
|
EXTRA_DIST = \
|
|
$(dbusservice_DATA) \
|
|
$(NetworkManager_DATA) \
|
|
nm-marshal.list
|
|
|
|
rundir=$(localstatedir)/run/NetworkManager
|
|
dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
|
|
install-data-hook:
|
|
$(mkinstalldirs) -m 0700 $(DESTDIR)$(rundir)
|
|
$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
|
|
|
|
CLEANFILES = $(built_sources)
|
|
|