diff options
Diffstat (limited to 'libmm-glib')
| -rw-r--r-- | libmm-glib/Makefile.am | 32 | ||||
| -rw-r--r-- | libmm-glib/generated/Makefile.am | 24 |
2 files changed, 34 insertions, 22 deletions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am index 4b7ab4f0..e257d6f0 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 743ac542..cd57ed63 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) |