GNOME.org
 

[network-manager-fortisslvpn] build: use non-recursive make

commit 2602f35fda1d4172bc2a1e4a9c5eeaa754294a99
Author: Lubomir Rintel <lkundrak v3 sk>
Date:   Mon Jul 10 18:59:21 2017 +0200

    build: use non-recursive make
    
    Based on work by Thomas Haller <thaller redhat com>.

 Makefile.am             |  278 ++++++++++++++++++++++++++++++++++++++++++++---
 auth-dialog/Makefile.am |   22 ----
 configure.ac            |    5 +-
 properties/Makefile.am  |  115 -------------------
 shared/Makefile.am      |   11 --
 src/Makefile.am         |   91 ---------------
 6 files changed, 263 insertions(+), 259 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 7c71673..c51a356 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,26 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
 
-SUBDIRS = shared src properties po
+DISTCHECK_CONFIGURE_FLAGS = \
+       --enable-more-warnings=yes
 
-if WITH_GNOME
-SUBDIRS += auth-dialog
-endif
+libexec_PROGRAMS =
+
+noinst_LTLIBRARIES =
+
+EXTRA_DIST =
+
+CLEANFILES =
+
+check_programs =
+
+noinst_PROGRAMS =
+
+SUBDIRS = \
+       . \
+       po
+
+plugindir = $(libdir)/NetworkManager
+plugin_LTLIBRARIES =
 
 dbusservicedir = $(sysconfdir)/dbus-1/system.d
 dbusservice_DATA = nm-fortisslvpn-service.conf
@@ -12,6 +28,226 @@ dbusservice_DATA = nm-fortisslvpn-service.conf
 nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
 nmvpnservice_DATA = nm-fortisslvpn-service.name
 
+uidir = $(datadir)/gnome-vpn-properties/fortisslvpn
+ui_DATA =
+
+BUILT_SOURCES =
+
+###############################################################################
+
+src_cppflags = \
+        $(GLIB_CFLAGS) \
+        $(LIBNM_CFLAGS) \
+       -I$(srcdir)/shared \
+       -I$(builddir)/src \
+        -DNM_FORTISSLVPN_LOCALEDIR=\"$(datadir)/locale\" \
+        -DNM_FORTISSLVPN_STATEDIR=\"$(fortisslvpn_statedir)\" \
+        -DPLUGINDIR=\"$(PPPD_PLUGIN_DIR)\"
+
+###############################################################################
+
+noinst_LTLIBRARIES += src/libnm-fortisslvpn-pppd-service-dbus.la
+
+nodist_src_libnm_fortisslvpn_pppd_service_dbus_la_SOURCES = \
+       src/nm-fortisslvpn-pppd-service-dbus.c \
+       src/nm-fortisslvpn-pppd-service-dbus.h
+
+src_libnm_fortisslvpn_pppd_service_dbus_la_CPPFLAGS = \
+       $(src_cppflags) \
+       $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS))
+
+src/nm-fortisslvpn-pppd-service-dbus.h: $(top_srcdir)/src/nm-fortisslvpn-pppd-service.xml
+       $(AM_V_GEN) gdbus-codegen \
+               --generate-c-code $(basename $@) \
+               --c-namespace NMDBus \
+               --interface-prefix org.freedesktop.NetworkManager \
+               $<
+
+src/nm-fortisslvpn-pppd-service-dbus.c: src/nm-fortisslvpn-pppd-service-dbus.h
+       @true
+
+BUILT_SOURCES += \
+       src/nm-fortisslvpn-pppd-service-dbus.h \
+       src/nm-fortisslvpn-pppd-service-dbus.c
+
+CLEANFILES += \
+       src/nm-fortisslvpn-pppd-service-dbus.h \
+       src/nm-fortisslvpn-pppd-service-dbus.c
+
+EXTRA_DIST += \
+       src/nm-fortisslvpn-pppd-service.xml
+
+###############################################################################
+
+libexec_PROGRAMS += src/nm-fortisslvpn-service
+
+src_nm_fortisslvpn_service_SOURCES = \
+       shared/nm-utils/nm-shared-utils.c \
+       src/nm-ppp-status.h \
+       src/nm-fortisslvpn-service.h \
+       src/nm-fortisslvpn-service.c
+src_nm_fortisslvpn_service_CPPFLAGS = $(src_cppflags)
+src_nm_fortisslvpn_service_LDADD = \
+       src/libnm-fortisslvpn-pppd-service-dbus.la \
+       $(GLIB_LIBS) \
+       $(LIBNM_LIBS)
+
+###############################################################################
+
+plugin_sources = \
+       properties/nm-fortisslvpn-editor-plugin.c \
+       properties/nm-fortisslvpn-editor-plugin.h
+
+editor_sources = \
+       properties/nm-fortisslvpn-editor.c \
+       properties/nm-fortisslvpn-editor.h
+
+properties_cppflags = \
+       -DUIDIR=\""$(uidir)"\" \
+       -DLOCALEDIR=\"$(datadir)/locale\" \
+       -I$(srcdir)/shared \
+       $(GLIB_CFLAGS)
+
+###############################################################################
+
+noinst_LTLIBRARIES += properties/libnm-vpn-plugin-fortisslvpn-utils.la
+
+properties_libnm_vpn_plugin_fortisslvpn_utils_la_SOURCES = \
+       $(shared_sources)
+
+properties_libnm_vpn_plugin_fortisslvpn_utils_la_CPPFLAGS = \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
+       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
+       $(properties_cppflags) \
+       $(LIBNM_CFLAGS)
+
+properties_libnm_vpn_plugin_fortisslvpn_utils_la_LIBADD = \
+       $(LIBNM_LIBS) \
+       $(DL_LIBS)
+
+noinst_LTLIBRARIES += properties/libnm-vpn-plugin-fortisslvpn-core.la
+
+properties_libnm_vpn_plugin_fortisslvpn_core_la_SOURCES = \
+       shared/nm-utils/nm-vpn-plugin-utils.c \
+       shared/nm-utils/nm-vpn-plugin-utils.h \
+       shared/nm-utils/nm-vpn-plugin-macros.h \
+       $(plugin_sources)
+
+properties_libnm_vpn_plugin_fortisslvpn_core_la_CPPFLAGS = \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_BASE \
+       -DNM_PLUGIN_DIR=\"$(NM_PLUGIN_DIR)\" \
+       $(properties_cppflags) \
+       $(LIBNM_CFLAGS)
+
+properties_libnm_vpn_plugin_fortisslvpn_core_la_LIBADD = \
+       properties/libnm-vpn-plugin-fortisslvpn-utils.la \
+       $(LIBNM_LIBS) \
+       $(DL_LIBS)
+
+plugin_LTLIBRARIES += properties/libnm-vpn-plugin-fortisslvpn.la
+
+properties_libnm_vpn_plugin_fortisslvpn_la_SOURCES =
+properties_libnm_vpn_plugin_fortisslvpn_la_LIBADD = \
+       properties/libnm-vpn-plugin-fortisslvpn-core.la
+properties_libnm_vpn_plugin_fortisslvpn_la_LDFLAGS = \
+       -avoid-version \
+       -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-fortisslvpn.ver
+
+###############################################################################
+
+if WITH_GNOME
+plugin_LTLIBRARIES += properties/libnm-vpn-plugin-fortisslvpn-editor.la
+endif
+
+properties_libnm_vpn_plugin_fortisslvpn_editor_la_SOURCES = \
+       $(editor_sources)
+
+properties_libnm_vpn_plugin_fortisslvpn_editor_la_CPPFLAGS = \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB_EDITOR \
+       $(properties_cppflags) \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS)
+
+properties_libnm_vpn_plugin_fortisslvpn_editor_la_LIBADD = \
+       properties/libnm-vpn-plugin-fortisslvpn-utils.la \
+       $(GLIB_LIBS) \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNMA_LIBS)
+
+properties_libnm_vpn_plugin_fortisslvpn_editor_la_LDFLAGS = \
+       -avoid-version \
+       -Wl,--version-script=$(srcdir)/properties/libnm-vpn-plugin-fortisslvpn-editor.ver
+
+###############################################################################
+
+if WITH_LIBNM_GLIB
+noinst_LTLIBRARIES += properties/libnm-fortisslvpn-properties-core.la
+endif
+
+properties_libnm_fortisslvpn_properties_core_la_SOURCES = \
+       $(shared_sources) \
+       $(plugin_sources) \
+       $(editor_sources)
+
+properties_libnm_fortisslvpn_properties_core_la_CPPFLAGS = \
+       -DNM_VPN_OLD \
+       -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIB \
+       $(properties_cppflags) \
+       $(GTK_CFLAGS) \
+       $(LIBNM_GLIB_CFLAGS) \
+       $(LIBNM_GTK_CFLAGS)
+
+properties_libnm_fortisslvpn_properties_core_la_LIBADD = \
+       $(GLIB_LIBS) \
+       $(GTK_LIBS) \
+       $(LIBNM_GLIB_LIBS) \
+       $(LIBNM_GTK_LIBS)
+
+
+if WITH_LIBNM_GLIB
+plugin_LTLIBRARIES += properties/libnm-fortisslvpn-properties.la
+endif
+
+properties_libnm_fortisslvpn_properties_la_SOURCES =
+properties_libnm_fortisslvpn_properties_la_LIBADD = \
+       properties/libnm-fortisslvpn-properties-core.la
+properties_libnm_fortisslvpn_properties_la_LDFLAGS = \
+       -avoid-version \
+       -Wl,--version-script=$(srcdir)/properties/libnm-fortisslvpn-properties.ver
+
+EXTRA_DIST += \
+       properties/libnm-vpn-plugin-fortisslvpn.ver \
+       properties/libnm-vpn-plugin-fortisslvpn-editor.ver \
+       properties/libnm-fortisslvpn-properties.ver \
+       properties/nm-fortisslvpn-dialog.ui
+
+###############################################################################
+
+if WITH_GNOME
+libexec_PROGRAMS += auth-dialog/nm-fortisslvpn-auth-dialog
+endif
+
+auth_dialog_nm_fortisslvpn_auth_dialog_SOURCES = \
+       $(shared_sources) \
+       auth-dialog/main.c
+auth_dialog_nm_fortisslvpn_auth_dialog_CPPFLAGS = \
+       -I$(srcdir)/shared \
+       $(GLIB_CFLAGS) \
+       $(GTK_CFLAGS) \
+       $(LIBNM_CFLAGS) \
+       $(LIBNMA_CFLAGS) \
+       $(LIBSECRET_CFLAGS)
+auth_dialog_nm_fortisslvpn_auth_dialog_LDADD = \
+       $(GLIB_LIBS) \
+       $(GTK_LIBS) \
+       $(LIBNM_LIBS) \
+       $(LIBNMA_LIBS) \
+       $(LIBSECRET_LIBS)
+
+###############################################################################
+
 if WITH_LIBNM_GLIB
 # Install a file with full path to plugins for an old gnome-shell
 # https://bugzilla.gnome.org/show_bug.cgi?id=693590
@@ -36,31 +272,41 @@ appdata_in_files = appdata/network-manager-fortisslvpn.metainfo.xml.in
 @INTLTOOL_XML_RULE@
 
 nm-fortisslvpn-service.name: $(srcdir)/nm-fortisslvpn-service.name.in
-       sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
+       $(AM_V_GEN) sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \
            -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR_NAME_FILE@|g' \
            $^ >$@
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes
+# we always build the tests during regular build.
+noinst_PROGRAMS += $(check_programs)
+
+TESTS = $(check_programs)
 
-EXTRA_DIST = \
+EXTRA_DIST += \
        nm-fortisslvpn-service.name.in \
        $(dbusservice_DATA) \
-       $(desktopfile) \
-       $(iconfile) \
        $(appdata_in_files) \
        $(appdata_files) \
        intltool-extract.in \
        intltool-merge.in \
        intltool-update.in \
-       contrib/README \
-       contrib/fortiserve.pl \
-       contrib/sslproxy.pl
+       \
+       shared/README \
+       shared/nm-utils/gsystem-local-alloc.h \
+       shared/nm-utils/nm-glib.h \
+       shared/nm-utils/nm-macros-internal.h \
+       shared/nm-utils/nm-shared-utils.c \
+       shared/nm-utils/nm-shared-utils.h \
+       shared/nm-default.h \
+       shared/nm-service-defines.h \
+       $(NULL)
 
-CLEANFILES = \
+CLEANFILES += \
        $(nmvpnservice_DATA) \
-       $(desktop_DATA) \
        $(appdata_files)
 
-DISTCLEANFILES = intltool-extract intltool-merge intltool-update
+DISTCLEANFILES = \
+       intltool-extract \
+       intltool-merge \
+       intltool-update
 
 ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index 996bad4..b9e568b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,7 @@ AC_INIT(NetworkManager-fortisslvpn,
         NetworkManager-fortisslvpn)
 AM_INIT_AUTOMAKE([1.9 foreign no-dist-gzip dist-xz])
 AM_MAINTAINER_MODE
+AM_SILENT_RULES([yes])
 
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -146,11 +147,7 @@ fi
 
 AC_CONFIG_FILES([
 Makefile
-src/Makefile
-auth-dialog/Makefile
-properties/Makefile
 po/Makefile.in
-shared/Makefile
 ])
 AC_OUTPUT
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]