build: Fix srcdir != builddir

diff --git a/data/Makefile.am b/data/Makefile.am
index 4e48cf1..ffdff9f 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -33,6 +33,12 @@ edit = sed \
 EXTRA_DIST = \
        NetworkManager.service.in \
        NetworkManager-wait-online.service.in \
-       org.freedesktop.NetworkManager.service.in
+       org.freedesktop.NetworkManager.service.in \
+       server.conf.in
+
+CLEANFILES = \
+       NetworkManager.service \
+       NetworkManager-wait-online.service \
+       org.freedesktop.NetworkManager.service \
+       server.conf
 
-CLEANFILES = NetworkManager.service NetworkManager-wait-online.service org.freedesktop.NetworkManager.service

diff --git a/src/config/Makefile.am b/src/config/Makefile.am
index 3aa0a3b..7676304 100644 (file)
--- a/src/config/Makefile.am
+++ b/src/config/Makefile.am
@@ -11,6 +11,7 @@ libnm_config_la_SOURCES = \
 libnm_config_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \
        -I$(top_srcdir)/include \
+       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/logging \

diff --git a/src/config/tests/Makefile.am b/src/config/tests/Makefile.am
index 40527d9..5b39490 100644 (file)
--- a/src/config/tests/Makefile.am
+++ b/src/config/tests/Makefile.am
@@ -2,6 +2,7 @@ if ENABLE_TESTS
 
 INCLUDES = \
        -I$(top_srcdir)/include \
+       -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
        -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/src/config