From 1853982561f87a729024577156def20433035946 Mon Sep 17 00:00:00 2001 From: Akim Demaille Date: Tue, 28 Mar 2000 13:30:57 +0000 Subject: [PATCH] * lib/: New directory. * Makefile.am (SUBDIRS): Adjust. * configure.in: Adjust. (LIBOBJS): Although not used yet, AC_SUBST it, otherwise it's useless. * src/alloca.c: Moved to lib/. * src/getopt.c: Likewise. * src/getopt1.c: Likewise. * src/getopt.h: Likewise. * src/ansi2knr.c: Likewise. * src/ansi2knr.1: Likewise. * src/Makefile.am: Adjust. * lib/Makefile.am: New file. --- ChangeLog | 16 ++++++++++++++++ Makefile.am | 2 +- configure.in | 3 ++- lib/Makefile.am | 14 ++++++++++++++ {src => lib}/alloca.c | 0 {src => lib}/getopt.c | 0 {src => lib}/getopt.h | 0 {src => lib}/getopt1.c | 0 po/POTFILES.in | 4 ++-- src/Makefile.am | 9 ++++----- 10 files changed, 39 insertions(+), 9 deletions(-) create mode 100644 lib/Makefile.am rename {src => lib}/alloca.c (100%) rename {src => lib}/getopt.c (100%) rename {src => lib}/getopt.h (100%) rename {src => lib}/getopt1.c (100%) diff --git a/ChangeLog b/ChangeLog index fec7f60e..555795ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2000-03-28 Akim Demaille + + * lib/: New directory. + * Makefile.am (SUBDIRS): Adjust. + * configure.in: Adjust. + (LIBOBJS): Although not used yet, AC_SUBST it, otherwise it's + useless. + * src/alloca.c: Moved to lib/. + * src/getopt.c: Likewise. + * src/getopt1.c: Likewise. + * src/getopt.h: Likewise. + * src/ansi2knr.c: Likewise. + * src/ansi2knr.1: Likewise. + * src/Makefile.am: Adjust. + * lib/Makefile.am: New file. + 2000-03-28 Akim Demaille * src/getargs.c (usage): Refresh the help message. diff --git a/Makefile.am b/Makefile.am index a0e1531d..93f09260 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,7 +3,7 @@ AUTOMAKE_OPTIONS = 1.4 check-news ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = intl po src doc m4 +SUBDIRS = intl po lib src doc m4 EXTRA_DIST = REFERENCES configure.bat OChangeLog diff --git a/configure.in b/configure.in index e3fddff0..d26f29d0 100644 --- a/configure.in +++ b/configure.in @@ -40,7 +40,8 @@ AM_GNU_GETTEXT # This is necessary so that .o files in LIBOBJS are also built via # the ANSI2KNR-filtering rules. LIBOBJS=`echo $LIBOBJS|sed 's/\.o /\$U.o /g;s/\.o$/\$U.o/'` +AC_SUBST(LIBOBJS) AC_OUTPUT([Makefile intl/Makefile po/Makefile.in - src/Makefile doc/Makefile m4/Makefile]) + lib/Makefile src/Makefile doc/Makefile m4/Makefile]) diff --git a/lib/Makefile.am b/lib/Makefile.am new file mode 100644 index 00000000..e56419a5 --- /dev/null +++ b/lib/Makefile.am @@ -0,0 +1,14 @@ +## Process this file with automake to produce Makefile.in -*-Makefile-*- + +AUTOMAKE_OPTIONS = ansi2knr + +noinst_LIBRARIES = libbison.a + +INCLUDES = -I.. -I$(srcdir) -I../intl + +libbison_a_SOURCES = getopt.c getopt1.c + +libbison_a_LIBADD = @LIBOBJS@ @ALLOCA@ +libbison_a_DEPENDENCIES = $(libbison_a_LIBADD) + +noinst_HEADERS = getopt.h diff --git a/src/alloca.c b/lib/alloca.c similarity index 100% rename from src/alloca.c rename to lib/alloca.c diff --git a/src/getopt.c b/lib/getopt.c similarity index 100% rename from src/getopt.c rename to lib/getopt.c diff --git a/src/getopt.h b/lib/getopt.h similarity index 100% rename from src/getopt.h rename to lib/getopt.h diff --git a/src/getopt1.c b/lib/getopt1.c similarity index 100% rename from src/getopt1.c rename to lib/getopt1.c diff --git a/po/POTFILES.in b/po/POTFILES.in index 9ced0e68..7b8872ef 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,5 +17,5 @@ src/reduce.c # src/symtab.c # src/warshall.c -src/getopt.c -src/getopt1.c +lib/getopt.c +lib/getopt1.c diff --git a/src/Makefile.am b/src/Makefile.am index f325b72a..e4fede47 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,24 +1,23 @@ ## Process this file with automake to produce Makefile.in -*-Makefile-*- -AUTOMAKE_OPTIONS = 1.4 ansi2knr +AUTOMAKE_OPTIONS = 1.4 ../lib/ansi2knr bin_PROGRAMS = bison bison_SOURCES = LR0.c allocate.c closure.c conflicts.c derives.c \ files.c getargs.c gram.c lalr.c lex.c main.c nullable.c output.c \ - print.c reader.c reduce.c symtab.c warshall.c getopt.c getopt1.c + print.c reader.c reduce.c symtab.c warshall.c EXTRA_bison_SOURCES = vmsgetargs.c -bison_LDADD = @INTLLIBS@ @ALLOCA@ - DEFS = @DEFS@ \ -DXPFILE=\"${datadir}/bison.simple\" \ -DXPFILE1=\"${datadir}/bison.hairy\" \ -DLOCALEDIR=\"${datadir}/locale\" INCLUDES = -I../intl -I$(top_srcdir)/intl -I.. +LDADD = @INTLLIBS@ ../lib/libbison.a noinst_HEADERS = alloc.h files.h gram.h lex.h machine.h state.h \ - symtab.h system.h types.h getopt.h + symtab.h system.h types.h data_DATA = bison.simple bison.hairy -- 2.50.0