[network-manager-libreswan: 4/11] build: merge properties/Makefile.am in toplevel makefile

[Thomas Haller <thaller src gnome org>]

commit 6bb2a7e78db93988c72e561d8b6e7279bbcc4b60
Author: Thomas Haller <thaller redhat com>
Date:   Fri Feb 24 16:53:31 2017 +0100

    build: merge properties/Makefile.am in toplevel makefile

 Makefile.am            |  115 +++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac           |    1 -
 properties/Makefile.am |  108 ---------------------------------------------
 3 files changed, 114 insertions(+), 110 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index ffb5139..5047ae8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,8 +10,10 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
 
 ACLOCAL_AMFLAGS = -I m4
 
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES =
+
 SUBDIRS = \
-       properties \
        src \
        po
 
@@ -27,6 +29,117 @@ dbusservice_DATA = nm-libreswan-service.conf
 nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-libreswan-service.name
 
+uidir = $(datadir)/gnome-vpn-properties/libreswan
+if WITH_GNOME
+ui_DATA = properties/nm-libreswan-dialog.ui
+endif
+
+###############################################################################
+
+plugin_sources = \
+       properties/nm-libreswan-editor-plugin.c \
+       properties/nm-libreswan-editor-plugin.h
+
+editor_sources = \
+       properties/nm-libreswan-editor.c \
+       properties/nm-libreswan-editor.h
+
+common_CFLAGS = \
+       -DICONDIR=\""$(datadir)/pixmaps"\" \
+       -DUIDIR=\""$(uidir)"\" \
+       -DLOCALEDIR=\"$(datadir)/locale\" \
+       -I$(srcdir)/shared \
+       $(GLIB_CFLAGS)
+
+###############################################################################
+
+plugin_LTLIBRARIES += properties/libnm-vpn-plugin-libreswan.la
+
+properties_libnm_vpn_plugin_libreswan_la_CFLAGS = \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
+       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
+       $(common_CFLAGS) \
+       $(LIBNM_CFLAGS)
+
+properties_libnm_vpn_plugin_libreswan_la_SOURCES = \
+       shared/utils.c \
+       shared/utils.h \
+       shared/nm-utils/nm-vpn-plugin-utils.c \
+       shared/nm-utils/nm-vpn-plugin-utils.h \
+       $(plugin_sources)
+
+properties_libnm_vpn_plugin_libreswan_la_LIBADD = \
+       $(LIBNM_LIBS) \
+       $(DL_LIBS)
+
+properties_libnm_vpn_plugin_libreswan_la_LDFLAGS = \
+       -avoid-version \
+       -Wl,--version-script="$(srcdir)/properties/libnm-vpn-plugin-libreswan.ver"
+
+###############################################################################
+
+if WITH_GNOME
+plugin_LTLIBRARIES += properties/libnm-vpn-plugin-libreswan-editor.la
+endif
+
+properties_libnm_vpn_plugin_libreswan_editor_la_CFLAGS = \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \
+       $(common_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS)
+
+properties_libnm_vpn_plugin_libreswan_editor_la_SOURCES = \
+       $(editor_sources)
+
+properties_libnm_vpn_plugin_libreswan_editor_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNMA_LIBS)
+
+properties_libnm_vpn_plugin_libreswan_editor_la_LDFLAGS = \
+       -avoid-version \
+       -Wl,--version-script="$(srcdir)/properties/libnm-vpn-plugin-libreswan-editor.ver"
+
+###############################################################################
+
+if WITH_GNOME
+if WITH_LIBNM_GLIB
+plugin_LTLIBRARIES += properties/libnm-libreswan-properties.la
+endif
+endif
+
+properties_libnm_libreswan_properties_la_CFLAGS = \
+       -DNM_VPN_OLD \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       $(common_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS) \
+       $(LIBNM_GTK_CFLAGS)
+
+properties_libnm_libreswan_properties_la_SOURCES = \
+       shared/utils.c \
+       shared/utils.h \
+       $(plugin_sources) \
+       $(editor_sources)
+
+properties_libnm_libreswan_properties_la_LIBADD = \
+       $(GTK_LIBS) \
+       $(LIBNM_GLIB_LIBS) \
+       $(LIBNM_GTK_LIBS)
+
+properties_libnm_libreswan_properties_la_LDFLAGS = \
+       -avoid-version \
+       -Wl,--version-script="$(srcdir)/properties/libnm-libreswan-properties.ver"
+
+###############################################################################
+
+EXTRA_DIST += \
+       properties/libnm-libreswan-properties.ver \
+       properties/libnm-vpn-plugin-libreswan.ver \
+       properties/libnm-vpn-plugin-libreswan-editor.ver \
+       properties/nm-libreswan-dialog.ui
+
 ###############################################################################
 
 EXTRA_DIST += \
diff --git a/configure.ac b/configure.ac
index 8f768b7..e55942b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -161,7 +161,6 @@ AC_CONFIG_FILES([
 Makefile
 src/Makefile
 auth-dialog/Makefile
-properties/Makefile
 po/Makefile.in
 ])
 AC_OUTPUT