aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.am18
-rw-r--r--src/tests/Makefile.am27
2 files changed, 29 insertions, 16 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 768af7dd..6b54b37d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,11 +14,12 @@ libmodem_helpers_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common
+ -I$(top_srcdir)/libmm-glib \
+ -I${top_srcdir}/libmm-glib/generated \
+ -I${top_builddir}/libmm-glib/generated
libmodem_helpers_la_LIBADD = \
- $(top_builddir)/libmm-common/libmm-common.la
+ $(top_builddir)/libmm-glib/libmm-glib.la
libmodem_helpers_la_SOURCES = \
mm-error-helpers.c \
@@ -61,8 +62,9 @@ libserial_la_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common
+ -I$(top_srcdir)/libmm-glib \
+ -I${top_srcdir}/libmm-glib/generated \
+ -I${top_builddir}/libmm-glib/generated
nodist_libserial_la_SOURCES = \
mm-serial-enums-types.h \
@@ -123,8 +125,10 @@ ModemManager_CPPFLAGS = \
-I$(top_srcdir) \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common \
+ -I$(top_srcdir)/libmm-glib \
+ -I$(top_builddir)/libmm-glib \
+ -I${top_srcdir}/libmm-glib/generated \
+ -I${top_builddir}/libmm-glib/generated \
-DPLUGINDIR=\"$(pkglibdir)\"
ModemManager_LDADD = \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 2de5d452..9d366053 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -15,8 +15,9 @@ test_modem_helpers_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common
+ -I$(top_srcdir)/libmm-glib \
+ -I$(top_srcdir)/libmm-glib/generated \
+ -I$(top_builddir)/libmm-glib/generated
test_modem_helpers_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -37,8 +38,9 @@ test_charsets_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common
+ -I$(top_srcdir)/libmm-glib \
+ -I$(top_srcdir)/libmm-glib/generated \
+ -I$(top_builddir)/libmm-glib/generated
test_charsets_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \
@@ -58,8 +60,9 @@ test_qcdm_serial_port_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common
+ -I$(top_srcdir)/libmm-glib \
+ -I$(top_srcdir)/libmm-glib/generated \
+ -I$(top_builddir)/libmm-glib/generated
test_qcdm_serial_port_LDADD = \
$(MM_LIBS) \
@@ -79,7 +82,12 @@ test_at_serial_port_SOURCES = \
test_at_serial_port_CPPFLAGS = \
$(MM_CFLAGS) \
-I$(top_srcdir) \
- -I$(top_srcdir)/src
+ -I$(top_srcdir)/src \
+ -I$(top_srcdir)/include \
+ -I$(top_builddir)/include \
+ -I$(top_srcdir)/libmm-glib \
+ -I$(top_srcdir)/libmm-glib/generated \
+ -I$(top_builddir)/libmm-glib/generated
test_at_serial_port_LDADD = \
$(MM_LIBS) \
@@ -101,8 +109,9 @@ test_sms_part_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
- -I$(top_srcdir)/libmm-common \
- -I$(top_builddir)/libmm-common
+ -I$(top_srcdir)/libmm-glib \
+ -I$(top_srcdir)/libmm-glib/generated \
+ -I$(top_builddir)/libmm-glib/generated
test_sms_part_LDADD = \
$(top_builddir)/src/libmodem-helpers.la \