build: merge "dispatcher/Makefile.am" into toplevel Makefile

Makefile.am

@@ -23,6 +23,7 @@ CLEANFILES =
 DISTCLEANFILES =
 EXTRA_DIST =
 dist_hook =
+install_data_hook =
 TESTS =
 BUILT_SOURCES =
 GLIB_GENERATED =
@@ -31,6 +32,7 @@ check_programs_norun =
 check_ltlibraries =
 check_local =
 dbusservice_DATA =
+dbusactivation_DATA =
 
 INTROSPECTION_GIRS =
 INTROSPECTION_SCANNER_ARGS =
@@ -51,6 +53,8 @@ pppd_plugin_LTLIBRARIES =
 rundir=$(runstatedir)/NetworkManager
 statedir=$(localstatedir)/lib/NetworkManager
 
+dbusactivationdir = $(datadir)/dbus-1/system-services
+
 SUBDIRS = \
 	. \
 	dispatcher \
@@ -2941,6 +2945,107 @@ src_tests_test_systemd_LDADD = \
 EXTRA_DIST += \
 	src/tests/test-secret-agent.py
 
+###############################################################################
+# dispatcher
+###############################################################################
+
+libexec_PROGRAMS += dispatcher/nm-dispatcher
+
+noinst_LTLIBRARIES += \
+	dispatcher/libnm-dispatcher-core.la \
+	dispatcher/libnmdbus-dispatcher.la
+
+dispatcher_cppflags = \
+	-I${top_srcdir}/shared \
+	-I${top_builddir}/shared \
+	-I${top_srcdir}/libnm-core \
+	-I${top_builddir}/libnm-core \
+	-I${top_srcdir}/dispatcher \
+	$(GLIB_CFLAGS) \
+	-DNETWORKMANAGER_COMPILATION \
+	-DNMCONFDIR=\"$(nmconfdir)\" \
+	-DSYSCONFDIR=\"$(sysconfdir)\" \
+	-DLIBEXECDIR=\"$(libexecdir)\"
+
+
+nodist_dispatcher_libnmdbus_dispatcher_la_SOURCES = \
+	dispatcher/nmdbus-dispatcher.c \
+	dispatcher/nmdbus-dispatcher.h
+
+dispatcher_libnmdbus_dispatcher_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(dispatcher_cppflags))
+
+dispatcher/nmdbus-dispatcher.h: dispatcher/nm-dispatcher.xml
+	$(AM_V_GEN) gdbus-codegen \
+		--generate-c-code $(basename $@) \
+		--c-namespace NMDBus \
+		--interface-prefix org.freedesktop \
+		$<
+
+dispatcher/nmdbus-dispatcher.c: dispatcher/nmdbus-dispatcher.h
+
+BUILT_SOURCES += $(nodist_dispatcher_libnmdbus_dispatcher_la_SOURCES)
+
+
+dispatcher_libnm_dispatcher_core_la_SOURCES = \
+	shared/nm-dispatcher-api.h \
+	dispatcher/nm-dispatcher-utils.c \
+	dispatcher/nm-dispatcher-utils.h
+
+dispatcher_libnm_dispatcher_core_la_CPPFLAGS = $(dispatcher_cppflags)
+
+dispatcher_libnm_dispatcher_core_la_LIBADD = \
+	libnm/libnm.la \
+	$(GLIB_LIBS)
+
+
+dispatcher_nm_dispatcher_SOURCES = \
+	dispatcher/nmdbus-dispatcher.h \
+	dispatcher/nmdbus-dispatcher.c \
+	shared/nm-dispatcher-api.h \
+	dispatcher/nm-dispatcher.c
+
+dispatcher_nm_dispatcher_CPPFLAGS = $(dispatcher_cppflags)
+
+dispatcher_nm_dispatcher_LDFLAGS = \
+	-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
+
+dispatcher_nm_dispatcher_LDADD = \
+	libnm/libnm.la \
+	dispatcher/libnm-dispatcher-core.la \
+	dispatcher/libnmdbus-dispatcher.la \
+	$(GLIB_LIBS)
+
+dispatcher/org.freedesktop.nm_dispatcher.service: $(srcdir)/dispatcher/org.freedesktop.nm_dispatcher.service.in
+	@sed \
+	-e 's|@sbindir[@]|$(sbindir)|g' \
+	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
+	-e 's|@localstatedir[@]|$(localstatedir)|g' \
+	-e 's|@libexecdir[@]|$(libexecdir)|g' \
+	$< >$@
+
+dbusactivation_DATA += dispatcher/org.freedesktop.nm_dispatcher.service
+CLEANFILES += dispatcher/org.freedesktop.nm_dispatcher.service
+
+
+dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
+
+install-data-hook-dispatcher:
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d
+	$(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d
+
+install_data_hook += install-data-hook-dispatcher
+
+
+dbusservice_DATA += dispatcher/nm-dispatcher.conf
+
+EXTRA_DIST += \
+	dispatcher/nm-dispatcher.conf \
+	dispatcher/org.freedesktop.nm_dispatcher.service \
+	dispatcher/org.freedesktop.nm_dispatcher.service.in \
+	dispatcher/nm-dispatcher.xml
+
 ###############################################################################
 
 girdir = $(datadir)/gir-1.0
@@ -3032,7 +3137,7 @@ dist-hook: $(dist_hook)
 
 ###############################################################################
 
-install-data-hook:
+install-data-hook: $(install_data_hook)
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(rundir)
 	$(mkinstalldirs) -m 0700 $(DESTDIR)$(statedir)
 	$(mkinstalldirs) -m 0755 $(DESTDIR)$(pkglibdir)

dispatcher/Makefile.am

@@ -1,105 +1 @@
-SUBDIRS = . tests
+SUBDIRS=tests
-
-libexec_PROGRAMS = \
-	nm-dispatcher
-
-noinst_LTLIBRARIES = \
-	libnm-dispatcher-core.la \
-	libnmdbus-dispatcher.la
-
-AM_CPPFLAGS = \
-	-I${top_srcdir}/shared \
-	-I${top_builddir}/shared \
-	-I${top_srcdir}/libnm-core \
-	-I${top_builddir}/libnm-core \
-	$(GLIB_CFLAGS) \
-	-DNETWORKMANAGER_COMPILATION \
-	-DNMCONFDIR=\"$(nmconfdir)\" \
-	-DSYSCONFDIR=\"$(sysconfdir)\" \
-	-DLIBEXECDIR=\"$(libexecdir)\"
-
-###############################################################################
-
-dbusservicedir = $(DBUS_SYS_DIR)
-dbusservice_DATA = \
-	nm-dispatcher.conf
-
-###############################################################################
-
-libnm_dispatcher_core_la_SOURCES = \
-	$(top_srcdir)/shared/nm-dispatcher-api.h \
-	nm-dispatcher-utils.c \
-	nm-dispatcher-utils.h
-
-libnm_dispatcher_core_la_LIBADD = \
-	$(top_builddir)/libnm/libnm.la \
-	$(GLIB_LIBS)
-
-###############################################################################
-
-nm_dispatcher_SOURCES = \
-	$(top_srcdir)/shared/nm-dispatcher-api.h \
-	nm-dispatcher.c
-
-nm_dispatcher_LDFLAGS = \
-	-Wl,--version-script="$(top_srcdir)/linker-script-binary.ver"
-
-nm_dispatcher_LDADD = \
-	$(top_builddir)/libnm/libnm.la \
-	libnm-dispatcher-core.la \
-	libnmdbus-dispatcher.la \
-	$(GLIB_LIBS)
-
-###############################################################################
-
-nodist_libnmdbus_dispatcher_la_SOURCES = \
-	nmdbus-dispatcher.c \
-	nmdbus-dispatcher.h
-
-libnmdbus_dispatcher_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(AM_CPPFLAGS))
-
-nmdbus-dispatcher.h: nm-dispatcher.xml
-	$(AM_V_GEN) gdbus-codegen \
-		--generate-c-code $(basename $@) \
-		--c-namespace NMDBus \
-		--interface-prefix org.freedesktop \
-		$<
-
-nmdbus-dispatcher.c: nmdbus-dispatcher.h
-	@true
-
-BUILT_SOURCES = nmdbus-dispatcher.h nmdbus-dispatcher.c
-
-###############################################################################
-
-dbusactivationdir = $(datadir)/dbus-1/system-services
-dbusactivation_in_files = org.freedesktop.nm_dispatcher.service.in
-dbusactivation_DATA = $(dbusactivation_in_files:.service.in=.service)
-
-%.service: %.service.in
-	$(edit) $< >$@
-
-edit = @sed \
-	-e 's|@sbindir[@]|$(sbindir)|g' \
-	-e 's|@sysconfdir[@]|$(sysconfdir)|g' \
-	-e 's|@localstatedir[@]|$(localstatedir)|g' \
-	-e 's|@libexecdir[@]|$(libexecdir)|g'
-
-dispatcherdir=$(sysconfdir)/NetworkManager/dispatcher.d
-install-data-hook:
-	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)
-	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-down.d
-	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/pre-up.d
-	   $(mkinstalldirs) -m 0755 $(DESTDIR)$(dispatcherdir)/no-wait.d
-
-###############################################################################
-
-CLEANFILES = \
-	$(BUILT_SOURCES) \
-	$(dbusactivation_DATA)
-
-EXTRA_DIST = \
-	$(dbusservice_DATA) \
-	$(dbusactivation_in_files) \
-	nm-dispatcher.xml
-