osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

make-dissectors: Remove dependency on GNU Make >= 4.0 

The $(file ...) function is only available since version 4.0.

Until something breaks or someone complains use the shell to
write dissectors.c.in.

Change-Id: Icfe260004ca04d825c370bb642fcdc4b4be8516f
Reviewed-on: https://code.wireshark.org/review/24532
Reviewed-by: João Valverde <j@v6e.pt>
This commit is contained in:
João Valverde 2017-11-22 09:45:03 +00:00 committed by João Valverde
parent 2f2c2b06e2
commit 871f75ce85
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -138,14 +138,9 @@ AC_PROG_MKDIR_P
#
# Check for GNU Make
#
have_gnu_make=no
AX_CHECK_GNU_MAKE([have_gnu_make=maybe])
if test "x$have_gnu_make" = xmaybe; then
AX_COMPARE_VERSION([$ax_check_gnu_make_version], [ge], [4.0],
[have_gnu_make=yes])
fi
AX_CHECK_GNU_MAKE([have_gnu_make=yes])
if test "x$have_gnu_make" != xyes; then
AC_MSG_WARN([GNU Make >= 4.0 not found; building Wireshark without it will probably fail])
AC_MSG_WARN([GNU Make not found; building Wireshark without it will probably fail])
fi
AC_PATH_PROG(PERL, perl)

6
epan/dissectors/Makefile.am
View File

@ -1939,9 +1939,9 @@ x11-dissector: $(top_srcdir)/tools/process-x11-fields.pl $(srcdir)/x11-fields $(
#
dissectors.c: make-dissectors $(ALL_DISSECTORS_SRC)
@echo Making dissectors.c
$(file >$@.in,$(filter %.c,$^))
$(builddir)/make-dissectors @$@.in > $@
@rm $@.in
@echo $(filter %.c,$^) > $@.in ; \
$(builddir)/make-dissectors @$@.in > $@ ; \
rm $@.in
DISTCLEANFILES = \
$(NODIST_GENERATED_FILES)