tests: portability fixes.

[bison.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d2b8350db9b17666fb2b54c0272e7874d8f482da..1abfb75354538089104e03b3e87f6fa1537b3a8f 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,63 +1,55 @@
-## 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
-## the Free Software Foundation; either version 2 of the License, or
-## (at your option) any later version.
-
-## This program is distributed in the hope that it will be useful,
-## but WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-## GNU General Public License for more details.
-
-## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-## 02111-1307  USA
-
-AUTOMAKE_OPTIONS = ansi2knr
-
-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
-
-noinst_LIBRARIES = libbison.a
-
-# libintl.h in is build/intl, libgettext.h in src/intl/,
-# config.h in build/., and system.h is in src/src/.
-INCLUDES = -I$(top_builddir)/intl \
-           -I$(top_builddir)      \
-           -I$(top_srcdir)/src \
-           -I$(top_srcdir)/intl \
-           -I$(top_srcdir)/lib
-
-# Heck, we are still using an old version of Automake which does not
-# understand inner AC_LIBOBJ (i.e., from Autoconf itself, not from
-# configure.in).
-EXTRA_DIST = malloc.c realloc.c strnlen.c
-
-libbison_a_SOURCES = \
-  argmatch.h argmatch.c \
-  gettext.h \
-  basename.c dirname.h dirname.c \
-  getopt.h getopt.c getopt1.c \
-  hash.h hash.c \
-  quote.h quote.c quotearg.h quotearg.c \
-  xalloc.h xmalloc.c xstrdup.c xstrndup.c \
-  readpipe.c
-
-# Implementation of bitsets
-libbison_a_SOURCES += \
-libiberty.h \
-abitset.c  bitset.c        bitset_stats.h  ebitset.c  lbitset.h \
-abitset.h  bitset.h        bitsetv.c       ebitset.h \
-bbitset.h  bitset_stats.c  bitsetv.h       lbitset.c
+# Make bison/lib.
+
+# Copyright (C) 2001-2004, 2006, 2008-2012 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
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+AM_CFLAGS =
+AM_CPPFLAGS =
+BUILT_SOURCES =
+CLEANFILES =
+EXTRA_DIST =
+MOSTLYCLEANDIRS =
+MOSTLYCLEANFILES =
+SUFFIXES =
+noinst_LIBRARIES =
+
+include gnulib.mk
+
+AM_CFLAGS += $(WARN_CFLAGS)
+
+# Implementation of bitsets.
+bitsets_sources = \
+  abitset.c abitset.h bbitset.h bitset.c bitset.h bitset_stats.c       \
+  bitset_stats.h bitsetv.c bitsetv.h ebitset.c ebitset.h lbitset.c     \
+  lbitset.h libiberty.h vbitset.c vbitset.h

 
 # Additional bitset operations.
 
 # Additional bitset operations.

-libbison_a_SOURCES += \
-       bitsetv-print.h bitsetv-print.c
+additional_bitsets_sources = \
+  bitsetv-print.h bitsetv-print.c

 
 # timevars, stolen from GCC.
 
 # timevars, stolen from GCC.

+timevars_sources = \
+  timevar.h timevar.c timevar.def
+
+# Non-gnulib sources in Bison's internal library.

 libbison_a_SOURCES += \
 libbison_a_SOURCES += \

-       timevar.h timevar.c timevar.def
+  get-errno.h get-errno.c \
+  $(bitsets_sources) $(additional_bitsets_sources) $(timevars_sources)

 
 

-libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
-libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
+# The Yacc compatibility library.
+lib_LIBRARIES = $(YACC_LIBRARY)
+EXTRA_LIBRARIES = liby.a
+liby_a_SOURCES = main.c yyerror.c