build: various srcdir != builddir fixes

diff --git a/src/settings/plugins/ifcfg-rh/Makefile.am b/src/settings/plugins/ifcfg-rh/Makefile.am
index 68225ba..afad94c 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/Makefile.am
@@ -29,7 +29,8 @@ INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-glib \
-       -I$(top_srcdir)/libnm-util
+       -I$(top_srcdir)/libnm-util \
+       -I$(top_builddir)/libnm-util
 
 libifcfg_rh_io_la_CPPFLAGS = \
        $(GLIB_CFLAGS) \

diff --git a/src/settings/plugins/ifcfg-rh/tests/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
index 5b34ffe..34be7eb 100644 (file)
--- a/src/settings/plugins/ifcfg-rh/tests/Makefile.am
+++ b/src/settings/plugins/ifcfg-rh/tests/Makefile.am
@@ -4,6 +4,7 @@ INCLUDES = \
        -I$(top_srcdir)/include \
        -I$(top_builddir)/include \
        -I$(top_srcdir)/libnm-util \
+       -I$(top_builddir)/libnm-util \
        -I$(top_srcdir)/libnm-glib \
        -I$(srcdir)/../
 

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index a63a3c7..f90a9f7 100644 (file)
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -7,8 +7,8 @@ EXTRA_DIST = \
 if ENABLE_VAPIGEN
 include Makefile.vapigen
 
-libnm-util.vapi: $(top_srcdir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
-libnm-glib.vapi: $(top_srcdir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
+libnm-util.vapi: $(top_builddir)/libnm-util/NetworkManager-1.0.gir  libnm-util.deps NetworkManager-1.0.metadata
+libnm-glib.vapi: $(top_builddir)/libnm-glib/NMClient-1.0.gir  libnm-glib.deps NMClient-1.0.metadata libnm-util.vapi
 
 
 libnm_util_vapi_METADATADIRS = $(srcdir)