colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ublox: fix VPATH builds and distcheck

Browse Source 
https://bugs.freedesktop.org/show_bug.cgi?id=98216
This commit is contained in:
Aleksander Morgado
2016-10-13 11:49:30 +02:00
parent e3e803998c
commit 33e563fe48
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugins/Makefile.am
View File

@@ -881,10 +881,15 @@ test_udev_rules_LDADD = \
# plugin: u-blox # plugin: u-blox
################################################################################ ################################################################################
PLUGIN_UBLOX_COMPILER_FLAGS = \
-I$(top_srcdir)/plugins/ublox \
-I$(top_builddir)/plugins/ublox \
$(NULL)
noinst_LTLIBRARIES += libhelpers-ublox.la noinst_LTLIBRARIES += libhelpers-ublox.la
UBLOX_ENUMS_INPUTS = \ UBLOX_ENUMS_INPUTS = \
ublox/mm-modem-helpers-ublox.h \ $(top_srcdir)/plugins/ublox/mm-modem-helpers-ublox.h \
$(NULL) $(NULL)
UBLOX_ENUMS_GENERATED = \ UBLOX_ENUMS_GENERATED = \
@@ -912,6 +917,8 @@ libhelpers_ublox_la_SOURCES = \
nodist_libhelpers_ublox_la_SOURCES = $(UBLOX_ENUMS_GENERATED) nodist_libhelpers_ublox_la_SOURCES = $(UBLOX_ENUMS_GENERATED)
libhelpers_ublox_la_CPPFLAGS = $(PLUGIN_UBLOX_COMPILER_FLAGS)
BUILT_SOURCES += $(UBLOX_ENUMS_GENERATED) BUILT_SOURCES += $(UBLOX_ENUMS_GENERATED)
CLEANFILES += $(UBLOX_ENUMS_GENERATED) CLEANFILES += $(UBLOX_ENUMS_GENERATED)
@@ -919,9 +926,7 @@ noinst_PROGRAMS += test-modem-helpers-ublox
test_modem_helpers_ublox_SOURCES = \ test_modem_helpers_ublox_SOURCES = \
ublox/tests/test-modem-helpers-ublox.c \ ublox/tests/test-modem-helpers-ublox.c \
$(NULL) $(NULL)
test_modem_helpers_ublox_CPPFLAGS = \ test_modem_helpers_ublox_CPPFLAGS = $(PLUGIN_UBLOX_COMPILER_FLAGS)
-I$(top_srcdir)/plugins/ublox \
$(NULL)
test_modem_helpers_ublox_LDADD = \ test_modem_helpers_ublox_LDADD = \
$(builddir)/libhelpers-ublox.la \ $(builddir)/libhelpers-ublox.la \
$(top_builddir)/src/libhelpers.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.h \
ublox/mm-broadband-modem-ublox.c \ ublox/mm-broadband-modem-ublox.c \
$(NULL) $(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_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
libmm_plugin_ublox_la_LIBADD = $(builddir)/libhelpers-ublox.la libmm_plugin_ublox_la_LIBADD = $(builddir)/libhelpers-ublox.la