diff options
| author | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-02 15:08:46 +0200 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@lanedo.com> | 2012-10-04 10:17:05 +0200 |
| commit | b6d628b3a10bf183b918c7afe89a5b260eb87760 (patch) | |
| tree | 8d87e92f2d8b7da99e6a0e41e49a6aa0ebbf55bd /src/tests | |
| parent | 624fdb6ab4544a82774e9805332cc242c1068b0f (diff) | |
build: merge libmm-common into libmm-glib
It's pointless to have libmm-common around, just merge it into libmm-glib and
make ModemManager depend on libmm-glib directly. At the end, the non-common
stuff in libmm-glib is really minimal.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/Makefile.am | 27 |
1 files changed, 18 insertions, 9 deletions
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 \ |