mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2025-12-30 15:30:11 +01:00
db5a10dc4d
Merge the beginnings of the new GSM card support.
* src/ppp-manager/nm-ppp-manager.c (nm_ppp_manager_stop): Remove
* the
ppp watch source before killing pppd - If this happens from
g_object_unref()
then the ppp manager is already destroyed by the time the watch
callback runs.
* src/nm-hal-manager.c: Add a device_type_name string to the
* device
creators, so that we can print a nice human readable string when
a
device is added.
* src/nm-umts-device.c (automatic_registration_get_network):
* Query
for the activated network, not much is done with the result
thought.
* src/nm-serial-device.c (nm_serial_device_get_reply):
* Implement.
(ppp_ip4_config): Change the device state to activated here for
now.
(real_check_connection): Make sure the connection includes ppp
setting.
* libnm-glib/nm-client.c (get_device): Handle umts devices.
* libnm-glib/Makefile.am: Add the new files to build.
* libnm-glib/nm-umts-device.c:
* libnm-glib/nm-umts-device.h: Implement.
2007-11-26 Tambet Ingo <tambet@gmail.com>
* src/nm-umts-device.c (automatic_registration_get_network): For
* now, dial
immediately, nm_serial_device_get_reply() isn't implemented
correctly yet.
* src/nm-serial-device.c (wait_for_reply_info_destroy): Don't
* try to remove
the timeout source - this function is only called when the
timeout source has
been removed.
(nm_serial_device_wait_for_reply): Allocate the duplicate
responses array
to be big enough to contain the terminating zero element as
well.
The timeout argument is meant to be in seconds now.
(real_deactivate_quickly): Implement.
* src/NetworkManager.conf: Allow root to own
"org.freedesktop.NetworkManager.PPP", deny it for everybody
else.
* libnm-util/nm-setting-umts.c: Network type and band properties
* are ints,
(not unsigned ints).
* libnm-util/nm-setting-serial.c (nm_setting_serial_class_init):
* Fix a
small issue with parity bounds - capital letters have lower
ascii codes
than lower case letters.
* libnm-util/nm-connection.c (register_default_settings):
* Register serial
and umts settings.
2007-11-22 Tambet Ingo <tambet@gmail.com>
Remove the "index" property from devices as not all device types
have this.
* include/NetworkManager.h (NM_DBUS_PATH_DEVICE): Remove.
* src/nm-hal-manager.c (nm_get_device_index_from_hal): Remove.
(wired_device_creator): Get the device interface from hal to
create the device.
(wireless_device_creator): Ditto.
* src/nm-device.c (nm_device_init): Remove the index member.
(constructor): Remove the checks for index property, make
interface property
a require constructor property.
Use the HAL udi for DBus path for devices.
(nm_device_get_index): Remove.
(set_property): Remove index handling.
(get_property): Ditto.
(nm_device_get_dbus_path): Remove.
* src/nm-device-interface.c (nm_device_interface_init): Remove
* the index
property.
* src/nm-device-802-3-ethernet.c
* (nm_device_802_3_ethernet_link_activated):
Access the device index through it's interface.
(nm_device_802_3_ethernet_link_deactivated): Ditto.
(nm_device_802_3_ethernet_new): Remove the useless argument
test_dev. Remove
index argument. Add interface argument.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new): Remove
the useless test_dev argument. Remove index argument. Add
interface arugment.
* src/NetworkManagerSystem.c
* (nm_system_device_set_from_ip4_config): Get the
device index through interface.
(nm_system_set_mtu): Ditto.
* introspection/nm-device.xml: Remove the "Index" property.
2007-11-21 Tambet Ingo <tambet@gmail.com>
* src/nm-serial-device.c:
* src/nm-serial-device.c:
* src/nm-umts-device.c:
* src/nm-umts-device.h: Implement.
* src/nm-hal-manager.c (nm_get_device_driver_name):
* libhal_free_string the string
allocated by libhal.
(modem_device_creator): Implement.
(register_built_in_creators): Register the modem creator.
* src/nm-device-802-11-wireless.c
* (nm_device_802_11_wireless_new):
Remove the unused test_dev argument.
* src/nm-device-802-3-ethernet.c (nm_device_802_3_ethernet_new):
* Ditto.
* src/Makefile.am: Add new files to build.
Link in ppp-manager.
* libnm-util/nm-setting-umts.c:
* libnm-util/nm-setting-umts.h:
* libnm-util/nm-setting-serial.c:
* libnm-util/nm-setting-serial.h: Implement.
* libnm-util/Makefile.am: Add new files to build.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@3116 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
166 lines
5.1 KiB
Makefile
166 lines
5.1 KiB
Makefile
SUBDIRS= \
|
|
marshallers \
|
|
named-manager \
|
|
vpn-manager \
|
|
dhcp-manager \
|
|
supplicant-manager \
|
|
ppp-manager \
|
|
backends
|
|
|
|
INCLUDES = -I${top_srcdir} \
|
|
-I${top_srcdir}/include \
|
|
-I${top_builddir}/src/marshallers \
|
|
-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}/libnm-util
|
|
|
|
sbin_PROGRAMS = NetworkManager
|
|
|
|
NetworkManager_SOURCES = \
|
|
nm-call-store.c \
|
|
nm-call-store.h \
|
|
nm-device.c \
|
|
nm-device.h \
|
|
nm-device-interface.c \
|
|
nm-device-interface.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 \
|
|
NetworkManagerDialup.h \
|
|
nm-dbus-manager.h \
|
|
nm-dbus-manager.c \
|
|
nm-hal-manager.c \
|
|
nm-hal-manager.h \
|
|
nm-ip4-config.c \
|
|
nm-ip4-config.h \
|
|
NetworkManager.c \
|
|
NetworkManagerPolicy.c \
|
|
NetworkManagerPolicy.h \
|
|
NetworkManagerUtils.c \
|
|
NetworkManagerUtils.h \
|
|
NetworkManagerSystem.c \
|
|
NetworkManagerSystem.h \
|
|
nm-logging.c \
|
|
nm-logging.h \
|
|
nm-manager.c \
|
|
nm-manager.h \
|
|
nm-netlink-monitor.c \
|
|
nm-netlink-monitor.h \
|
|
nm-activation-request.c \
|
|
nm-activation-request.h \
|
|
nm-properties-changed-signal.c \
|
|
nm-properties-changed-signal.h \
|
|
nm-serial-device.c \
|
|
nm-serial-device.h \
|
|
nm-umts-device.c \
|
|
nm-umts-device.h \
|
|
autoip.c \
|
|
autoip.h \
|
|
kernel-types.h \
|
|
wpa.c \
|
|
wpa.h \
|
|
nm-netlink.c \
|
|
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
|
|
|
|
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
|
|
|
|
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
|
|
|
|
nm-device-802-3-ethernet-glue.h: $(top_srcdir)/introspection/nm-device-802-3-ethernet.xml
|
|
dbus-binding-tool --prefix=nm_device_802_3_ethernet --mode=glib-server --output=nm-device-802-3-ethernet-glue.h $(top_srcdir)/introspection/nm-device-802-3-ethernet.xml
|
|
|
|
nm-device-802-11-wireless-glue.h: $(top_srcdir)/introspection/nm-device-802-11-wireless.xml
|
|
dbus-binding-tool --prefix=nm_device_802_11_wireless --mode=glib-server --output=nm-device-802-11-wireless-glue.h $(top_srcdir)/introspection/nm-device-802-11-wireless.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
|
|
|
|
|
|
built_sources = \
|
|
nm-access-point-glue.h \
|
|
nm-manager-glue.h \
|
|
nm-device-interface-glue.h \
|
|
nm-device-802-3-ethernet-glue.h \
|
|
nm-device-802-11-wireless-glue.h \
|
|
nm-ip4-config-glue.h \
|
|
$(NULL)
|
|
|
|
$(NetworkManager_OBJECTS): $(built_sources)
|
|
|
|
NetworkManager_CPPFLAGS = \
|
|
$(DBUS_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(HAL_CFLAGS) \
|
|
$(OPENSSL_CFLAGS) \
|
|
$(LIBNL_CFLAGS) \
|
|
-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) \
|
|
./marshallers/libmarshallers.la \
|
|
./named-manager/libnamed-manager.la \
|
|
./vpn-manager/libvpn-manager.la \
|
|
./dhcp-manager/libdhcp-manager.la \
|
|
./supplicant-manager/libsupplicant-manager.la \
|
|
./ppp-manager/libppp-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)
|
|
|
|
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)
|
|
|