* data/bison.c++: Merge the two generated headers. Insert a copyright

[bison.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 3940b269f39a6d5d27f55e25f87b4ea93703c702..03b3b53ba8f26c070af7f0cec803b7da8187e6d7 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright 2001 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002 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
@@ -18,8 +18,7 @@
 AUTOMAKE_OPTIONS = ../lib/ansi2knr
 
 DEFS = @DEFS@ \
-  -DBISON_SIMPLE=\"$(pkgdatadir)/bison.simple\" \
-  -DBISON_HAIRY=\"$(pkgdatadir)/bison.hairy\" \
+  -DPKGDATADIR=\"$(pkgdatadir)\" \
   -DLOCALEDIR=\"$(datadir)/locale\"
 
 CFLAGS = @CFLAGS@ $(WARNING_CFLAGS) $(WERROR_CFLAGS)
@@ -45,9 +44,9 @@ bison_SOURCES = LR0.c closure.c complain.c conflicts.c        \
     muscle_tab.h muscle_tab.c \
     options.h options.c \
     print.c reader.c reduce.c symtab.c warshall.c vcg.c \
-    skeleton.h parse-skel.h parse-skel.y scan-skel.l
+    scan-skel.l
 
-BUILT_SOURCES = parse-skel.c scan-skel.c
+BUILT_SOURCES = scan-skel.c
 
 EXTRA_bison_SOURCES = vmsgetargs.c
 
@@ -57,6 +56,4 @@ noinst_HEADERS = LR0.h closure.h complain.h conflicts.h \
  print.h reader.h reduce.h symtab.h warshall.h system.h \
  types.h vcg.h vcg_defaults.h
 
-pkgdata_DATA = bison.simple bison.hairy bison.c++
-
-EXTRA_DIST = $(pkgdata_DATA) build.com bison.cld vmshlp.mar
+EXTRA_DIST = build.com bison.cld vmshlp.mar