mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-03 22:10:14 +01: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
42 lines
1.3 KiB
Makefile
42 lines
1.3 KiB
Makefile
SUBDIRS=test-common libnm-util
|
|
|
|
INCLUDES = -I${top_srcdir} \
|
|
-I${top_srcdir}/libnm-util \
|
|
-I${top_srcdir}/libnm-glib \
|
|
-I${top_srcdir}/gnome/libnm_glib \
|
|
-I${top_srcdir}/include
|
|
|
|
AM_CPPFLAGS = \
|
|
$(DBUS_CFLAGS) \
|
|
$(GTHREAD_CFLAGS) \
|
|
$(HAL_CFLAGS) \
|
|
-DDBUS_API_SUBJECT_TO_CHANGE \
|
|
-DBINDIR=\"$(bindir)\" \
|
|
-DNM_RUN_DIR=\"$(rundir)\" \
|
|
-DDATADIR=\"$(datadir)\"
|
|
|
|
noinst_PROGRAMS = nm-tool \
|
|
nm-online \
|
|
nmtestdevices \
|
|
libnm_glib_test
|
|
|
|
nm_tool_SOURCES = nm-tool.c
|
|
nm_tool_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \
|
|
$(top_builddir)/libnm-glib/libnm_glib.la \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
nm_online_SOURCES = nm-online.c
|
|
nm_online_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) $(HAL_LIBS) \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
nmtestdevices_SOURCES = nmtestdevices.c
|
|
nmtestdevices_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
libnm_glib_test_SOURCES = libnm_glib_test.c
|
|
libnm_glib_test_LDADD = $(DBUS_LIBS) $(GTHREAD_LIBS) \
|
|
$(top_builddir)/libnm-glib/libnm_glib.la \
|
|
$(top_builddir)/libnm-util/libnm-util.la
|
|
|
|
nm_supplicant_test_SOURCES = nm-supplicant-test.c
|
|
nm_supplicant_test_LDADD = $(GLIB_LIBS) $(GTHREAD_LIBS)
|