* src/Makefile.am, lib/Makefile.am: Use $(VAR) instead of @VAR@.

[bison.git] / lib / Makefile.am

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 321094b4769833677aa2c26a94d9a691930266c5..28eba327f1c2e3ffd0a6666284e83a5564effc2e 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright 2001, 2002 Free Software Foundation, Inc.
+## Copyright (C) 2001, 2002, 2003 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
 
 ## 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


@@ -15,31 +15,50 @@
 ## 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)

 
 

+lib_LIBRARIES = $(YACC_LIBRARY)
+EXTRA_LIBRARIES = liby.a

 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
 
            -I$(top_srcdir)/lib
 

-# Heck, we are still using an old version of Automake which does not
-# understand LIBOBJ additions using $objext...
+liby_a_SOURCES = main.c yyerror.c

 
 

-EXTRA_DIST = malloc.c realloc.c
+# 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 = \
 
 libbison_a_SOURCES = \

+  gettext.h \

   basename.c dirname.h dirname.c \
   basename.c dirname.h dirname.c \

+  get-errno.h get-errno.c \

   getopt.h getopt.c getopt1.c \
   hash.h hash.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 \

-  xalloc.h xmalloc.c xstrdup.c xstrndup.c
+  subpipe.h subpipe.c unlocked-io.h \
+  xalloc.h xmalloc.c xstrdup.c xstrndup.c \
+  $(bitsets_sources) $(additional_bitsets_sources) $(timevars_sources)
+
+# Implementation of bitsets
+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_LIBADD = $(LIBOBJS) $(ALLOCA)

 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)
 libbison_a_DEPENDENCIES = $(libbison_a_LIBADD)