mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-01 10:18:00 +02:00
326d1e8679
* src/vpn-manager/nm-vpn-connection.[ch]:
* src/vpn-manager/nm-vpn-manager.[ch]:
* src/vpn-manager/nm-vpn-service.[ch]: Rewrite the vpn handling
* code. Using
dbus-glib, GObjects, signals etc.
* libnm-glib/nm-vpn-manager.[ch]:
* libnm-glib/nm-vpn-connection.[ch]: Now that the NM
* implementation changed
so much, rewrite these too.
* libnm-glib/Makefile.am: Add new files to build, build new
* binding files for
the new introspection files.
* libnm-glib/nm-client.[ch]: Remove all VPN related stuff from
* here.
* libnm-glib/nm-dbus-utils.[ch]: Renamed from nm-utils.[ch] that
* was shadowing
the header with the same name from libnm-utils.
* libnm-glib/nm-vpn-plugin.[ch]: Implement.
* libnm-util/Makefile.am: Add nm-utils.[ch] to build.
* introspection/nm-vpn-plugin.xml: Implement.
* introspection/nm-vpn-connection.xml: Implement.
* introspection/nm-vpn-manager.xml: Implement.
* src/NetworkManagerSystem.c
* (nm_system_vpn_device_set_from_ip4_config): Remove
the named manager argument, it can just as easily get it as the
caller.
(nm_system_vpn_device_unset_from_ip4_config): Ditto.
* src/vpn-manager/nm-dbus-vpn.[ch]: Remove.
* src/nm-dbus-manager.h: Fix up the name_owner signal signature.
* src/dhcp-manager/nm-dhcp-manager.c (garray_to_string): Remove,
* use one from
libnm-utils.
* libnm-util/nm-connection.c: Ditto.
* src/NetworkManagerMain.h: Remove, it's finally empty.
* configure.in: Remove utils/ from build.
* include/NetworkManagerVPN.h: Add some more defines to reduce
* the amount
of hard-coded strings.
* utils/: Move it over to libnm-util.
* test/Makefile.am: Link against libnm-util now that util/ is
* gone.
* dispatcher-daemon/Makefile.am: Ditto.
* src/Makefile.am: Ditto.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2798 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
130 lines
4.7 KiB
Makefile
130 lines
4.7 KiB
Makefile
INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/libnm-util
|
|
|
|
BUILT_SOURCES = \
|
|
nm-access-point-bindings.h \
|
|
nm-client-bindings.h \
|
|
nm-device-bindings.h \
|
|
nm-device-802-3-ethernet-bindings.h \
|
|
nm-device-802-11-wireless-bindings.h \
|
|
nm-marshal.h \
|
|
nm-marshal.c \
|
|
nm-settings-connection-glue.h \
|
|
nm-settings-glue.h \
|
|
nm-vpn-manager-bindings.h \
|
|
nm-vpn-connection-bindings.h \
|
|
nm-vpn-plugin-glue.h
|
|
|
|
lib_LTLIBRARIES = libnm_glib.la libnm_glib_vpn.la
|
|
|
|
libnm_glib_la_CFLAGS = \
|
|
$(GLIB_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(DBUS_CFLAGS) \
|
|
$(GCONF_CFLAGS) \
|
|
$(GNOME_KEYRING_CFLAGS)
|
|
|
|
libnmincludedir = $(includedir)/libnm-glib
|
|
|
|
libnminclude_HEADERS = \
|
|
libnm_glib.h \
|
|
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-settings.h \
|
|
nm-vpn-connection.h \
|
|
nm-vpn-manager.h \
|
|
nm-vpn-plugin.h
|
|
|
|
libnm_glib_la_SOURCES = \
|
|
libnm_glib.c \
|
|
nm-object.c \
|
|
nm-client.c \
|
|
nm-dbus-utils.c \
|
|
nm-dbus-utils.h \
|
|
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-settings.c \
|
|
nm-vpn-connection.c \
|
|
nm-vpn-manager.c \
|
|
nm-marshal-main.c
|
|
|
|
libnm_glib_la_LIBADD = \
|
|
$(top_builddir)/libnm-util/libnm-util.la \
|
|
$(GLIB_LIBS) \
|
|
$(GTHREAD_LIBS) \
|
|
$(DBUS_LIBS) \
|
|
$(GCONF_LIBS) \
|
|
$(GNOME_KEYRING_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)
|
|
|
|
libnm_glib_vpn_la_SOURCES = nm-vpn-plugin.c
|
|
libnm_glib_vpn_la_CFLAGS = $(GLIB_CFLAGS) $(DBUS_CFLAGS)
|
|
libnm_glib_vpn_la_LIBADD = $(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-client.xml
|
|
dbus-binding-tool --prefix=nm_client --mode=glib-client --output=nm-client-bindings.h $(top_srcdir)/introspection/nm-manager-client.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
|
|
|
|
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
|
|
|
|
nm-settings-connection-glue.h: $(top_srcdir)/introspection/nm-settings-connection.xml
|
|
dbus-binding-tool --prefix=nm_connection_settings --mode=glib-server --output=nm-settings-connection-glue.h $(top_srcdir)/introspection/nm-settings-connection.xml
|
|
|
|
nm-vpn-manager-bindings.h: $(top_srcdir)/introspection/nm-vpn-manager.xml
|
|
dbus-binding-tool --prefix=nm_vpn_manager --mode=glib-client --output=nm-vpn-manager-bindings.h $(top_srcdir)/introspection/nm-vpn-manager.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
|
|
|
|
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
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = libnm_glib.pc
|
|
|
|
DISTCLEANFILES = libnm_glib.pc
|
|
|
|
EXTRA_DIST = libnm_glib.pc.in nm-marshal.list
|
|
|
|
CLEANFILES = \
|
|
$(BUILT_SOURCES)
|