diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2016-02-04 20:12:46 -0800 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2016-02-15 17:32:42 +0100 |
| commit | 80ece7f065ca988f5144da1b1a769f8ff284dca1 (patch) | |
| tree | 5a04075dc7083eb71f1648e83f9df6e471118fe9 | |
| parent | cb47ad3eb0e28bfcaa4742e84a5c0459276f84ac (diff) | |
| download | ModemManager-80ece7f065ca988f5144da1b1a769f8ff284dca1.tar.gz | |
cdma: moved 'CDMA' interface details to its own subdirectory
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | plugins/Makefile.am | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/iface-cdma/Makefile.am | 32 | ||||
| -rw-r--r-- | src/iface-cdma/mm-iface-modem-cdma.c (renamed from src/mm-iface-modem-cdma.c) | 0 | ||||
| -rw-r--r-- | src/iface-cdma/mm-iface-modem-cdma.h (renamed from src/mm-iface-modem-cdma.h) | 0 | ||||
| -rw-r--r-- | src/iface-simple/Makefile.am | 1 | ||||
| -rw-r--r-- | src/protocol-qmi/Makefile.am | 1 |
8 files changed, 39 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 265dd9efc..0061f8290 100644 --- a/configure.ac +++ b/configure.ac @@ -352,6 +352,7 @@ src/port/Makefile src/helpers/Makefile src/protocol-qmi/Makefile src/protocol-mbim/Makefile +src/iface-cdma/Makefile src/iface-simple/Makefile src/iface-messaging/Makefile src/iface-location/Makefile diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 354cab820..6d2ecffff 100644 --- a/plugins/Makefile.am +++ b/plugins/Makefile.am @@ -18,6 +18,7 @@ PLUGIN_COMMON_COMPILER_FLAGS = \ -I$(top_builddir)/src/helpers \ -I$(top_srcdir)/src/protocol-qmi \ -I$(top_srcdir)/src/protocol-mbim \ + -I$(top_srcdir)/src/iface-cdma \ -I$(top_srcdir)/src/iface-messaging \ -I$(top_srcdir)/src/iface-location \ -I$(top_srcdir)/src/iface-time \ diff --git a/src/Makefile.am b/src/Makefile.am index 6be9b05c9..be2d898da 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ SUBDIRS = \ helpers \ protocol-qmi \ protocol-mbim \ + iface-cdma \ iface-simple \ iface-messaging \ iface-location \ @@ -53,6 +54,7 @@ ModemManager_CPPFLAGS = \ -I$(builddir)/port \ -I$(srcdir)/helpers \ -I$(builddir)/helpers \ + -I$(srcdir)/iface-cdma \ -I$(srcdir)/iface-simple \ -I$(srcdir)/iface-messaging \ -I$(srcdir)/iface-location \ @@ -77,6 +79,7 @@ ModemManager_LDADD = \ $(GUDEV_LIBS) \ $(builddir)/helpers/libhelpers.la \ $(builddir)/port/libport.la \ + $(builddir)/iface-cdma/libmmifacecdma.la \ $(builddir)/iface-simple/libmmifacesimple.la \ $(builddir)/iface-messaging/libmmifacemessaging.la \ $(builddir)/iface-location/libmmifacelocation.la \ @@ -138,8 +141,6 @@ ModemManager_SOURCES = \ mm-iface-modem-3gpp.c \ mm-iface-modem-3gpp-ussd.h \ mm-iface-modem-3gpp-ussd.c \ - mm-iface-modem-cdma.h \ - mm-iface-modem-cdma.c \ mm-broadband-modem.h \ mm-broadband-modem.c \ mm-port-probe.h \ diff --git a/src/iface-cdma/Makefile.am b/src/iface-cdma/Makefile.am new file mode 100644 index 000000000..cd0371a63 --- /dev/null +++ b/src/iface-cdma/Makefile.am @@ -0,0 +1,32 @@ + +AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) +AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) + +noinst_LTLIBRARIES = libmmifacecdma.la + +libmmifacecdma_la_CPPFLAGS = \ + $(MM_CFLAGS) \ + -I$(top_srcdir) \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/src \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/src/port \ + -I$(top_builddir)/src/port \ + -I$(top_srcdir)/src/helpers \ + -I$(top_builddir)/src/helpers \ + -I$(top_srcdir)/libmm-glib \ + -I${top_srcdir}/libmm-glib/generated \ + -I${top_builddir}/libmm-glib/generated + +if WITH_QMI +libmmifacecdma_la_CPPFLAGS += $(QMI_CFLAGS) +endif + +if WITH_MBIM +libmmifacecdma_la_CPPFLAGS += $(MBIM_CFLAGS) +endif + +libmmifacecdma_la_SOURCES = \ + mm-iface-modem-cdma.h \ + mm-iface-modem-cdma.c diff --git a/src/mm-iface-modem-cdma.c b/src/iface-cdma/mm-iface-modem-cdma.c index 771bffd71..771bffd71 100644 --- a/src/mm-iface-modem-cdma.c +++ b/src/iface-cdma/mm-iface-modem-cdma.c diff --git a/src/mm-iface-modem-cdma.h b/src/iface-cdma/mm-iface-modem-cdma.h index 9e817dde9..9e817dde9 100644 --- a/src/mm-iface-modem-cdma.h +++ b/src/iface-cdma/mm-iface-modem-cdma.h diff --git a/src/iface-simple/Makefile.am b/src/iface-simple/Makefile.am index 88c407f29..db7402756 100644 --- a/src/iface-simple/Makefile.am +++ b/src/iface-simple/Makefile.am @@ -15,6 +15,7 @@ libmmifacesimple_la_CPPFLAGS = \ -I$(top_builddir)/src/port \ -I$(top_srcdir)/src/helpers \ -I$(top_builddir)/src/helpers \ + -I$(top_srcdir)/src/iface-cdma \ -I$(top_srcdir)/libmm-glib \ -I${top_srcdir}/libmm-glib/generated \ -I${top_builddir}/libmm-glib/generated diff --git a/src/protocol-qmi/Makefile.am b/src/protocol-qmi/Makefile.am index fca12fbcf..5f8015617 100644 --- a/src/protocol-qmi/Makefile.am +++ b/src/protocol-qmi/Makefile.am @@ -19,6 +19,7 @@ libmmprotocolqmi_la_CPPFLAGS = \ -I$(top_builddir)/src/port \ -I$(top_srcdir)/src/helpers \ -I$(top_builddir)/src/helpers \ + -I$(top_srcdir)/src/iface-cdma \ -I$(top_srcdir)/src/iface-messaging \ -I$(top_srcdir)/src/iface-location \ -I$(top_srcdir)/src/iface-signal \ |