Regenerate for:

	* demos/calc/Makefile.am: Add calcread.c, calc-common.h, use $(YACC),
	$(LEX) and $(LEXLIB).

1 files changed, 17 insertions, 8 deletions

diff --git a/demos/calc/Makefile.in b/demos/calc/Makefile.in
index 863e66c6a..54e973421 100644
--- a/demos/calc/Makefile.in
+++ b/demos/calc/Makefile.in
@@ -132,11 +132,14 @@ mpn_objs_in_libmp = @mpn_objs_in_libmp@
 AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr
 
 INCLUDES = -I$(top_srcdir)
-LDADD = $(top_builddir)/libgmp.la
+
+# $(LEXLIB) seems to be unnecessary when using flex, but put it here for the
+# benefit of anyone rebuilding using a standard lex.
+LDADD = $(top_builddir)/libgmp.la $(LIBREADLINE) $(LEXLIB)
 
 EXTRA_DIST = calc.y calclex.l
 EXTRA_PROGRAMS = calc
-calc_SOURCES = calc.c calclex.c calc.h
+calc_SOURCES = calc.c calclex.c calcread.c calc.h calc-common.h
 
 CLEANFILES = $(EXTRA_PROGRAMS)
 subdir = demos/calc
@@ -145,7 +148,8 @@ CONFIG_HEADER = $(top_builddir)/config.h calc-config.h \
 	$(top_builddir)/demos/expr/expr-config.h
 CONFIG_CLEAN_FILES =
 EXTRA_PROGRAMS = calc$(EXEEXT)
-am_calc_OBJECTS = calc$U.$(OBJEXT) calclex$U.$(OBJEXT)
+am_calc_OBJECTS = calc$U.$(OBJEXT) calclex$U.$(OBJEXT) \
+	calcread$U.$(OBJEXT)
 calc_OBJECTS = $(am_calc_OBJECTS)
 calc_LDADD = $(LDADD)
 calc_DEPENDENCIES = $(top_builddir)/libgmp.la
@@ -245,7 +249,10 @@ calc_.c: calc.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calc.c; then echo $(srcdir)/calc.c; else echo calc.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calc_.c || rm -f calc_.c
 calclex_.c: calclex.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calclex.c; then echo $(srcdir)/calclex.c; else echo calclex.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calclex_.c || rm -f calclex_.c
-calc_.$(OBJEXT) calc_.lo calclex_.$(OBJEXT) calclex_.lo : $(ANSI2KNR)
+calcread_.c: calcread.c $(ANSI2KNR)
+	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/calcread.c; then echo $(srcdir)/calcread.c; else echo calcread.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > calcread_.c || rm -f calcread_.c
+calc_.$(OBJEXT) calc_.lo calclex_.$(OBJEXT) calclex_.lo \
+calcread_.$(OBJEXT) calcread_.lo : $(ANSI2KNR)
 uninstall-info-am:
 
 tags: TAGS
@@ -391,8 +398,10 @@ allprogs: $(EXTRA_PROGRAMS)
 # Using "cd"s instead of a $(srcdir) path ensures $(srcdir) doesn't get into
 # the "#line"s in the generated files.
 #
-# FIXME: Automake yacc handling isn't quite right when building in a
-# separate object directory, hence the explicit rules used for now.
+# FIXME: Automake knows about .y and .l, but as of version 1.5 doesn't do
+# the right thing when building in a separate object directory, hence the
+# explicit rules.  Not sure if these rules cover all the portability
+# problems that automake does.
 #
 # FIXME: With ansi2knr and no-dependencies, there doesn't seem any easy way
 # to manually express that calclex$U.lo depends on calc.h.  Making calclex.c
@@ -400,9 +409,9 @@ allprogs: $(EXTRA_PROGRAMS)
 # unnecessary.
 
 $(srcdir)/calclex.c: calclex.l calc.h
-	cd $(srcdir); lex -ocalclex.c calclex.l
+	cd $(srcdir); $(LEX) -ocalclex.c calclex.l
 $(srcdir)/calc.c $(srcdir)/calc.h: calc.y
-	cd $(srcdir); yacc -d -ocalc.c calc.y
+	cd $(srcdir); $(YACC) -d -ocalc.c calc.y
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: