diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2016-10-13 11:49:30 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2016-10-13 11:49:44 +0200 |
| commit | 33e563fe489ea36493c2f00aaac1534906e1dade (patch) | |
| tree | cc3fff762eec56717f860fc568cbf00de90f7fc2 | |
| parent | e3e803998c4c0bc65bfd5912928f70e932d80146 (diff) | |
ublox: fix VPATH builds and distcheck
https://bugs.freedesktop.org/show_bug.cgi?id=98216
| -rw-r--r-- | plugins/Makefile.am | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 3a84fe99..070e379e 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -881,10 +881,15 @@ test_udev_rules_LDADD = \ # plugin: u-blox ################################################################################ +PLUGIN_UBLOX_COMPILER_FLAGS = \ + -I$(top_srcdir)/plugins/ublox \ + -I$(top_builddir)/plugins/ublox \ + $(NULL) + noinst_LTLIBRARIES += libhelpers-ublox.la UBLOX_ENUMS_INPUTS = \ - ublox/mm-modem-helpers-ublox.h \ + $(top_srcdir)/plugins/ublox/mm-modem-helpers-ublox.h \ $(NULL) UBLOX_ENUMS_GENERATED = \ @@ -912,6 +917,8 @@ libhelpers_ublox_la_SOURCES = \ nodist_libhelpers_ublox_la_SOURCES = $(UBLOX_ENUMS_GENERATED) +libhelpers_ublox_la_CPPFLAGS = $(PLUGIN_UBLOX_COMPILER_FLAGS) + BUILT_SOURCES += $(UBLOX_ENUMS_GENERATED) CLEANFILES += $(UBLOX_ENUMS_GENERATED) @@ -919,9 +926,7 @@ noinst_PROGRAMS += test-modem-helpers-ublox test_modem_helpers_ublox_SOURCES = \ ublox/tests/test-modem-helpers-ublox.c \ $(NULL) -test_modem_helpers_ublox_CPPFLAGS = \ - -I$(top_srcdir)/plugins/ublox \ - $(NULL) +test_modem_helpers_ublox_CPPFLAGS = $(PLUGIN_UBLOX_COMPILER_FLAGS) test_modem_helpers_ublox_LDADD = \ $(builddir)/libhelpers-ublox.la \ $(top_builddir)/src/libhelpers.la \ @@ -937,7 +942,7 @@ libmm_plugin_ublox_la_SOURCES = \ ublox/mm-broadband-modem-ublox.h \ ublox/mm-broadband-modem-ublox.c \ $(NULL) -libmm_plugin_ublox_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) +libmm_plugin_ublox_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS) $(PLUGIN_UBLOX_COMPILER_FLAGS) libmm_plugin_ublox_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS) libmm_plugin_ublox_la_LIBADD = $(builddir)/libhelpers-ublox.la |