X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/0305d25eb08b0128d759cc70370524f48bb47290..838205d547498edd52c599e8755a233bb695e831:/src/local.mk?ds=inline diff --git a/src/local.mk b/src/local.mk index d54d5286..753172b0 100644 --- a/src/local.mk +++ b/src/local.mk @@ -1,5 +1,5 @@ -## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software -## Foundation, Inc. +## Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 +## Free Software Foundation, Inc. ## This program is free software: you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -16,26 +16,32 @@ AUTOMAKE_OPTIONS = subdir-objects -AM_CPPFLAGS = -I$(top_srcdir)/lib +AM_CPPFLAGS += -I$(top_srcdir)/lib # Find builddir/src/scan-code.c etc. AM_CPPFLAGS += -I$(top_builddir) -AM_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) - -LDADD = $(top_builddir)/lib/libbison.a $(LIBINTL) +LDADD = lib/libbison.a $(LIBINTL) # Use our own Bison to build the parser. Of course, you ought to # keep a sane version of Bison nearby... -YACC = $(top_builddir)/tests/bison -y +BISON = tests/bison +YACC = $(BISON) -y AM_YFLAGS = -dv --warnings=all,error --report=all bin_PROGRAMS = src/bison bin_SCRIPTS = $(YACC_SCRIPT) EXTRA_SCRIPTS = src/yacc +src_bison_CFLAGS = $(AM_CFLAGS) $(WERROR_CFLAGS) src_bison_SOURCES = \ + src/AnnotationList.c \ + src/AnnotationList.h \ + src/InadequacyList.c \ + src/InadequacyList.h \ src/LR0.c \ src/LR0.h \ + src/Sbitset.c \ + src/Sbitset.h \ src/assoc.c \ src/assoc.h \ src/closure.c \ @@ -57,11 +63,15 @@ src_bison_SOURCES = \ src/graphviz.h \ src/lalr.c \ src/lalr.h \ + src/ielr.c \ + src/ielr.h \ src/location.c \ src/location.h \ src/main.c \ - src/muscle_tab.c \ - src/muscle_tab.h \ + src/muscle-tab.c \ + src/muscle-tab.h \ + src/named-ref.c \ + src/named-ref.h \ src/nullable.c \ src/nullable.h \ src/output.c \ @@ -110,7 +120,7 @@ BUILT_SOURCES += \ src/scan-gram.c \ src/scan-skel.c -MOSTLYCLEANFILES = src/yacc +MOSTLYCLEANFILES += src/yacc src/yacc: rm -f $@ $@.tmp @@ -118,37 +128,3 @@ src/yacc: echo "exec '$(bindir)/bison' -y "'"$$@"' >>$@.tmp chmod a+x $@.tmp mv $@.tmp $@ - -echo: - echo $(src_bison_SOURCES) $(noinst_HEADERS) - -# The following rule is not designed to be portable, -# and relies on tools that not everyone has. - -# Most functions in src/*.c should have static scope. -# Any that don't must be marked with `extern', but `main' -# and `usage' are exceptions. They're always extern, but -# don't need to be marked. -# -# The second nm|grep checks for file-scope variables with `extern' scope. -sc_tight_scope: $(all_programs) - @t=exceptions-$$$$; \ - trap 's=$$?; rm -f $$t; exit $$s' 0 1 2 13 15; \ - ( printf '^main$$\n^usage$$\n'; \ - grep -h -A1 '^extern .*[^;]$$' $(SOURCES) \ - | grep -vE '^(extern |--)' |sed 's/^/^/;s/ .*/$$/' ) > $$t; \ - if nm -e *.$(OBJEXT) \ - | sed -n 's/.* T //p' \ - | grep -Ev -f $$t; then \ - echo 'the above functions should have static scope' 1>&2; \ - exit 1; \ - fi; \ - ( printf '^program_name$$\n'; \ - sed -n 's/^extern .*[* ]\([a-zA-Z_][a-zA-Z_0-9]*\);$$/^\1$$/p' \ - $$(ls $(SOURCES) | grep '\.h$$') /dev/null) > $$t; \ - if nm -e *.$(OBJEXT) \ - | sed -n 's/.* [BD] //p' \ - | grep -Ev -f $$t; then \ - echo 'the above variables should have static scope' 1>&2; \ - exit 1; \ - fi