diff options
author | João Valverde <joao.valverde@tecnico.ulisboa.pt> | 2016-02-19 08:20:35 +0000 |
---|---|---|
committer | João Valverde <j@v6e.pt> | 2016-02-21 07:51:55 +0000 |
commit | f0fb79d534c4276d30838bb25fc624e3eabce83c (patch) | |
tree | 7996dc2491e63b2d7e8d737543976cc3a00ff644 /plugins | |
parent | 8b46cbbceb51f86ccc2efb487cf66024b9174ab4 (diff) |
autotools: Use pkg-config autoconf macros for GLib/GTK
Remove mostly obsolete aclocal macros. Make GTK build flags a strict superset
of GLib flags. Use GTK build variables for GTK GUI and GLib elsewhere. Add
dependency flags explicitly instead of using WS_CPPFLAGS.
Some minor improvements and fixes for missing/unnecessary variables (no impact
on our test builds).
Change-Id: I3e1f067a875f79d6516c1fa7af986f17a7a6b671
Reviewed-on: https://code.wireshark.org/review/14005
Reviewed-by: João Valverde <j@v6e.pt>
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/Makefile.am.inc | 4 | ||||
-rw-r--r-- | plugins/docsis/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/ethercat/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/gryphon/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/irda/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/m2m/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/mate/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/opcua/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/profinet/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/stats_tree/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/tpg/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/unistim/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/wimax/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/wimaxasncp/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/wimaxmacphy/Makefile.am | 4 |
15 files changed, 58 insertions, 2 deletions
diff --git a/plugins/Makefile.am.inc b/plugins/Makefile.am.inc index 7513ca7912..8423121e05 100644 --- a/plugins/Makefile.am.inc +++ b/plugins/Makefile.am.inc @@ -22,6 +22,10 @@ LIBS = @PLUGIN_LIBS@ +PLUGIN_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) $(GLIB_CFLAGS) + +PLUGIN_CFLAGS = + PLUGIN_LDFLAGS = -module -avoid-version # diff --git a/plugins/docsis/Makefile.am b/plugins/docsis/Makefile.am index 39708d6c2d..53dae04c73 100644 --- a/plugins/docsis/Makefile.am +++ b/plugins/docsis/Makefile.am @@ -32,6 +32,10 @@ docsis_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +docsis_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +docsis_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + docsis_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/ethercat/Makefile.am b/plugins/ethercat/Makefile.am index 427773e6ba..e0986faef5 100644 --- a/plugins/ethercat/Makefile.am +++ b/plugins/ethercat/Makefile.am @@ -32,6 +32,10 @@ ethercat_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +ethercat_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +ethercat_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + ethercat_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/gryphon/Makefile.am b/plugins/gryphon/Makefile.am index 41e57a6871..87ef9b9ba3 100644 --- a/plugins/gryphon/Makefile.am +++ b/plugins/gryphon/Makefile.am @@ -34,6 +34,10 @@ gryphon_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +gryphon_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +gryphon_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + gryphon_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/irda/Makefile.am b/plugins/irda/Makefile.am index a9a7d62189..bfd3a19ff4 100644 --- a/plugins/irda/Makefile.am +++ b/plugins/irda/Makefile.am @@ -32,6 +32,10 @@ irda_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +irda_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +irda_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + irda_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/m2m/Makefile.am b/plugins/m2m/Makefile.am index e60b5f41f4..9299675484 100644 --- a/plugins/m2m/Makefile.am +++ b/plugins/m2m/Makefile.am @@ -32,6 +32,10 @@ m2m_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +m2m_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +m2m_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + m2m_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/mate/Makefile.am b/plugins/mate/Makefile.am index 634a9b4b94..fe1cc4d6ad 100644 --- a/plugins/mate/Makefile.am +++ b/plugins/mate/Makefile.am @@ -43,7 +43,9 @@ nodist_mate_la_SOURCES = \ $(NODIST_SRC_FILES) \ $(NODIST_HEADER_FILES) -mate_la_CFLAGS = $(GENERATED_CFLAGS) +mate_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +mate_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) mate_la_LDFLAGS = $(PLUGIN_LDFLAGS) diff --git a/plugins/opcua/Makefile.am b/plugins/opcua/Makefile.am index 97358600d9..619d3bfaa0 100644 --- a/plugins/opcua/Makefile.am +++ b/plugins/opcua/Makefile.am @@ -33,6 +33,10 @@ opcua_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +opcua_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +opcua_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + opcua_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/profinet/Makefile.am b/plugins/profinet/Makefile.am index e15192daff..90f78ae9a4 100644 --- a/plugins/profinet/Makefile.am +++ b/plugins/profinet/Makefile.am @@ -32,6 +32,10 @@ profinet_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +profinet_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +profinet_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + profinet_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/stats_tree/Makefile.am b/plugins/stats_tree/Makefile.am index 065a2964e2..07c9ffa049 100644 --- a/plugins/stats_tree/Makefile.am +++ b/plugins/stats_tree/Makefile.am @@ -30,6 +30,10 @@ stats_tree_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +stats_tree_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +stats_tree_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + stats_tree_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/tpg/Makefile.am b/plugins/tpg/Makefile.am index e45f8c880e..c8d1220cda 100644 --- a/plugins/tpg/Makefile.am +++ b/plugins/tpg/Makefile.am @@ -32,6 +32,10 @@ tpg_la_SOURCES = \ http-parser.h \ packet-http.c +tpg_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +tpg_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + tpg_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/unistim/Makefile.am b/plugins/unistim/Makefile.am index 10b576bf0f..635846b83a 100644 --- a/plugins/unistim/Makefile.am +++ b/plugins/unistim/Makefile.am @@ -33,6 +33,10 @@ unistim_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +unistim_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +unistim_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + unistim_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/wimax/Makefile.am b/plugins/wimax/Makefile.am index 7dea8a681f..a270766439 100644 --- a/plugins/wimax/Makefile.am +++ b/plugins/wimax/Makefile.am @@ -32,6 +32,10 @@ wimax_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +wimax_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +wimax_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + wimax_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ diff --git a/plugins/wimaxasncp/Makefile.am b/plugins/wimaxasncp/Makefile.am index 6f3d00c492..e4f4cd7f2f 100644 --- a/plugins/wimaxasncp/Makefile.am +++ b/plugins/wimaxasncp/Makefile.am @@ -39,7 +39,9 @@ wimaxasncp_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) -wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) +wimaxasncp_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +wimaxasncp_la_CFLAGS = $(GENERATED_CFLAGS) $(PLUGIN_CFLAGS) wimaxasncp_la_LDFLAGS = $(PLUGIN_LDFLAGS) diff --git a/plugins/wimaxmacphy/Makefile.am b/plugins/wimaxmacphy/Makefile.am index b6c89efbdc..9033b90213 100644 --- a/plugins/wimaxmacphy/Makefile.am +++ b/plugins/wimaxmacphy/Makefile.am @@ -32,6 +32,10 @@ wimaxmacphy_la_SOURCES = \ $(SRC_FILES) \ $(HEADER_FILES) +wimaxmacphy_la_CPPFLAGS = $(AM_CPPFLAGS) $(PLUGIN_CPPFLAGS) + +wimaxmacphy_la_CFLAGS = $(AM_CFLAGS) $(PLUGIN_CFLAGS) + wimaxmacphy_la_LDFLAGS = $(PLUGIN_LDFLAGS) CLEANFILES = \ |