X-Git-Url: https://git.saurik.com/bison.git/blobdiff_plain/613f5e1a895b0742c9b6c5e9461e4cf3f7389d7e..500bbfcd816776d0ddbf3555fedd41b529c405b3:/lib/Makefile.am?ds=sidebyside

diff --git a/lib/Makefile.am b/lib/Makefile.am
index d867394a..15e7ef65 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -15,18 +15,13 @@
 ## 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
 
-# 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)/intl \
            -I$(top_srcdir)/lib
 
 # Heck, we are still using an old version of Automake which does not
@@ -35,25 +30,30 @@ INCLUDES = -I$(top_builddir)/intl \
 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 \
+  mbswidth.h mbswidth.c \
   quote.h quote.c quotearg.h quotearg.c \
+  subpipe.h subpipe.c unlocked-io.h \
   xalloc.h xmalloc.c xstrdup.c xstrndup.c \
-  readpipe.c
+  $(bitsets_sources) $(additional_bitsets_sources) $(timevars_sources)
 
 # Implementation of bitsets
-libbison_a_SOURCES += \
+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.
-libbison_a_SOURCES += \
+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)