diff options
| author | Aleksander Morgado <aleksander@aleksander.es> | 2016-02-04 18:31:43 -0800 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2016-02-04 22:11:49 -0800 |
| commit | 1f40be66aae7c407fe38f6c6b2647daaa1b5bf7f (patch) | |
| tree | 6b208e43e0c424557a254f925e64eb3c7c7a4b1f | |
| parent | 49ff7bafb405acc2220be604bbe864f3d9af6e3f (diff) | |
| download | ModemManager-1f40be66aae7c407fe38f6c6b2647daaa1b5bf7f.tar.gz | |
time: moved 'Time' 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-time/Makefile.am | 32 | ||||
| -rw-r--r-- | src/iface-time/mm-iface-modem-time.c (renamed from src/mm-iface-modem-time.c) | 0 | ||||
| -rw-r--r-- | src/iface-time/mm-iface-modem-time.h (renamed from src/mm-iface-modem-time.h) | 0 |
6 files changed, 37 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 939ede3c6..9bbb64083 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-time/Makefile src/iface-oma/Makefile src/iface-voice/Makefile src/tests/Makefile diff --git a/plugins/Makefile.am b/plugins/Makefile.am index 45ffcb42b..d267a53af 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-time \ -I$(top_srcdir)/src/iface-voice \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ diff --git a/src/Makefile.am b/src/Makefile.am index 5dfb04be1..d5ea9ee76 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,6 +4,7 @@ SUBDIRS = \ helpers \ protocol-qmi \ protocol-mbim \ + iface-time \ iface-oma \ iface-voice \ . \ @@ -49,6 +50,7 @@ ModemManager_CPPFLAGS = \ -I$(builddir)/helpers \ -I$(srcdir)/iface-voice \ -I$(srcdir)/iface-oma \ + -I$(srcdir)/iface-time \ -I$(top_srcdir) \ -I$(top_srcdir)/include \ -I$(top_builddir)/include \ @@ -65,6 +67,7 @@ ModemManager_LDADD = \ $(GUDEV_LIBS) \ $(builddir)/helpers/libhelpers.la \ $(builddir)/port/libport.la \ + $(builddir)/iface-time/libmmifacetime.la \ $(builddir)/iface-oma/libmmifaceoma.la \ $(builddir)/iface-voice/libmmifacevoice.la \ $(top_builddir)/libqcdm/src/libqcdm.la \ @@ -132,8 +135,6 @@ ModemManager_SOURCES = \ mm-iface-modem-location.c \ mm-iface-modem-messaging.h \ mm-iface-modem-messaging.c \ - mm-iface-modem-time.h \ - mm-iface-modem-time.c \ mm-iface-modem-firmware.h \ mm-iface-modem-firmware.c \ mm-iface-modem-signal.h \ diff --git a/src/iface-time/Makefile.am b/src/iface-time/Makefile.am new file mode 100644 index 000000000..ce9f94a6a --- /dev/null +++ b/src/iface-time/Makefile.am @@ -0,0 +1,32 @@ + +AM_CFLAGS = $(CODE_COVERAGE_CFLAGS) +AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS) + +noinst_LTLIBRARIES = libmmifacetime.la + +libmmifacetime_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 +libmmifacetime_la_CPPFLAGS += $(QMI_CFLAGS) +endif + +if WITH_MBIM +libmmifacetime_la_CPPFLAGS += $(MBIM_CFLAGS) +endif + +libmmifacetime_la_SOURCES = \ + mm-iface-modem-time.h \ + mm-iface-modem-time.c diff --git a/src/mm-iface-modem-time.c b/src/iface-time/mm-iface-modem-time.c index 91be855eb..91be855eb 100644 --- a/src/mm-iface-modem-time.c +++ b/src/iface-time/mm-iface-modem-time.c diff --git a/src/mm-iface-modem-time.h b/src/iface-time/mm-iface-modem-time.h index 7712e4cf5..7712e4cf5 100644 --- a/src/mm-iface-modem-time.h +++ b/src/iface-time/mm-iface-modem-time.h |