aboutsummaryrefslogtreecommitdiff
path: root/src/tests
diff options
context:
space:
mode:
authorAleksander Morgado <aleksander@lanedo.com>2011-11-22 13:07:50 +0100
committerAleksander Morgado <aleksander@lanedo.com>2012-03-15 14:14:19 +0100
commit6b696056333bbefa19fc5296f14d2f71e2a82594 (patch)
treee8f3910ce26fe2e79f4a12894c43863c27cb404d /src/tests
parent49bbaf8e31009227b5c5ff1abf95fe6afb40d496 (diff)
build: chain up new 0.6 API and link against libmm-common
Also removed the MMSerialError implementation from `src/mm-errors.[h|c]', as it is now included in the new `include/ModemManager-errors.h' header file. All the other enums and errors without clashing names will be ported afterwards to the new base code.
Diffstat (limited to 'src/tests')
-rw-r--r--src/tests/Makefile.am20
1 files changed, 16 insertions, 4 deletions
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index df7157e4..2bcfeb0b 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -13,7 +13,10 @@ test_modem_helpers_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/include
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/libmm-common \
+ -I$(top_builddir)/libmm-common
test_modem_helpers_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -26,7 +29,10 @@ test_charsets_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/include
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/libmm-common \
+ -I$(top_builddir)/libmm-common
test_charsets_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -39,7 +45,10 @@ test_qcdm_serial_port_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/include
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/libmm-common \
+ -I$(top_builddir)/libmm-common
test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \
@@ -69,7 +78,10 @@ test_sms_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/include
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/libmm-common \
+ -I$(top_builddir)/libmm-common
test_sms_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \