From 54fa505e67e1f0f315314822c7b81db25254263f Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 14 Aug 2013 18:59:54 +0200 Subject: [PATCH] build: Various srcdir != builddir fixes for gnome-ostree The gnome-ostree build system does srcdir != builddir from git, not quite like autotools does. --- libmm-glib/Makefile.am | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am index 3fb5cf90..bfadc799 100644 --- a/libmm-glib/Makefile.am +++ b/libmm-glib/Makefile.am @@ -66,7 +66,9 @@ libmm_glib_la_SOURCES = \ mm-cdma-manual-activation-properties.c libmm_glib_la_CPPFLAGS = \ + -I$(srcdir) \ -I$(top_srcdir) \ + -I$(top_builddir) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ -I${top_srcdir}/libmm-glib/generated \ @@ -144,19 +146,21 @@ GENERATED_C = \ mm-gdbus-modem.c PUBLIC_H = \ - ModemManager-names.h \ ModemManager-enums.h \ ModemManager-errors.h \ - ModemManager-version.h \ ModemManager.h +PUBLIC_H_GENERATED = \ + ModemManager-names.h \ + ModemManager-version.h + INTROSPECTION_GIRS = ModemManager-1.0.gir INTROSPECTION_SCANNER_ARGS = --warn-all INTROSPECTION_COMPILER_ARGS = ModemManager-1.0.gir: libmm-glib.la ModemManager_1_0_gir_INCLUDES = GLib-2.0 GObject-2.0 Gio-2.0 -ModemManager_1_0_gir_CFLAGS = $(libmm_glib_la_CPPFLAGS) -I$(top_builddir)/include -I$(top_srcdir)/libmm-glib +ModemManager_1_0_gir_CFLAGS = $(libmm_glib_la_CPPFLAGS) ModemManager_1_0_gir_LIBS = libmm-glib.la ModemManager_1_0_gir_EXPORT_PACKAGES = libmm-glib ModemManager_1_0_gir_SCANNERFLAGS = \ @@ -171,6 +175,7 @@ ModemManager_1_0_gir_FILES = \ $(addprefix generated/,$(GENERATED_H)) \ $(addprefix generated/,$(GENERATED_C)) \ $(addprefix $(srcdir)/../include/,$(PUBLIC_H)) \ + $(addprefix $(builddir)/../include/,$(PUBLIC_H_GENERATED)) \ $(NULL) girdir = $(datadir)/gir-1.0