noinst_LIBRARIES = libbison.a
-INCLUDES = -I.. -I$(srcdir) -I../intl
+INCLUDES = -I.. -I$(srcdir) -I$(top_srcdir)/src -I../intl
-libbison_a_SOURCES = getopt.c getopt1.c
-noinst_HEADERS = getopt.h
+# Heck, we are still using an old version of Automake which does not
+# understand LIBOBJ additions using $objext...
-libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
+EXTRA_DIST = malloc.c realloc.c
+
+libbison_a_SOURCES = \
+ error.c error.h \
+ getopt.h getopt.c getopt1.c \
+ hash.h hash.c \
+ obstack.h obstack.c \
+ quote.h quote.c quotearg.h quotearg.c \
+ xalloc.h xmalloc.c xstrdup.c
+
+libbison_a_LIBADD = @LIBOBJS@
libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)