Hapless User Hint for gperf

From-SVN: r29207

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f878d5af144e7482db4139d56c2d48cbced89ef1..9aef07df0d46eaf0238cdc58f50c3e8107a4f7b4 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+1999-09-08  Bruce Korb  autogen@linuxbox.com
+
+       * gcc/ch/Makefile.in: Give the hapless gperf user a hint about
+       why "gperf -F" fails.
+       * gcc/cp/Makefile.in: ditto
+       * gcc/Makefile.in: ditto
+       * gcc/java/Makefile.in: ditto
+
 Wed Sep  8 04:43:22 1999  Richard Henderson  <rth@cygnus.com>
 
        * lists.c: Include ggc.h.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 6ce461c4f08671ed9c11f06ec582abd8f236acfe..bc31b3d5b1997aa09c42f534f1c2d60aade53542 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1337,7 +1337,10 @@ $(srcdir)/c-parse.y: c-parse.in
 
 $(srcdir)/c-gperf.h: c-parse.gperf
        gperf -L C -F ', 0, 0' -p -j1 -i 1 -g -o -t -G -N is_reserved_word \
-          -k1,3,$$ $(srcdir)/c-parse.gperf >tmp-gperf.h
+          -k1,3,$$ $(srcdir)/c-parse.gperf >tmp-gperf.h || ( \
+       echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+       echo "  ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+       exit 1 )
         $(srcdir)/move-if-change tmp-gperf.h $(srcdir)/c-gperf.h
 
 c-decl.o : c-decl.c $(CONFIG_H) system.h $(TREE_H) c-tree.h c-common.h ggc.h \
@@ -2194,7 +2197,7 @@ stmp-fixinc: fixinc.sh gsyslimits.h
          if [ -d $(libdir)/gcc-lib/$(target_alias) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target_alias) ; fi; \
          if [ -d $(libdir)/gcc-lib/$(target_alias)/$(version) ] ; then true ; else mkdir $(libdir)/gcc-lib/$(target_alias)/$(version) ; fi; \
        else true; fi
-
+       exit 1
        touch stmp-fixinc
 
 # Files related to the fixproto script.

diff --git a/gcc/ch/Makefile.in b/gcc/ch/Makefile.in
index b3779646a1aa394755829efa49af52cceaa7f868..3ff898da512f75539ef8bc989df825317676f36c 100644 (file)
--- a/gcc/ch/Makefile.in
+++ b/gcc/ch/Makefile.in
@@ -254,7 +254,10 @@ $(srcdir)/hash.h:
        sed -f sed.tmp < gperf.tmp > gperf.tmp2
        cat $(srcdir)/gperf gperf.tmp2 > gperf.tmp
        gperf -L C -F ', 0, 0, 0' -D -E -S1 -p -j1 -i 1 -g -o -t -k'*' \
-         gperf.tmp > $(srcdir)/hash.h
+         gperf.tmp > $(srcdir)/hash.h || ( \
+       echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+       echo "  ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+       exit 1 )
        $(RM) gperf.tmp gperf.tmp2 sed.tmp
 
 actions.o : actions.c $(CONFIG_H) $(CHILL_TREE_H) actions.h $(RTL_H)   \

diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in
index 621567b59d008ca611bd94ac4c800b3eda4852f5..7a35d53bcea88e2634e9e36e211c1935176a70eb 100644 (file)
--- a/gcc/cp/Makefile.in
+++ b/gcc/cp/Makefile.in
@@ -234,7 +234,10 @@ $(PARSE_C) : $(srcdir)/parse.y
 # so we should be consistent.
 $(srcdir)/hash.h: $(srcdir)/gxx.gperf
        gperf -L C -F ', 0, 0' -p -j1 -g -o -t -N is_reserved_word \
-               '-k1,4,7,$$' $(srcdir)/gxx.gperf >$(srcdir)/hash.h
+               '-k1,4,7,$$' $(srcdir)/gxx.gperf >$(srcdir)/hash.h || ( \
+       echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+       echo "  ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+       exit 1 )
 
 spew.o : spew.c $(CONFIG_H) $(CXX_TREE_H) $(PARSE_H) $(srcdir)/../flags.h \
   lex.h $(srcdir)/../system.h $(srcdir)/../toplev.h

diff --git a/gcc/java/Makefile.in b/gcc/java/Makefile.in
index fe1c51fe67d6d11a0b0ed427e4cc9f0e6e1e57fb..07e3c23e0878ce2ab03be5d91873b27d05cb8b2b 100644 (file)
--- a/gcc/java/Makefile.in
+++ b/gcc/java/Makefile.in
@@ -233,7 +233,10 @@ lang.o: $(srcdir)/java-tree.def
 
 keyword.h: keyword.gperf
        gperf -L C -F ', 0' -p -t -j1 -i 1 -g -o -N java_keyword -k1,3,$$ \
-       keyword.gperf > keyword.h
+       keyword.gperf > keyword.h || ( \
+       echo "Please update your 'gperf' from the GCC infrastructure" >&2 ; \
+       echo "  ftp://sourceware.cygnus.com/pub/egcs/infrastructure/gperf*" >&2 ; \
+       exit 1 )
 
 jcf-path.o : jcf-path.c $(CONFIG_H) $(srcdir)/../system.h jcf.h
        $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \