aboutsummaryrefslogtreecommitdiff
path: root/libmm-glib
diff options
context:
space:
mode:
Diffstat (limited to 'libmm-glib')
-rw-r--r--libmm-glib/Makefile.am12
-rw-r--r--libmm-glib/generated/Makefile.am9
2 files changed, 14 insertions, 7 deletions
diff --git a/libmm-glib/Makefile.am b/libmm-glib/Makefile.am
index f75cc28d..49f1e832 100644
--- a/libmm-glib/Makefile.am
+++ b/libmm-glib/Makefile.am
@@ -92,6 +92,7 @@ libmm_glib_la_SOURCES = \
$(NULL)
libmm_glib_la_CPPFLAGS = \
+ $(LIBMM_GLIB_CFLAGS) \
-I$(srcdir) \
-I$(top_srcdir) \
-I$(top_builddir) \
@@ -100,22 +101,20 @@ libmm_glib_la_CPPFLAGS = \
-I${top_srcdir}/libmm-glib/generated \
-I${top_builddir}/libmm-glib/generated \
-DLIBMM_GLIB_COMPILATION \
- $(AM_CPPFLAGS) \
$(NULL)
-libmm_glib_la_CFLAGS = \
- $(LIBMM_GLIB_CFLAGS) \
- $(AM_CFLAGS) \
+libmm_glib_gla_CFLAGS = \
+ $(WARN_CFLAGS) \
$(NULL)
libmm_glib_la_LIBADD = \
${top_builddir}/libmm-glib/generated/libmm-generated.la \
- $(LIBMM_GLIB_LIBS) \
$(NULL)
libmm_glib_la_LDFLAGS = \
-version-info $(MM_GLIB_LT_CURRENT):$(MM_GLIB_LT_REVISION):$(MM_GLIB_LT_AGE) \
- $(AM_LDFLAGS) \
+ $(WARN_LDFLAGS) \
+ $(LIBMM_GLIB_LIBS) \
$(NULL)
includedir = @includedir@/libmm-glib
@@ -209,6 +208,7 @@ ModemManager_1_0_gir_CFLAGS = $(libmm_glib_la_CPPFLAGS)
ModemManager_1_0_gir_LIBS = libmm-glib.la
ModemManager_1_0_gir_EXPORT_PACKAGES = libmm-glib
ModemManager_1_0_gir_SCANNERFLAGS = \
+ $(WARN_SCANNERFLAGS) \
--c-include "libmm-glib.h" \
--identifier-prefix=MM \
--identifier-prefix=Mm \
diff --git a/libmm-glib/generated/Makefile.am b/libmm-glib/generated/Makefile.am
index 5f4a5ad9..0f6161dc 100644
--- a/libmm-glib/generated/Makefile.am
+++ b/libmm-glib/generated/Makefile.am
@@ -244,7 +244,14 @@ libmm_generated_la_CPPFLAGS = \
-Wno-shadow \
$(NULL)
-libmm_generated_la_LIBADD = $(LIBMM_GLIB_LIBS)
+libmm_generated_la_CFLAGS = \
+ $(WARN_CFLAGS) \
+ $(NULL)
+
+libmm_generated_la_LDFLAGS = \
+ $(WARN_LDFLAGS) \
+ $(LIBMM_GLIB_LIBS) \
+ $(NULL)
includedir = @includedir@/libmm-glib
nodist_include_HEADERS = $(GENERATED_H)