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

build: end all multiline list variables with $(NULL)

Browse Source 
So that appending a new item in the list only inserts one new line (i.e. the
last $(NULL) is the last item always).
This commit is contained in:
Aleksander Morgado
2016-03-15 12:28:56 +01:00
parent f9c63bfa05
commit eeb9e2bdcc
5 changed files with 87 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.am
View File

@@ -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 = \ DISTCHECK_CONFIGURE_FLAGS = \
--with-udev-base-dir="$$dc_install_base" \ --with-udev-base-dir="$$dc_install_base" \
--with-systemdsystemunitdir="$$dc_install_base/$(SYSTEMD_UNIT_DIR)" \ --with-systemdsystemunitdir="$$dc_install_base/$(SYSTEMD_UNIT_DIR)" \
--enable-gtk-doc=yes --enable-gtk-doc=yes \
$(NULL)
INTLTOOL_FILES = \ INTLTOOL_FILES = \
intltool-extract.in \ intltool-extract.in \
intltool-merge.in \ intltool-merge.in \
intltool-update.in intltool-update.in \
$(NULL)
DISTCLEANFILES = \ DISTCLEANFILES = \
intltool-extract \ intltool-extract \
intltool-merge \ intltool-merge \
intltool-update \ intltool-update \
po/.intltool-merge-cache po/.intltool-merge-cache \
$(NULL)
EXTRA_DIST = \ EXTRA_DIST = \
$(INTLTOOL_FILES) \ $(INTLTOOL_FILES) \
autogen.sh \ autogen.sh \
gtester.make \ gtester.make \
COPYING.LIB COPYING.LIB \
$(NULL)
ACLOCAL_AMFLAGS = -I m4 ACLOCAL_AMFLAGS = -I m4

10
cli/Makefile.am
View File

@@ -7,7 +7,8 @@ mmcli_CPPFLAGS = \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-I$(top_srcdir)/libmm-glib \ -I$(top_srcdir)/libmm-glib \
-I${top_srcdir}/libmm-glib/generated \ -I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated -I${top_builddir}/libmm-glib/generated \
$(NULL)
mmcli_SOURCES = \ mmcli_SOURCES = \
mmcli.h \ mmcli.h \
@@ -29,12 +30,13 @@ mmcli_SOURCES = \
mmcli-bearer.c \ mmcli-bearer.c \
mmcli-sim.c \ mmcli-sim.c \
mmcli-sms.c \ mmcli-sms.c \
mmcli-call.c mmcli-call.c \
$(NULL)
mmcli_LDADD = \ mmcli_LDADD = \
$(MMCLI_LIBS) \ $(MMCLI_LIBS) \
$(top_builddir)/libmm-glib/libmm-glib.la $(top_builddir)/libmm-glib/libmm-glib.la \
$(NULL)
completiondir = $(datadir)/bash-completion/completions completiondir = $(datadir)/bash-completion/completions

30
libmm-glib/Makefile.am
View File

@@ -80,7 +80,8 @@ libmm_glib_la_SOURCES = \
mm-cdma-manual-activation-properties.h \ mm-cdma-manual-activation-properties.h \
mm-cdma-manual-activation-properties.c \ mm-cdma-manual-activation-properties.c \
mm-signal.h \ mm-signal.h \
mm-signal.c mm-signal.c \
$(NULL)
libmm_glib_la_CPPFLAGS = \ libmm_glib_la_CPPFLAGS = \
-I$(srcdir) \ -I$(srcdir) \
@@ -91,19 +92,23 @@ libmm_glib_la_CPPFLAGS = \
-I${top_srcdir}/libmm-glib/generated \ -I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated \ -I${top_builddir}/libmm-glib/generated \
-DLIBMM_GLIB_COMPILATION \ -DLIBMM_GLIB_COMPILATION \
$(AM_CPPFLAGS) $(AM_CPPFLAGS) \
$(NULL)
libmm_glib_la_CFLAGS = \ libmm_glib_la_CFLAGS = \
$(LIBMM_GLIB_CFLAGS) \ $(LIBMM_GLIB_CFLAGS) \
$(AM_CFLAGS) $(AM_CFLAGS) \
$(NULL)
libmm_glib_la_LIBADD = \ libmm_glib_la_LIBADD = \
${top_builddir}/libmm-glib/generated/libmm-generated.la \ ${top_builddir}/libmm-glib/generated/libmm-generated.la \
$(LIBMM_GLIB_LIBS) $(LIBMM_GLIB_LIBS) \
$(NULL)
libmm_glib_la_LDFLAGS = \ libmm_glib_la_LDFLAGS = \
-version-info $(MM_GLIB_LT_CURRENT):$(MM_GLIB_LT_REVISION):$(MM_GLIB_LT_AGE) \ -version-info $(MM_GLIB_LT_CURRENT):$(MM_GLIB_LT_REVISION):$(MM_GLIB_LT_AGE) \
$(AM_LDFLAGS) $(AM_LDFLAGS) \
$(NULL)
includedir = @includedir@/libmm-glib includedir = @includedir@/libmm-glib
include_HEADERS = \ include_HEADERS = \
@@ -143,7 +148,8 @@ include_HEADERS = \
mm-network-timezone.h \ mm-network-timezone.h \
mm-firmware-properties.h \ mm-firmware-properties.h \
mm-cdma-manual-activation-properties.h \ mm-cdma-manual-activation-properties.h \
mm-signal.h mm-signal.h \
$(NULL)
CLEANFILES = CLEANFILES =
@@ -158,7 +164,8 @@ GENERATED_H = \
mm-gdbus-sim.h \ mm-gdbus-sim.h \
mm-gdbus-sms.h \ mm-gdbus-sms.h \
mm-gdbus-bearer.h \ mm-gdbus-bearer.h \
mm-gdbus-modem.h mm-gdbus-modem.h \
$(NULL)
GENERATED_C = \ GENERATED_C = \
mm-enums-types.c \ mm-enums-types.c \
@@ -168,14 +175,16 @@ GENERATED_C = \
mm-gdbus-sim.c \ mm-gdbus-sim.c \
mm-gdbus-sms.c \ mm-gdbus-sms.c \
mm-gdbus-bearer.c \ mm-gdbus-bearer.c \
mm-gdbus-modem.c mm-gdbus-modem.c \
$(NULL)
PUBLIC_H = \ PUBLIC_H = \
ModemManager-names.h \ ModemManager-names.h \
ModemManager-version.h ModemManager-version.h
ModemManager-enums.h \ ModemManager-enums.h \
ModemManager-errors.h \ ModemManager-errors.h \
ModemManager.h ModemManager.h \
$(NULL)
INTROSPECTION_GIRS = ModemManager-1.0.gir INTROSPECTION_GIRS = ModemManager-1.0.gir
INTROSPECTION_SCANNER_ARGS = --warn-all INTROSPECTION_SCANNER_ARGS = --warn-all
@@ -190,7 +199,8 @@ ModemManager_1_0_gir_SCANNERFLAGS = \
--c-include "libmm-glib.h" \ --c-include "libmm-glib.h" \
--identifier-prefix=MM \ --identifier-prefix=MM \
--identifier-prefix=Mm \ --identifier-prefix=Mm \
--symbol-prefix=mm --symbol-prefix=mm \
$(NULL)
ModemManager_1_0_gir_FILES = \ ModemManager_1_0_gir_FILES = \
$(include_HEADERS) \ $(include_HEADERS) \
$(filter-out %.h,$(libmm_glib_la_SOURCES)) \ $(filter-out %.h,$(libmm_glib_la_SOURCES)) \

22
libmm-glib/generated/Makefile.am
View File

@@ -14,7 +14,8 @@ GENERATED_H = \
mm-gdbus-sms.h \ mm-gdbus-sms.h \
mm-gdbus-call.h \ mm-gdbus-call.h \
mm-gdbus-bearer.h \ mm-gdbus-bearer.h \
mm-gdbus-modem.h mm-gdbus-modem.h \
$(NULL)
GENERATED_C = \ GENERATED_C = \
mm-enums-types.c \ mm-enums-types.c \
@@ -25,7 +26,8 @@ GENERATED_C = \
mm-gdbus-sms.c \ mm-gdbus-sms.c \
mm-gdbus-call.c \ mm-gdbus-call.c \
mm-gdbus-bearer.c \ mm-gdbus-bearer.c \
mm-gdbus-modem.c mm-gdbus-modem.c \
$(NULL)
GENERATED_DOC = \ GENERATED_DOC = \
mm-gdbus-doc-org.freedesktop.ModemManager1.xml \ 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.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.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.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) 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.xml \
mm-gdbus-doc-org.freedesktop.ModemManager1.Modem.Modem3gpp.Ussd.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.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 = \ mm_gdbus_modem_deps = \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \ $(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.xml \
$(top_srcdir)/introspection/org.freedesktop.ModemManager1.Modem.Messaging.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 $(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 @: # nothing to do, generated as a side-effect of the .c
nodist_libmm_generated_la_SOURCES = \ nodist_libmm_generated_la_SOURCES = $(GENERATED_H) $(GENERATED_C)
$(GENERATED_H) \
$(GENERATED_C)
libmm_generated_la_CPPFLAGS = \ libmm_generated_la_CPPFLAGS = \
$(LIBMM_GLIB_CFLAGS) \ $(LIBMM_GLIB_CFLAGS) \
@@ -239,10 +241,10 @@ libmm_generated_la_CPPFLAGS = \
-I$(top_builddir)/include \ -I$(top_builddir)/include \
-Wno-unused-function \ -Wno-unused-function \
-Wno-float-equal \ -Wno-float-equal \
-Wno-shadow -Wno-shadow \
$(NULL)
libmm_generated_la_LIBADD = \ libmm_generated_la_LIBADD = $(LIBMM_GLIB_LIBS)
$(LIBMM_GLIB_LIBS)
includedir = @includedir@/libmm-glib includedir = @includedir@/libmm-glib
include_HEADERS = $(GENERATED_H) include_HEADERS = $(GENERATED_H)

30
src/Makefile.am
View File

@@ -78,18 +78,21 @@ libhelpers_la_SOURCES = \
mm-sms-part-3gpp.h \ mm-sms-part-3gpp.h \
mm-sms-part-3gpp.c \ mm-sms-part-3gpp.c \
mm-sms-part-cdma.h \ mm-sms-part-cdma.h \
mm-sms-part-cdma.c mm-sms-part-cdma.c \
$(NULL)
if WITH_QMI if WITH_QMI
libhelpers_la_SOURCES += \ libhelpers_la_SOURCES += \
mm-modem-helpers-qmi.c \ mm-modem-helpers-qmi.c \
mm-modem-helpers-qmi.h mm-modem-helpers-qmi.h \
$(NULL)
endif endif
if WITH_MBIM if WITH_MBIM
libhelpers_la_SOURCES += \ libhelpers_la_SOURCES += \
mm-modem-helpers-mbim.c \ mm-modem-helpers-mbim.c \
mm-modem-helpers-mbim.h mm-modem-helpers-mbim.h \
$(NULL)
endif endif
################################################################################ ################################################################################
@@ -133,20 +136,23 @@ libport_la_SOURCES = \
mm-port-serial-gps.c \ mm-port-serial-gps.c \
mm-port-serial-gps.h \ mm-port-serial-gps.h \
mm-serial-parsers.c \ mm-serial-parsers.c \
mm-serial-parsers.h mm-serial-parsers.h \
$(NULL)
nodist_libport_la_SOURCES = $(PORT_ENUMS_GENERATED) nodist_libport_la_SOURCES = $(PORT_ENUMS_GENERATED)
if WITH_QMI if WITH_QMI
libport_la_SOURCES += \ libport_la_SOURCES += \
mm-port-qmi.c \ mm-port-qmi.c \
mm-port-qmi.h mm-port-qmi.h \
$(NULL)
endif endif
if WITH_MBIM if WITH_MBIM
libport_la_SOURCES += \ libport_la_SOURCES += \
mm-port-mbim.c \ mm-port-mbim.c \
mm-port-mbim.h mm-port-mbim.h \
$(NULL)
endif endif
libport_la_LIBADD = \ libport_la_LIBADD = \
@@ -193,7 +199,8 @@ BUILT_SOURCES += $(DAEMON_ENUMS_GENERATED)
CLEANFILES += $(DAEMON_ENUMS_GENERATED) CLEANFILES += $(DAEMON_ENUMS_GENERATED)
ModemManager_CPPFLAGS = \ ModemManager_CPPFLAGS = \
-DPLUGINDIR=\"$(pkglibdir)\" -DPLUGINDIR=\"$(pkglibdir)\" \
$(NULL)
ModemManager_LDADD = \ ModemManager_LDADD = \
$(top_builddir)/libqcdm/src/libqcdm.la \ $(top_builddir)/libqcdm/src/libqcdm.la \
@@ -273,7 +280,8 @@ ModemManager_SOURCES = \
mm-port-probe-at.h \ mm-port-probe-at.h \
mm-port-probe-at.c \ mm-port-probe-at.c \
mm-plugin.c \ mm-plugin.c \
mm-plugin.h mm-plugin.h \
$(NULL)
nodist_ModemManager_SOURCES = $(DAEMON_ENUMS_GENERATED) nodist_ModemManager_SOURCES = $(DAEMON_ENUMS_GENERATED)
@@ -302,7 +310,8 @@ ModemManager_SOURCES += \
mm-bearer-qmi.h \ mm-bearer-qmi.h \
mm-bearer-qmi.c \ mm-bearer-qmi.c \
mm-broadband-modem-qmi.h \ mm-broadband-modem-qmi.h \
mm-broadband-modem-qmi.c mm-broadband-modem-qmi.c \
$(NULL)
endif endif
# Additional MBIM support in ModemManager # Additional MBIM support in ModemManager
@@ -315,5 +324,6 @@ ModemManager_SOURCES += \
mm-bearer-mbim.h \ mm-bearer-mbim.h \
mm-bearer-mbim.c \ mm-bearer-mbim.c \
mm-broadband-modem-mbim.h \ mm-broadband-modem-mbim.h \
mm-broadband-modem-mbim.c mm-broadband-modem-mbim.c \
$(NULL)
endif endif