On Thu, Jul 07, 2011 at 02:48:56AM -0500, Jonathan Nieder wrote:
>
> By the way, is the pungetc() call needed? I tried to provoke
> misbehavior using here documents and reading from the terminal but
> didn't manage to come up with a relevant scenario.
It's probably not needed. I didn't touch it in order to minimise
the changes.
> mksyntax #include-s parser.h, so after a "make clean":
>
> gcc -include ../config.h -DBSD=1 -DSHELL -DIFS_BROKEN -g -Os -Wall -o
> mksyntax mksyntax.c
> In file included from mksyntax.c:43:0:
> parser.h:37:19: fatal error: token.h: No such file or directory
>
> The following (on top) fixes it here.
Oops, does this patch fix it?
diff --git a/src/Makefile.am b/src/Makefile.am
index 05ed70a..a552087 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -12,7 +12,8 @@ AM_CFLAGS_FOR_BUILD = -g -O2 $(COMMON_CFLAGS)
AM_CPPFLAGS_FOR_BUILD = $(COMMON_CPPFLAGS)
COMPILE_FOR_BUILD = \
- $(CC_FOR_BUILD) $(AM_CPPFLAGS_FOR_BUILD) $(CPPFLAGS_FOR_BUILD) \
+ $(CC_FOR_BUILD) $(DEFAULT_INCLUDES) $(AM_CPPFLAGS_FOR_BUILD) \
+ $(CPPFLAGS_FOR_BUILD) \
$(AM_CFLAGS_FOR_BUILD) $(CFLAGS_FOR_BUILD)
bin_PROGRAMS = dash
@@ -31,12 +32,12 @@ dash_SOURCES = \
show.h system.h trap.h var.h
dash_LDADD = builtins.o init.o nodes.o signames.o syntax.o
-HELPERS = mkinit mksyntax mknodes mksignames
+HELPERS = mkinit mknodes mksignames
BUILT_SOURCES = builtins.h nodes.h syntax.h token.h token_vars.h
CLEANFILES = \
$(BUILT_SOURCES) $(patsubst %.o,%.c,$(dash_LDADD)) \
- $(HELPERS) builtins.def
+ $(HELPERS) mksyntax builtins.def
man_MANS = dash.1
EXTRA_DIST = \
@@ -65,5 +66,8 @@ syntax.c syntax.h: mksyntax
signames.c: mksignames
./$^
+mksyntax: mksyntax.c token.h
+ $(COMPILE_FOR_BUILD) -o $@ $<
+
$(HELPERS): %: %.c
$(COMPILE_FOR_BUILD) -o $@ $<
Thanks,
--
Email: Herbert Xu <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
--
To unsubscribe from this list: send the line "unsubscribe dash" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
