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

build: merge libmm-common into libmm-glib

Browse Source 
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.
This commit is contained in:
Aleksander Morgado
2012-10-04 10:17:05 +02:00
parent 624fdb6ab4
commit b6d628b3a1
44 changed files with 1736 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Makefile.am
+11 -7
View File
@@ -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 = \
src/tests/Makefile.am
+18 -9
View File
@@ -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 \