build: use common CPPFLAGS and LDFLAGS for all plugins

Also include $(top_srcdir)/generated and $(top_builddir)/generated in the
common preprocessor flags.

1 files changed, 56 insertions, 261 deletions

diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 7c33684d..3b197efd 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,4 +1,18 @@
 
+# Common CPPFLAGS and LDFLAGS
+
+PLUGIN_COMMON_COMPILER_FLAGS = \
+	$(MM_CFLAGS) \
+	$(GUDEV_CFLAGS)	\
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/src \
+	-I$(top_srcdir)/include
+
+PLUGIN_COMMON_LINKER_FLAGS = \
+	$(GUDEV_LDFLAGS) \
+	-module \
+	-avoid-version
+
 ##########################
 # Icera-specific support #
 ##########################
@@ -9,15 +23,8 @@ libicera_utils_la_SOURCES = \
 	mm-modem-icera.c \
 	mm-modem-icera.h
 
-libicera_utils_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libicera_utils_la_LIBADD = \
-	$(GUDEV_LDFLAGS)
+libicera_utils_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libicera_utils_la_LIBADD = $(GUDEV_LDFLAGS)
 
 ########################################
 
@@ -44,65 +51,31 @@ pkglib_LTLIBRARIES = \
 	libmm-plugin-iridium.la
 
 # Generic
-
 libmm_plugin_generic_la_SOURCES = \
 	mm-plugin-generic.c \
 	mm-plugin-generic.h
-
-libmm_plugin_generic_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS)	\
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_generic_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_generic_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_generic_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Motorola C-series phones
-
 libmm_plugin_moto_c_la_SOURCES = \
 	mm-plugin-moto-c.c \
 	mm-plugin-moto-c.h \
 	mm-modem-moto-c-gsm.c \
 	mm-modem-moto-c-gsm.h
-
-libmm_plugin_moto_c_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS)	\
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_moto_c_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_moto_c_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_moto_c_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Qualcomm Gobi
-
 libmm_plugin_gobi_la_SOURCES = \
 	mm-plugin-gobi.c \
 	mm-plugin-gobi.h \
 	mm-modem-gobi-gsm.c \
 	mm-modem-gobi-gsm.h
-
-libmm_plugin_gobi_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_gobi_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_gobi_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_gobi_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Huawei
-
 libmm_plugin_huawei_la_SOURCES = \
 	mm-plugin-huawei.c \
 	mm-plugin-huawei.h \
@@ -110,85 +83,41 @@ libmm_plugin_huawei_la_SOURCES = \
 	mm-modem-huawei-gsm.h \
 	mm-modem-huawei-cdma.c \
 	mm-modem-huawei-cdma.h
-
-libmm_plugin_huawei_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_huawei_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_huawei_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_huawei_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # HSO
-
 libmm_plugin_hso_la_SOURCES = \
 	mm-plugin-hso.c \
 	mm-plugin-hso.h \
 	mm-modem-gsm-hso-glue.h \
 	mm-modem-hso.c \
 	mm-modem-hso.h
+libmm_plugin_hso_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_hso_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 mm-modem-gsm-hso-glue.h: $(top_srcdir)/introspection/org.freedesktop.ModemManager.Modem.Gsm.Hso.xml
 	$(AM_V_GEN) dbus-binding-tool --prefix=mm_modem_gsm_hso --mode=glib-server --output=$@ $<
 
-libmm_plugin_hso_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_hso_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
-
 # MBM
-
 libmm_plugin_mbm_la_SOURCES = \
 	mm-plugin-mbm.c \
 	mm-plugin-mbm.h \
 	mm-modem-mbm.c \
 	mm-modem-mbm.h
-
-libmm_plugin_mbm_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_mbm_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_mbm_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_mbm_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Option
-
 libmm_plugin_option_la_SOURCES = \
 	mm-plugin-option.c \
 	mm-plugin-option.h \
 	mm-modem-option.c \
 	mm-modem-option.h
-
-libmm_plugin_option_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_option_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_option_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_option_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Sierra
-
 libmm_plugin_sierra_la_SOURCES = \
 	mm-plugin-sierra.c \
 	mm-plugin-sierra.h \
@@ -196,44 +125,22 @@ libmm_plugin_sierra_la_SOURCES = \
 	mm-modem-sierra-gsm.h \
 	mm-modem-sierra-cdma.c \
 	mm-modem-sierra-cdma.h
-
-libmm_plugin_sierra_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_sierra_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_sierra_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_sierra_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 libmm_plugin_sierra_la_LIBADD = \
 	$(builddir)/libicera-utils.la
 
 # Wavecom (Sierra Airlink)
-
 libmm_plugin_wavecom_la_SOURCES = \
 	mm-plugin-wavecom.c \
 	mm-plugin-wavecom.h \
 	mm-modem-wavecom-gsm.c \
 	mm-modem-wavecom-gsm.h
-
-libmm_plugin_wavecom_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_wavecom_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_wavecom_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_wavecom_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Novatel
-
 libmm_plugin_novatel_la_SOURCES = \
 	mm-plugin-novatel.c \
 	mm-plugin-novatel.h \
@@ -241,204 +148,92 @@ libmm_plugin_novatel_la_SOURCES = \
 	mm-modem-novatel-gsm.h \
 	mm-modem-novatel-cdma.c \
 	mm-modem-novatel-cdma.h
-
-libmm_plugin_novatel_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_novatel_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_novatel_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_novatel_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Nokia
-
 libmm_plugin_nokia_la_SOURCES = \
 	mm-plugin-nokia.c \
 	mm-plugin-nokia.h \
 	mm-modem-nokia.c \
 	mm-modem-nokia.h
-
-libmm_plugin_nokia_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_nokia_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_nokia_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_nokia_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Zte
-
 libmm_plugin_zte_la_SOURCES = \
 	mm-plugin-zte.c \
 	mm-plugin-zte.h \
 	mm-modem-zte.c \
 	mm-modem-zte.h
-
-libmm_plugin_zte_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_zte_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
-
-libmm_plugin_zte_la_LIBADD = \
-	$(builddir)/libicera-utils.la
+libmm_plugin_zte_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_zte_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_zte_la_LIBADD = $(builddir)/libicera-utils.la
 
 # Longcheer (and rebranded dongles)
-
 libmm_plugin_longcheer_la_SOURCES = \
 	mm-plugin-longcheer.c \
 	mm-plugin-longcheer.h \
 	mm-modem-longcheer-gsm.c \
 	mm-modem-longcheer-gsm.h
-
-libmm_plugin_longcheer_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_longcheer_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_longcheer_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_longcheer_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # AnyData CDMA
-
 libmm_plugin_anydata_la_SOURCES = \
 	mm-plugin-anydata.c \
 	mm-plugin-anydata.h \
 	mm-modem-anydata-cdma.c \
 	mm-modem-anydata-cdma.h
-
-libmm_plugin_anydata_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_anydata_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_anydata_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_anydata_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # SimTech
-
 libmm_plugin_simtech_la_SOURCES = \
 	mm-plugin-simtech.c \
 	mm-plugin-simtech.h \
 	mm-modem-simtech-gsm.c \
 	mm-modem-simtech-gsm.h
-
-libmm_plugin_simtech_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_simtech_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_simtech_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_simtech_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Alcatel/TCT/JRD x220D and possibly others
-
 libmm_plugin_x22x_la_SOURCES = \
 	mm-plugin-x22x.c \
 	mm-plugin-x22x.h \
 	mm-modem-x22x-gsm.c \
 	mm-modem-x22x-gsm.h
-
-libmm_plugin_x22x_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_x22x_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_x22x_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_x22x_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Linktop
-
 libmm_plugin_linktop_la_SOURCES = \
 	mm-plugin-linktop.c \
 	mm-plugin-linktop.h \
 	mm-modem-linktop.c \
 	mm-modem-linktop.h
-
-libmm_plugin_linktop_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_linktop_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
+libmm_plugin_linktop_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_linktop_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
 # Samsung modem
-
 libmm_plugin_samsung_la_SOURCES = \
 	mm-plugin-samsung.c \
 	mm-plugin-samsung.h \
 	mm-modem-samsung-gsm.c \
 	mm-modem-samsung-gsm.h
-
-libmm_plugin_samsung_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_samsung_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
-
-libmm_plugin_samsung_la_LIBADD = \
-	$(builddir)/libicera-utils.la
+libmm_plugin_samsung_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_samsung_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
+libmm_plugin_samsung_la_LIBADD = $(builddir)/libicera-utils.la
 
 # Cinterion (previously Siemens) modem
-
 libmm_plugin_cinterion_la_SOURCES = \
 	mm-plugin-cinterion.c \
 	mm-plugin-cinterion.h \
 	mm-modem-cinterion-gsm.c \
 	mm-modem-cinterion-gsm.h
+libmm_plugin_cinterion_la_CPPFLAGS = $(PLUGIN_COMMON_COMPILER_FLAGS)
+libmm_plugin_cinterion_la_LDFLAGS = $(PLUGIN_COMMON_LINKER_FLAGS)
 
-libmm_plugin_cinterion_la_CPPFLAGS = \
-	$(MM_CFLAGS) \
-	$(GUDEV_CFLAGS) \
-	-I$(top_srcdir) \
-	-I$(top_srcdir)/src \
-	-I$(top_srcdir)/include
-
-libmm_plugin_cinterion_la_LDFLAGS = \
-	$(GUDEV_LDFLAGS) \
-	-module \
-	-avoid-version
 
 # Iridium satellite modem