MyFavMirrors
/
owntone-server
mirror of https://github.com/owntone/owntone-server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[config] Min automake 1.11, support silent rules on automake < 1.13

This commit is contained in:
Scott Shambarger 2017-02-16 10:44:00 -08:00
parent 26c22144fc
commit c7855e7c55
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -7,7 +7,9 @@ AC_CONFIG_SRCDIR([config.h.in])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_HEADERS([config.h]) AC_CONFIG_HEADERS([config.h])
AM_INIT_AUTOMAKE([foreign subdir-objects]) AM_INIT_AUTOMAKE([foreign subdir-objects 1.11])
AM_SILENT_RULES([no])
dnl Requires autoconf 2.60 dnl Requires autoconf 2.60
AC_USE_SYSTEM_EXTENSIONS AC_USE_SYSTEM_EXTENSIONS

8
src/Makefile.am
View File

@ -139,10 +139,14 @@ EXTRA_DIST = \
%_hash.h: %.gperf %_hash.h: %.gperf
$(AM_V_GEN)$(GPERF) --output-file=$@ $< $(AM_V_GEN)$(GPERF) --output-file=$@ $<
# silent rules for antlr
antlr_verbose = $(antlr_verbose_@AM_V@)
antlr_verbose_ = $(antlr_verbose_@AM_DEFAULT_V@)
antlr_verbose_0 = @echo " GEN " $< "products";
# ANTLR grammar products # ANTLR grammar products
%.tokens %.c %Lexer.c %Parser.c %Lexer.h %Parser.h %.h: %.g %.tokens %.c %Lexer.c %Parser.c %Lexer.h %Parser.h %.h: %.g
@$(AM_V_P) || echo " GEN " $< "products" $(antlr_verbose)$(ANTLR) -Xconversiontimeout 30000 $(ANTLR_OPTIONS) -fo . $<
$(AM_V_at)$(ANTLR) -Xconversiontimeout 30000 $(ANTLR_OPTIONS) -fo . $<
# ANTLR dependency files (bypass circular dependency of .g on .tokens) # ANTLR dependency files (bypass circular dependency of .g on .tokens)
%.u: %.g %.u: %.g