diff options
| author | Colin Walters <walters@verbum.org> | 2013-08-14 18:59:54 +0200 |
|---|---|---|
| committer | Dan Williams <dcbw@redhat.com> | 2013-08-14 12:05:21 -0500 |
| commit | 54fa505e67e1f0f315314822c7b81db25254263f (patch) | |
| tree | 1decdc8928dac27c89d64a83016e721b1858beb5 | |
| parent | 65f633ab961570ad90644fcfa1fe748f50908da9 (diff) | |
build: Various srcdir != builddir fixes for gnome-ostree
The gnome-ostree build system does srcdir != builddir from git, not
quite like autotools does.
| -rw-r--r-- | libmm-glib/Makefile.am | 11 |
1 files 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 |