aboutsummaryrefslogtreecommitdiff
path: root/plugins
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@aleksander.es>2016-03-15 12:47:13 +0100
committerAleksander Morgado <aleksander@aleksander.es>2016-03-15 19:15:25 +0100
commit3b8361eb0635e2a56f8db11823d0b5837f1bb6de (patch)
tree197abc191bd4d69bb5ee9ed473386208c3aca1ca /plugins
parent3bac0a17f5187aa22d433470146875cac15944bf (diff)
build,core: update build rules
We try to combine in common envvars the compiler and linker flags shared by the different components, and where possible, also re-using the implicit AM_CFLAGS and AM_LDFLAGS variables that automake provides, and which apply to all objects being built in the same Makefile.am. The internal libmodem-helpers.la library is also renamed to libhelpers.la
Diffstat (limited to 'plugins')
-rw-r--r--plugins/Makefile.am12
1 files changed, 6 insertions, 6 deletions
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index f79ce9ae..d2faccec 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -114,7 +114,7 @@ test_modem_helpers_icera_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS)
test_modem_helpers_icera_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(top_builddir)/src/libhelpers.la
test_modem_helpers_icera_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
########################################
@@ -202,7 +202,7 @@ test_modem_helpers_huawei_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS)
test_modem_helpers_huawei_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(top_builddir)/src/libhelpers.la
test_modem_helpers_huawei_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
# Common Mbm modem support library
@@ -242,7 +242,7 @@ test_modem_helpers_mbm_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS)
test_modem_helpers_mbm_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(top_builddir)/src/libhelpers.la
test_modem_helpers_mbm_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
# Option
@@ -446,7 +446,7 @@ test_modem_helpers_cinterion_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS)
test_modem_helpers_cinterion_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(top_builddir)/src/libhelpers.la
test_modem_helpers_cinterion_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
# Iridium modem
@@ -483,7 +483,7 @@ test_modem_helpers_thuraya_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS)
test_modem_helpers_thuraya_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(top_builddir)/src/libhelpers.la
test_modem_helpers_thuraya_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
# Common Novatel modem support library
@@ -584,7 +584,7 @@ test_modem_helpers_telit_CPPFLAGS = \
$(PLUGIN_COMMON_COMPILER_FLAGS)
test_modem_helpers_telit_LDADD = \
$(top_builddir)/libmm-glib/libmm-glib.la \
- $(top_builddir)/src/libmodem-helpers.la
+ $(top_builddir)/src/libhelpers.la
test_modem_helpers_telit_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
# MTK