(_AT_TEST_GLR_CXXTYPES): Do not include <assert.h>.

[bison.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d86551030c29130876713f569fe98b92d9a262aa..15e7ef6586298f48a448cefb9771a102acec559b 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,18 +15,13 @@
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 
 ## Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 ## 02111-1307  USA
 

-AUTOMAKE_OPTIONS = ansi2knr
-
-CFLAGS = @CFLAGS@ $(WARNING_CFLAGS)
+AM_CFLAGS = $(WARNING_CFLAGS)

 
 noinst_LIBRARIES = libbison.a
 
 
 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)      \
+# config.h is in build/., and system.h is in src/src/.
+INCLUDES = -I$(top_builddir)      \

            -I$(top_srcdir)/src \
            -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
            -I$(top_srcdir)/lib
 
 # Heck, we are still using an old version of Automake which does not


@@ -39,15 +34,26 @@ libbison_a_SOURCES = \
   basename.c dirname.h dirname.c \
   getopt.h getopt.c getopt1.c \
   hash.h hash.c \
   basename.c dirname.h dirname.c \
   getopt.h getopt.c getopt1.c \
   hash.h hash.c \

+  mbswidth.h mbswidth.c \

   quote.h quote.c quotearg.h quotearg.c \
   quote.h quote.c quotearg.h quotearg.c \

+  subpipe.h subpipe.c unlocked-io.h \

   xalloc.h xmalloc.c xstrdup.c xstrndup.c \
   xalloc.h xmalloc.c xstrdup.c xstrndup.c \

-  readpipe.c
+  $(bitsets_sources) $(additional_bitsets_sources) $(timevars_sources)

 
 # Implementation of bitsets
 
 # Implementation of bitsets

-libbison_a_SOURCES += \
-       bbitset.h \
-       bitset-int.h bitset.h bitsetv.h ebitset.h lbitset.h sbitset.h \
-       bitset.c bitsetv.c ebitset.c lbitset.c sbitset.c
+bitsets_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
+
+# Additional bitset operations.
+additional_bitsets_sources = \
+       bitsetv-print.h bitsetv-print.c
+
+# timevars, stolen from GCC.
+timevars_sources = \
+       timevar.h timevar.c timevar.def

 
 libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
 
 libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@
 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)