mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-06-05 14:48:21 +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
80 lines
1.7 KiB
Makefile
80 lines
1.7 KiB
Makefile
INCLUDES = -I${top_srcdir} -I${top_srcdir}/include
|
|
|
|
lib_LTLIBRARIES=libnm-util.la
|
|
|
|
libnm_util_la_CPPFLAGS = \
|
|
$(GLIB_CFLAGS) \
|
|
$(DBUS_CFLAGS) \
|
|
-DDBUS_API_SUBJECT_TO_CHANGE \
|
|
-DG_DISABLE_DEPRECATED \
|
|
-DGDK_DISABLE_DEPRECATED \
|
|
-DGNOME_DISABLE_DEPRECATED \
|
|
-DGNOMELOCALEDIR=\"$(datadir)/locale\"
|
|
|
|
if WITH_GCRYPT
|
|
libnm_util_la_CPPFLAGS += $(LIBGCRYPT_CFLAGS)
|
|
endif
|
|
|
|
libnm_util_la_SOURCES= \
|
|
cipher.c \
|
|
cipher.h \
|
|
cipher-private.h \
|
|
cipher-wep-hex.c \
|
|
cipher-wep-hex.h \
|
|
cipher-wep-passphrase.c \
|
|
cipher-wep-passphrase.h \
|
|
cipher-wep-ascii.c \
|
|
cipher-wep-ascii.h \
|
|
cipher-wpa-psk-hex.c \
|
|
cipher-wpa-psk-hex.h \
|
|
cipher-wpa-psk-passphrase.c \
|
|
cipher-wpa-psk-passphrase.h \
|
|
dbus-helpers.c \
|
|
dbus-helpers.h \
|
|
sha1.c \
|
|
sha1.h \
|
|
dbus-method-dispatcher.c \
|
|
dbus-method-dispatcher.h \
|
|
dbus-dict-helpers.c \
|
|
dbus-dict-helpers.h \
|
|
nm-connection.c \
|
|
nm-connection.h \
|
|
nm-setting.c \
|
|
nm-setting.h \
|
|
nm-utils.c \
|
|
nm-utils.h
|
|
|
|
if !WITH_GCRYPT
|
|
libnm_util_la_SOURCES += gnome-keyring-md5.c gnome-keyring-md5.h
|
|
endif
|
|
|
|
libnm_util_la_LDFLAGS= $(GLIB_LIBS) $(DBUS_LIBS)
|
|
|
|
libnm_util_la_CFLAGS=-fPIC
|
|
|
|
if WITH_GCRYPT
|
|
libnm_util_la_LDFLAGS += $(LIBGCRYPT_LIBS)
|
|
endif
|
|
|
|
libnm_util_includedir=$(includedir)/NetworkManager
|
|
|
|
libnm_util_include_HEADERS = \
|
|
cipher.h \
|
|
cipher-wep-hex.h \
|
|
cipher-wep-passphrase.h \
|
|
cipher-wep-ascii.h \
|
|
cipher-wpa-psk-hex.h \
|
|
cipher-wpa-psk-passphrase.h \
|
|
dbus-helpers.h \
|
|
dbus-method-dispatcher.h \
|
|
dbus-dict-helpers.h \
|
|
nm-connection.h \
|
|
nm-setting.h \
|
|
nm-utils.h
|
|
|
|
pkgconfigdir = $(libdir)/pkgconfig
|
|
pkgconfig_DATA = libnm-util.pc
|
|
|
|
DISTCLEANFILES = libnm-util.pc
|
|
|
|
EXTRA_DIST = libnm-util.pc.in
|