diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-10-15 19:59:09 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-10-19 17:16:08 +0200 |
| commit | 481d2165e993b6ba543dadae356c6225c20a792f (patch) | |
| tree | 858b07687a94b721e66cac61c419b1cf050a5c8c | |
| parent | b219eb19f1649c9f794be3b3f9aec595ef5fb036 (diff) | |
| download | NetworkManager-481d2165e993b6ba543dadae356c6225c20a792f.tar.gz | |
build: merge "src/dhcp-manager/Makefile.am" into toplevel Makefile
| -rw-r--r-- | Makefile.am | 25 | ||||
| -rw-r--r-- | src/dhcp-manager/Makefile.am | 21 |
2 files changed, 26 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am index 35c355b951..c9fa8b8a83 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1473,6 +1473,31 @@ EXTRA_DIST += \ src/NetworkManager.ver ############################################################################### +# src/dhcp-manager +############################################################################### + +libexec_PROGRAMS += src/dhcp-manager/nm-dhcp-helper + +src_dhcp_manager_nm_dhcp_helper_CPPFLAGS = \ + $(GLIB_CFLAGS) \ + -I$(top_srcdir)/shared \ + -I${top_builddir}/shared \ + -I$(top_srcdir)/libnm-core \ + -I$(top_builddir)/libnm-core \ + -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ + -DNMRUNDIR=\"$(nmrundir)\" + +src_dhcp_manager_nm_dhcp_helper_SOURCES = \ + src/dhcp-manager/nm-dhcp-helper.c \ + src/dhcp-manager/nm-dhcp-helper-api.h \ + $(NULL) + +src_dhcp_manager_nm_dhcp_helper_LDFLAGS = \ + -Wl,--version-script="$(srcdir)/linker-script-binary.ver" + +src_dhcp_manager_nm_dhcp_helper_LDADD = $(GLIB_LIBS) + +############################################################################### girdir = $(datadir)/gir-1.0 gir_DATA = $(INTROSPECTION_GIRS) diff --git a/src/dhcp-manager/Makefile.am b/src/dhcp-manager/Makefile.am index e6fe60c1b7..3c6155b9c6 100644 --- a/src/dhcp-manager/Makefile.am +++ b/src/dhcp-manager/Makefile.am @@ -1,20 +1 @@ -libexec_PROGRAMS = nm-dhcp-helper - -nm_dhcp_helper_SOURCES = \ - nm-dhcp-helper.c \ - nm-dhcp-helper-api.h \ - $(NULL) - -nm_dhcp_helper_CPPFLAGS = \ - $(GLIB_CFLAGS) \ - -I$(top_srcdir)/shared \ - -I${top_builddir}/shared \ - -I$(top_srcdir)/libnm-core \ - -I$(top_builddir)/libnm-core \ - -DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \ - -DNMRUNDIR=\"$(nmrundir)\" - -nm_dhcp_helper_LDFLAGS = \ - -Wl,--version-script="$(top_srcdir)/linker-script-binary.ver" - -nm_dhcp_helper_LDADD = $(GLIB_LIBS) +SUBDIRS = tests |