diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2013-06-13 13:36:30 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2013-06-13 13:36:30 +0200 |
| commit | dcc66f2678b4b35abbada0420a23492435f18e81 (patch) | |
| tree | 27ca6eb89acd65dfdca1b40db00af0d6abf74b5d | |
| parent | 11b5a74c63abd297eb429aeaf9e8634a200c8fc5 (diff) | |
| download | external_libqmi-dcc66f2678b4b35abbada0420a23492435f18e81.zip external_libqmi-dcc66f2678b4b35abbada0420a23492435f18e81.tar.gz external_libqmi-dcc66f2678b4b35abbada0420a23492435f18e81.tar.bz2 | |
build: fix builds with srcdir != builddir
| -rw-r--r-- | cli/Makefile.am | 1 | ||||
| -rw-r--r-- | cli/test/Makefile.am | 1 | ||||
| -rw-r--r-- | docs/reference/libqmi-glib/Makefile.am | 1 | ||||
| -rw-r--r-- | libqmi-glib/Makefile.am | 1 | ||||
| -rw-r--r-- | libqmi-glib/generated/Makefile.am | 1 | ||||
| -rw-r--r-- | libqmi-glib/test/Makefile.am | 2 |
6 files changed, 7 insertions, 0 deletions
diff --git a/cli/Makefile.am b/cli/Makefile.am index 8b11722..fddf664 100644 --- a/cli/Makefile.am +++ b/cli/Makefile.am @@ -8,6 +8,7 @@ qmicli_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib \ -I$(top_builddir)/libqmi-glib/generated qmicli_SOURCES = \ diff --git a/cli/test/Makefile.am b/cli/test/Makefile.am index 8e556ee..1889fa8 100644 --- a/cli/test/Makefile.am +++ b/cli/test/Makefile.am @@ -13,6 +13,7 @@ test_helpers_CPPFLAGS = \ -I$(top_srcdir)/cli \ -I$(top_srcdir)/libqmi-glib \ -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib \ -I$(top_builddir)/libqmi-glib/generated test_helpers_LDADD = \ diff --git a/docs/reference/libqmi-glib/Makefile.am b/docs/reference/libqmi-glib/Makefile.am index c83fb15..dc60345 100644 --- a/docs/reference/libqmi-glib/Makefile.am +++ b/docs/reference/libqmi-glib/Makefile.am @@ -33,6 +33,7 @@ DOC_SOURCE_DIR = \ # Used for dependencies HFILE_GLOB = \ $(top_srcdir)/libqmi-glib/*.h \ + $(top_builddir)/libqmi-glib/*.h \ $(top_builddir)/libqmi-glib/generated/*.h CFILE_GLOB = \ $(top_srcdir)/libqmi-glib/*.c \ diff --git a/libqmi-glib/Makefile.am b/libqmi-glib/Makefile.am index 8533ffa..fdac069 100644 --- a/libqmi-glib/Makefile.am +++ b/libqmi-glib/Makefile.am @@ -9,6 +9,7 @@ libqmi_glib_la_CPPFLAGS = \ -I$(top_builddir) \ -I$(top_srcdir)/libqmi-glib \ -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib \ -I$(top_builddir)/libqmi-glib/generated \ -DLIBQMI_GLIB_COMPILATION \ -DG_LOG_DOMAIN=\"Qmi\" diff --git a/libqmi-glib/generated/Makefile.am b/libqmi-glib/generated/Makefile.am index f425db4..25f4c48 100644 --- a/libqmi-glib/generated/Makefile.am +++ b/libqmi-glib/generated/Makefile.am @@ -176,6 +176,7 @@ libqmi_glib_generated_la_CPPFLAGS = \ $(LIBQMI_GLIB_CFLAGS) \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ + -I$(top_builddir)/libqmi-glib \ -DLIBQMI_GLIB_COMPILATION \ -DG_LOG_DOMAIN=\"Qmi\" \ -Wno-unused-function diff --git a/libqmi-glib/test/Makefile.am b/libqmi-glib/test/Makefile.am index d788ceb..029db51 100644 --- a/libqmi-glib/test/Makefile.am +++ b/libqmi-glib/test/Makefile.am @@ -10,6 +10,7 @@ test_utils_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib \ -I$(top_builddir)/libqmi-glib/generated \ -DLIBQMI_GLIB_COMPILATION test_utils_LDADD = \ @@ -23,6 +24,7 @@ test_message_CPPFLAGS = \ -I$(top_srcdir) \ -I$(top_srcdir)/libqmi-glib \ -I$(top_srcdir)/libqmi-glib/generated \ + -I$(top_builddir)/libqmi-glib \ -I$(top_builddir)/libqmi-glib/generated \ -DLIBQMI_GLIB_COMPILATION test_message_LDADD = \ |