[Automatic update for 2017-01-29]

[metze/wireshark/wip.git] / Makefile.am.inc

diff --git a/Makefile.am.inc b/Makefile.am.inc
index 5b171aaf9616e014b0c12e203c24b4139ce2f14e..c19ed626154599dd8990d2ea337e18cf9b25fd58 100644 (file)
--- a/Makefile.am.inc
+++ b/Makefile.am.inc
@@ -22,26 +22,24 @@
 AUTOMAKE_OPTIONS = -Wno-portability
 
 lemon_srcdir = $(top_srcdir)/tools/lemon
-
-LEMON = $(top_builddir)/tools/lemon/lemon$(EXEEXT)
+lemon_builddir = $(top_builddir)/tools/lemon
+LEMON = $(lemon_builddir)/lemon$(EXEEXT)
+$(LEMON):
+       cd $(lemon_builddir) && $(MAKE)
 
 RUNLEX = $(top_srcdir)/tools/runlex.sh
 
-AM_CPPFLAGS = $(WS_CPPFLAGS) -I$(top_srcdir) -DTOP_SRCDIR=\"$(abs_top_srcdir)\"
+INCLUDEDIRS = -I$(top_srcdir)
 
-AM_CFLAGS = $(WS_CFLAGS)
+#AM_CPPFLAGS = $(INCLUDEDIRS) $(WS_CPPFLAGS)
 
-if HAVE_WARNINGS_AS_ERRORS
-AM_CFLAGS += -Werror
-endif
+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)
 
@@ -65,18 +63,28 @@ AM_V_SED = $(am__v_SED_@AM_V@)
 am__v_SED_ = $(am__v_SED_@AM_DEFAULT_V@)
 am__v_SED_0 = @echo "  SED     " $@;
 
+AM_V_LN_S = $(am__v_LN_S_@AM_V@)
+am__v_LN_S_ = $(am__v_LN_S_@AM_DEFAULT_V@)
+am__v_LN_S_0 = @echo "  LN_S    " $@;
+
+# _PYTHON is a reserved automake keyword
+AM_V_python = $(am__v_python_@AM_V@)
+am__v_python_ = $(am__v_python_@AM_DEFAULT_V@)
+am__v_python_0 = @echo "  PYTHON  " $@;
+
+AM_V_YACC = $(am__v_YACC_@AM_V@)
+am__v_YACC_ = $(am__v_YACC_@AM_DEFAULT_V@)
+am__v_YACC_0 = @echo "  YACC    " $@;
+
 .l.c:
        $(AM_V_RUNLEX)$(RUNLEX) "$(LEX)" "$(SED)" -o$@ $<
 
-.def.sym:
-       $(AM_V_AWK)$(AWK) '/^EXPORTS$$/ {next;}; ${def_sym_filter_symbols} /^[^;]/ { print $$1;}' < $< > $@
-
 # 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_incdirs = $(subst -I,NEWLINE,$(filter -I%,$(AM_CPPFLAGS) -I$(abs_top_srcdir) -I$(abs_srcdir)))
+abi_sysdirs = $(subst -isystem,NEWLINE,$(filter -isystem%,$(AM_CPPFLAGS)))
+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|' $< > $@