Browse Source

Change parser generation again as the previous fix broke building with some non-gnu make utils.

According to the automake faq this is only "hiding errors" and we should be able to do better,
but i don't see how (and their examples don't work with -jX).
For a clean solution we need to compile lemon for the build host, not the target.


git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2298 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.4.20
Stefan Bühler 13 years ago
parent
commit
5ab6fa6fd2
  1. 2
      Makefile.am
  2. 17
      src/Makefile.am

2
Makefile.am

@ -1,3 +1,5 @@
SUBDIRS=src doc tests cygwin openwrt
EXTRA_DIST=autogen.sh SConstruct
distcleancheck_listfiles = find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'

17
src/Makefile.am

@ -3,7 +3,7 @@ AM_CFLAGS = $(FAM_CFLAGS)
noinst_PROGRAMS=proc_open lemon # simple-fcgi #graphic evalo bench ajp ssl error_test adserver gen-license
sbin_PROGRAMS=lighttpd lighttpd-angel
bin_PROGRAMS=spawn-fcgi
LEMON=$(top_builddir)/src/lemon
LEMON=$(top_builddir)/src/lemon$(EXEEXT)
lemon_SOURCES=lemon.c
@ -15,17 +15,26 @@ lighttpd_angel_SOURCES=lighttpd-angel.c
if CROSS_COMPILING
configparser.c configparser.h:
mod_ssi_exprparser.c mod_ssi_exprparser.h:
.PHONY: parsers
parsers:
else
configparser.c configparser.h: $(srcdir)/configparser.y $(srcdir)/lempar.c | lemon
configparser.h: configparser.c
configparser.c: $(srcdir)/configparser.y $(srcdir)/lempar.c lemon$(EXEEXT)
rm -f configparser.h
$(LEMON) -q $(srcdir)/configparser.y $(srcdir)/lempar.c
mod_ssi_exprparser.c mod_ssi_exprparser.h: $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c | lemon
mod_ssi_exprparser.h: mod_ssi_exprparser.c
mod_ssi_exprparser.c: $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c lemon$(EXEEXT)
rm -f mod_ssi_exprparser.h
$(LEMON) -q $(srcdir)/mod_ssi_exprparser.y $(srcdir)/lempar.c
.PHONY: parsers
parsers: configparser.c mod_ssi_exprparser.c
endif
BUILT_SOURCES = configparser.c configparser.h mod_ssi_exprparser.c mod_ssi_exprparser.h
BUILT_SOURCES = parsers
MAINTAINERCLEANFILES = configparser.c configparser.h mod_ssi_exprparser.c mod_ssi_exprparser.h
common_src=buffer.c log.c \
keyvalue.c chunk.c \

Loading…
Cancel
Save