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 /Makefile.am.inc | |
| 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 'Makefile.am.inc')
| -rw-r--r-- | Makefile.am.inc | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/Makefile.am.inc b/Makefile.am.inc index 5f5d10125a..531b2307a3 100644 --- a/Makefile.am.inc +++ b/Makefile.am.inc @@ -27,21 +27,23 @@ LEMON = $(top_builddir)/tools/lemon/lemon$(EXEEXT) RUNLEX = $(top_srcdir)/tools/runlex.sh -AM_CPPFLAGS = $(WS_CPPFLAGS) -I$(top_srcdir) - -AM_CFLAGS = $(WS_CFLAGS) - if HAVE_WARNINGS_AS_ERRORS -AM_CFLAGS += -Werror +WERROR = -Werror +else +WERROR = endif +INCLUDEDIRS = -I$(top_srcdir) + +#AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS) + +AM_CFLAGS = $(WERROR) $(WS_CFLAGS) + GENERATED_CFLAGS = $(WS_CFLAGS) -AM_CXXFLAGS = $(WS_CXXFLAGS) +AM_CXXFLAGS = $(WERROR) $(WS_CXXFLAGS) -if HAVE_WARNINGS_AS_ERRORS -AM_CXXFLAGS += -Werror -endif +GENERATED_CXXFLAGS = $(WS_CXXFLAGS) AM_LDFLAGS = $(WS_LDFLAGS) @@ -83,9 +85,9 @@ am__v_YACC_0 = @echo " YACC " $@; # abi-compliance-checker descriptor abi_incdirs = $(subst -I,NEWLINE,$(filter -I%,$(WS_CFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir))) abi_sysdirs = $(subst -isystem,NEWLINE,$(filter -isystem%,$(WS_CFLAGS))) -INCLUDE_DIRS = $(abi_incdirs) $(abi_sysdirs) +abi_includes = $(abi_incdirs) $(abi_sysdirs) abi-descriptor.xml: ../abi-descriptor.template $(AM_V_SED)$(SED) \ - -e 's|@INCLUDE_DIRS@|$(INCLUDE_DIRS)|g' \ + -e 's|@INCLUDE_DIRS@|$(abi_includes)|g' \ -e 's/ *NEWLINE/\n /g' \ -e 's|@LIBRARY_OUTPUT_PATH@|{RELPATH}/.libs|' $< > $@ |