diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2015-08-24 16:55:36 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2015-09-01 14:11:22 +0200 |
| commit | 9a5937277d07a31a613003dff0d5446ae4fb8c89 (patch) | |
| tree | 57c1dc6d55e750bd712239a526bd070194a56513 | |
| parent | 1b379c1c77d7bafd1d2b1d63bea35a5bae205fca (diff) | |
build: split the plugin into two halves
They're both the same now. We'll later port the new one to libnm.
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | nm-iodine-service.name.in | 3 | ||||
| -rw-r--r-- | properties/Makefile.am | 33 |
3 files changed, 31 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 9b35207..3269d3a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,9 @@ nmvpnservicedir = $(sysconfdir)/NetworkManager/VPN nmvpnservice_DATA = nm-iodine-service.name nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in - sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' $< >$@ + sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ + -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + $< >$@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes diff --git a/nm-iodine-service.name.in b/nm-iodine-service.name.in index e17f938..4061b43 100644 --- a/nm-iodine-service.name.in +++ b/nm-iodine-service.name.in @@ -3,6 +3,9 @@ name=iodine service=org.freedesktop.NetworkManager.iodine program=@LIBEXECDIR@/nm-iodine-service +[libnm] +plugin=@PLUGINDIR@/libnm-vpn-plugin-iodine.so + [GNOME] auth-dialog=nm-iodine-auth-dialog properties=libnm-iodine-properties diff --git a/properties/Makefile.am b/properties/Makefile.am index ab4cd44..2787295 100644 --- a/properties/Makefile.am +++ b/properties/Makefile.am @@ -1,14 +1,17 @@ plugindir = $(libdir)/NetworkManager -plugin_LTLIBRARIES = libnm-iodine-properties.la +plugin_LTLIBRARIES = libnm-vpn-plugin-iodine.la libnm-iodine-properties.la -libnm_iodine_properties_la_SOURCES = \ - nm-iodine.c \ - nm-iodine.h +libnm_vpn_plugin_iodine_la_SOURCES = \ + nm-iodine.c \ + nm-iodine.h + +libnm_iodine_properties_la_SOURCES = \ + $(libnm_vpn_plugin_iodine_la_SOURCES) uidir = $(datadir)/gnome-vpn-properties/iodine ui_DATA = nm-iodine-dialog.ui -libnm_iodine_properties_la_CFLAGS = \ +common_CFLAGS = \ $(GTK_CFLAGS) \ $(NM_CFLAGS) \ -I$(top_srcdir)/src \ @@ -20,13 +23,27 @@ libnm_iodine_properties_la_CFLAGS = \ -DGNOMELOCALEDIR=\"$(datadir)/locale\" \ -DVERSION=\"$(VERSION)\" -libnm_iodine_properties_la_LIBADD = \ - $(GTK_LIBS) \ +libnm_vpn_plugin_iodine_la_CFLAGS = \ + $(common_CFLAGS) + +libnm_iodine_properties_la_CFLAGS = \ + -DNM_IODINE_OLD \ + $(common_CFLAGS) + +libnm_vpn_plugin_iodine_la_LIBADD = \ + $(GTK_LIBS) \ $(NM_LIBS) -libnm_iodine_properties_la_LDFLAGS = \ +libnm_iodine_properties_la_LIBADD = \ + $(GTK_LIBS) \ + $(NM_LIBS) + +libnm_vpn_plugin_iodine_la_LDFLAGS = \ -avoid-version +libnm_iodine_properties_la_LDFLAGS = \ + $(libnm_vpn_plugin_iodine_la_LDFLAGS) + CLEANFILES = *.bak *~ EXTRA_DIST = \ |