From 8b3d609404ef3a94ae0f160dc6b44f4b9e57619c Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 3 Apr 2013 10:49:50 -0400 Subject: [PATCH] build: Fix srcdir != builddir --- data/Makefile.am | 10 ++++++++-- src/config/Makefile.am | 1 + src/config/tests/Makefile.am | 1 + 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index 4e48cf1c6..ffdff9f76 100644 --- 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 3aa0a3b4f..767630483 100644 --- 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 40527d98d..5b394907b 100644 --- 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