[network-manager-openvpn: 5/14] build: merge src/Makefile.am in top-level Makefile.am
- From: Thomas Haller <thaller src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [network-manager-openvpn: 5/14] build: merge src/Makefile.am in top-level Makefile.am
- Date: Sun, 12 Feb 2017 12:51:14 +0000 (UTC)
commit 10017477251b7381bcc27ab3937b30f1924b6d05
Author: Thomas Haller <thaller redhat com>
Date: Sun Feb 12 09:52:53 2017 +0100
build: merge src/Makefile.am in top-level Makefile.am
Makefile.am | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
configure.ac | 1 -
src/Makefile.am | 48 -------------------------------------------
3 files changed, 58 insertions(+), 52 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b8811d6..8eb5b79 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,9 +1,13 @@
-AUTOMAKE_OPTIONS = foreign
+AUTOMAKE_OPTIONS = foreign subdir-objects
+
+libexec_PROGRAMS =
EXTRA_DIST =
+CLEANFILES =
+
SUBDIRS = \
- src \
+ . \
properties \
po
@@ -17,6 +21,57 @@ dbusservice_DATA = nm-openvpn-service.conf
nmvpnservicedir = $(NM_VPN_SERVICE_DIR)
nmvpnservice_DATA = nm-openvpn-service.name
+###############################################################################
+
+shared_sources = \
+ shared/nm-utils/nm-shared-utils.c \
+ shared/nm-utils/nm-shared-utils.h \
+ shared/utils.c \
+ shared/utils.h \
+ shared/nm-service-defines.h \
+ $(NULL)
+
+src_cppflags = \
+ -DBINDIR=\"$(bindir)\" \
+ -DPREFIX=\""$(prefix)"\" \
+ -DSYSCONFDIR=\""$(sysconfdir)"\" \
+ -DLIBDIR=\""$(libdir)"\" \
+ -DLIBEXECDIR=\""$(libexecdir)"\" \
+ -DLOCALSTATEDIR=\""$(localstatedir)"\" \
+ -DDATADIR=\"$(datadir)\" \
+ -DNM_OPENVPN_LOCALEDIR=\"$(datadir)/locale\" \
+ -DG_LOG_DOMAIN=\"nm-openvpn\" \
+ -I$(srcdir)/shared \
+ $(GLIB_CFLAGS) \
+ $(LIBNM_CFLAGS)
+
+libexec_PROGRAMS += src/nm-openvpn-service
+
+src_nm_openvpn_service_SOURCES = \
+ $(shared_sources) \
+ src/nm-openvpn-service.c \
+ src/nm-openvpn-service.h
+
+src_nm_openvpn_service_CFLAGS = $(src_cppflags)
+
+src_nm_openvpn_service_LDADD = \
+ $(LIBNM_LIBS)
+
+libexec_PROGRAMS += src/nm-openvpn-service-openvpn-helper
+
+src_nm_openvpn_service_openvpn_helper_SOURCES = \
+ $(shared_sources) \
+ src/nm-openvpn-service-openvpn-helper.c
+
+src_nm_openvpn_service_openvpn_helper_CPPFLAGS = $(src_cppflags)
+
+src_nm_openvpn_service_openvpn_helper_LDADD = \
+ $(LIBNM_LIBS)
+
+CLEANFILES += src/*~
+
+###############################################################################
+
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
@@ -71,7 +126,7 @@ EXTRA_DIST += \
intltool-merge.in \
intltool-update.in
-CLEANFILES = \
+CLEANFILES += \
$(nmvpnservice_DATA) \
$(appdata_files)
diff --git a/configure.ac b/configure.ac
index 5f5153f..4dd2a77 100644
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,6 @@ fi
AC_CONFIG_FILES([
Makefile
-src/Makefile
auth-dialog/Makefile
properties/Makefile
properties/tests/Makefile
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]