summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile.am32
-rw-r--r--cli/Makefile.am10
-rw-r--r--libmm-glib/Makefile.am32
-rw-r--r--libmm-glib/generated/Makefile.am24
-rw-r--r--src/Makefile.am30
5 files changed, 87 insertions, 41 deletions
diff --git a/Makefile.am b/Makefile.am
index 762306ff5..0438423b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,27 +1,49 @@
-SUBDIRS = . build-aux data include libqcdm libwmc libmm-glib src plugins cli vapi introspection uml290 po test examples docs
+SUBDIRS = \
+ . \
+ build-aux \
+ data \
+ include \
+ libqcdm \
+ libwmc \
+ libmm-glib \
+ src \
+ plugins \
+ cli \
+ vapi \
+ introspection \
+ uml290 \
+ po \
+ test \
+ examples \
+ docs \
+ $(NULL)
DISTCHECK_CONFIGURE_FLAGS = \
--with-udev-base-dir="$$dc_install_base" \
--with-systemdsystemunitdir="$$dc_install_base/$(SYSTEMD_UNIT_DIR)" \
- --enable-gtk-doc=yes
+ --enable-gtk-doc=yes \
+ $(NULL)
INTLTOOL_FILES = \
intltool-extract.in \
intltool-merge.in \
- intltool-update.in
+ intltool-update.in \
+ $(NULL)
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update \
- po/.intltool-merge-cache
+ po/.intltool-merge-cache \
+ $(NULL)
EXTRA_DIST = \
$(INTLTOOL_FILES) \
autogen.sh \
gtester.make \
- COPYING.LIB
+ COPYING.LIB \
+ $(NULL)
ACLOCAL_AMFLAGS = -I m4
diff --git a/cli/Makefile.am b/cli/Makefile.am
index 51d71c42a..d2573dbc1 100644
--- a/cli/Makefile.am
+++ b/cli/Makefile.am
@@ -7,7 +7,8 @@ mmcli_CPPFLAGS = \
-I$(top_builddir)/include \
-I$(top_srcdir)/libmm-glib \
-I${top_srcdir}/libmm-glib/generated \
- -I${top_builddir}/libmm-glib/generated
+ -I${top_builddir}/libmm-glib/generated \
+ $(NULL)
mmcli_SOURCES = \
mmcli.h \
@@ -29,12 +30,13 @@ mmcli_SOURCES = \
mmcli-bearer.c \
mmcli-sim.c \
mmcli-sms.c \
- mmcli-call.c
+ mmcli-call.c \
+ $(NULL)
mmcli_LDADD = \
$(MMCLI_LIBS) \
- $(top_builddir)/libmm-glib/libmm-glib.la
-
+ $(top_builddir)/libmm-glib/libmm-glib.la \
+ $(NULL)
completiondir = $(datadir)/bash-completion/completions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am
index 4b7ab4f06..e257d6f0e 100644
--- a/libmm-glib/Makefile.am
+++ b/libmm-glib/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = generated . tests
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
lib_LTLIBRARIES = libmm-glib.la
@@ -80,7 +80,8 @@ libmm_glib_la_SOURCES = \
mm-cdma-manual-activation-properties.h \
mm-cdma-manual-activation-properties.c \
mm-signal.h \
- mm-signal.c
+ mm-signal.c \
+ $(NULL)
libmm_glib_la_CPPFLAGS = \
-I$(srcdir) \
@@ -91,19 +92,23 @@ libmm_glib_la_CPPFLAGS = \
-I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated \
-DLIBMM_GLIB_COMPILATION \
- $(AM_CPPFLAGS)
+ $(AM_CPPFLAGS) \
+ $(NULL)
libmm_glib_la_CFLAGS = \
$(LIBMM_GLIB_CFLAGS) \
- $(AM_CFLAGS)
+ $(AM_CFLAGS) \
+ $(NULL)
libmm_glib_la_LIBADD = \
${top_builddir}/libmm-glib/generated/libmm-generated.la \
- $(LIBMM_GLIB_LIBS)
+ $(LIBMM_GLIB_LIBS) \
+ $(NULL)
libmm_glib_la_LDFLAGS = \
-version-info $(MM_GLIB_LT_CURRENT):$(MM_GLIB_LT_REVISION):$(MM_GLIB_LT_AGE) \
- $(AM_LDFLAGS)
+ $(AM_LDFLAGS) \
+ $(NULL)
includedir = @includedir@/libmm-glib
include_HEADERS = \
@@ -143,7 +148,8 @@ include_HEADERS = \
mm-network-timezone.h \
mm-firmware-properties.h \
mm-cdma-manual-activation-properties.h \
- mm-signal.h
+ mm-signal.h \
+ $(NULL)
CLEANFILES =
@@ -158,7 +164,8 @@ GENERATED_H = \
mm-gdbus-sim.h \
mm-gdbus-sms.h \
mm-gdbus-bearer.h \
- mm-gdbus-modem.h
+ mm-gdbus-modem.h \
+ $(NULL)
GENERATED_C = \
mm-enums-types.c \
@@ -168,14 +175,16 @@ GENERATED_C = \
mm-gdbus-sim.c \
mm-gdbus-sms.c \
mm-gdbus-bearer.c \
- mm-gdbus-modem.c
+ mm-gdbus-modem.c \
+ $(NULL)
PUBLIC_H = \
ModemManager-names.h \
ModemManager-version.h
ModemManager-enums.h \
ModemManager-errors.h \
- ModemManager.h
+ ModemManager.h \
+ $(NULL)
INTROSPECTION_GIRS = ModemManager-1.0.gir
INTROSPECTION_SCANNER_ARGS = --warn-all
@@ -190,7 +199,8 @@ ModemManager_1_0_gir_SCANNERFLAGS = \
--c-include "libmm-glib.h" \
--identifier-prefix=MM \
--identifier-prefix=Mm \
- --symbol-prefix=mm
+ --symbol-prefix=mm \
+ $(NULL)
ModemManager_1_0_gir_FILES = \
$(include_HEADERS) \
$(filter-out %.h,$(libmm_glib_la_SOURCES)) \
diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am
index 743ac542d..cd57ed635 100644
--- a/libmm-glib/generated/Makefile.am
+++ b/libmm-glib/generated/Makefile.am
@@ -1,7 +1,7 @@
SUBDIRS = . tests
-AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
+AM_CFLAGS = $(CODE_COVERAGE_CFLAGS)
AM_LDFLAGS = $(CODE_COVERAGE_LDFLAGS)
noinst_LTLIBRARIES = libmm-generated.la
@@ -14,7 +14,8 @@ GENERATED_H = \
mm-gdbus-sms.h \
mm-gdbus-call.h \
mm-gdbus-bearer.h \
- mm-gdbus-modem.h
+ mm-gdbus-modem.h \
+ $(NULL)
GENERATED_C = \
mm-enums-types.c \
@@ -25,7 +26,8 @@ GENERATED_C = \
mm-gdbus-sms.c \
mm-gdbus-call.c \
mm-gdbus-bearer.c \
- mm-gdbus-modem.c
+ mm-gdbus-modem.c \
+ $(NULL)
GENERATED_DOC = \
mm-gdbus-doc-org.freedesktop.ModemManager1.xml \
@@ -44,7 +46,8 @@ GENERATED_DOC = \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
- mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml
+ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml \
+ $(NULL)
BUILT_SOURCES = $(GENERATED_H) $(GENERATED_C) $(GENERATED_DOC)
@@ -117,7 +120,8 @@ mm_gdbus_modem_generated = \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Simple.xml \
- mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml
+ mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Signal.xml \
+ $(NULL)
mm_gdbus_modem_deps = \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.xml \
@@ -228,9 +232,7 @@ mm-gdbus-call.c: $(mm_gdbus_call_deps)
$(filter-out mm-gdbus-call.c, $(mm_gdbus_call_generated)): $(mm_gdbus_call_deps) mm-gdbus-call.c
@: # nothing to do, generated as a side-effect of the .c
-nodist_libmm_generated_la_SOURCES = \
- $(GENERATED_H) \
- $(GENERATED_C)
+nodist_libmm_generated_la_SOURCES = $(GENERATED_H) $(GENERATED_C)
libmm_generated_la_CPPFLAGS = \
$(LIBMM_GLIB_CFLAGS) \
@@ -239,10 +241,10 @@ libmm_generated_la_CPPFLAGS = \
-I$(top_builddir)/include \
-Wno-unused-function \
-Wno-float-equal \
- -Wno-shadow
+ -Wno-shadow \
+ $(NULL)
-libmm_generated_la_LIBADD = \
- $(LIBMM_GLIB_LIBS)
+libmm_generated_la_LIBADD = $(LIBMM_GLIB_LIBS)
includedir = @includedir@/libmm-glib
include_HEADERS = $(GENERATED_H)
diff --git a/src/Makefile.am b/src/Makefile.am
index 1bd99281e..bee1dfe8b 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -78,18 +78,21 @@ libhelpers_la_SOURCES = \
mm-sms-part-3gpp.h \
mm-sms-part-3gpp.c \
mm-sms-part-cdma.h \
- mm-sms-part-cdma.c
+ mm-sms-part-cdma.c \
+ $(NULL)
if WITH_QMI
libhelpers_la_SOURCES += \
mm-modem-helpers-qmi.c \
- mm-modem-helpers-qmi.h
+ mm-modem-helpers-qmi.h \
+ $(NULL)
endif
if WITH_MBIM
libhelpers_la_SOURCES += \
mm-modem-helpers-mbim.c \
- mm-modem-helpers-mbim.h
+ mm-modem-helpers-mbim.h \
+ $(NULL)
endif
################################################################################
@@ -133,20 +136,23 @@ libport_la_SOURCES = \
mm-port-serial-gps.c \
mm-port-serial-gps.h \
mm-serial-parsers.c \
- mm-serial-parsers.h
+ mm-serial-parsers.h \
+ $(NULL)
nodist_libport_la_SOURCES = $(PORT_ENUMS_GENERATED)
if WITH_QMI
libport_la_SOURCES += \
mm-port-qmi.c \
- mm-port-qmi.h
+ mm-port-qmi.h \
+ $(NULL)
endif
if WITH_MBIM
libport_la_SOURCES += \
mm-port-mbim.c \
- mm-port-mbim.h
+ mm-port-mbim.h \
+ $(NULL)
endif
libport_la_LIBADD = \
@@ -193,7 +199,8 @@ BUILT_SOURCES += $(DAEMON_ENUMS_GENERATED)
CLEANFILES += $(DAEMON_ENUMS_GENERATED)
ModemManager_CPPFLAGS = \
- -DPLUGINDIR=\"$(pkglibdir)\"
+ -DPLUGINDIR=\"$(pkglibdir)\" \
+ $(NULL)
ModemManager_LDADD = \
$(top_builddir)/libqcdm/src/libqcdm.la \
@@ -273,7 +280,8 @@ ModemManager_SOURCES = \
mm-port-probe-at.h \
mm-port-probe-at.c \
mm-plugin.c \
- mm-plugin.h
+ mm-plugin.h \
+ $(NULL)
nodist_ModemManager_SOURCES = $(DAEMON_ENUMS_GENERATED)
@@ -302,7 +310,8 @@ ModemManager_SOURCES += \
mm-bearer-qmi.h \
mm-bearer-qmi.c \
mm-broadband-modem-qmi.h \
- mm-broadband-modem-qmi.c
+ mm-broadband-modem-qmi.c \
+ $(NULL)
endif
# Additional MBIM support in ModemManager
@@ -315,5 +324,6 @@ ModemManager_SOURCES += \
mm-bearer-mbim.h \
mm-bearer-mbim.c \
mm-broadband-modem-mbim.h \
- mm-broadband-modem-mbim.c
+ mm-broadband-modem-mbim.c \
+ $(NULL)
endif
View Lorry Controller Status