diff options
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | configure.in | 10 | ||||
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | libidu/Makefile.am | 4 |
4 files changed, 13 insertions, 10 deletions
@@ -1,5 +1,8 @@ 1998-11-18 Greg McGary <gkm@gnu.org> + * configure.in, lib/Makefile.am, libidu/Makefile.am: + Conform macro names to automake-1.3 conventions. + * libidu/scanners.c (id_0): Increase size and make file static. Tue Aug 6 22:46:16 1996 Greg McGary <gkm@g2> diff --git a/configure.in b/configure.in index 5120e15..5f2f219 100644 --- a/configure.in +++ b/configure.in @@ -10,7 +10,7 @@ dnl they are there to delimit sections in the output configure script. ############################################################################## AC_INIT(src/mkid.c) -AC_CONFIG_HEADER(config.h) +AM_CONFIG_HEADER(config.h) AC_PREREQ(2.10) AC_ARG_PROGRAM @@ -19,7 +19,7 @@ AC_ARG_PROGRAM ############################################################################## PACKAGE=id-utils -VERSION=3.2 +VERSION=3.2a PACKAGE_VERSION="GNU $PACKAGE $VERSION" AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") @@ -86,7 +86,7 @@ AM_C_PROTOTYPES AC_TYPE_SIGNAL AC_TYPE_OFF_T AC_TYPE_SIZE_T -md_TYPE_PTRDIFF_T +AM_TYPE_PTRDIFF_T ############################################################################## ################ Set default compilation flags ############################### @@ -102,7 +102,7 @@ AC_SUBST(LDFLAGS) ############################################################################## AC_FUNC_ALLOCA -ud_WITH_REGEX +AM_WITH_REGEX AC_FUNC_VPRINTF AC_CHECK_FUNCS(getwd getcwd link strerror isascii bcopy bzero memcpy) AC_REPLACE_FUNCS(strdup strndup strspn strcspn strpbrk strstr strtok) @@ -134,7 +134,7 @@ AC_SUBST(LANGUAGE_MAP_FILE) ################ Find a home for Emacs Lisp code ############################# ############################################################################## -ud_PATH_LISPDIR +AM_PATH_LISPDIR ############################################################################## ################ Generate the configure script ############################### diff --git a/lib/Makefile.am b/lib/Makefile.am index 4d67679..886002e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,13 +1,13 @@ ## Process this file with automake to create Makefile.in -noinst_LIBRARIES = sys +noinst_LIBRARIES = libsys.a EXTRA_DIST = alloca.c basename.c dirname.c error.c fnmatch.c getopt.c \ getopt1.c memcpy.c memset.c obstack.c regex.c rx.c \ strcasecmp.c strcspn.c strdup.c strndup.c strpbrk.c strspn.c \ strstr.c strtok.c -sys_SOURCES = xgetcwd.c xmalloc.c +libsys_a_SOURCES = xgetcwd.c xmalloc.c noinst_HEADERS = ansidecl.h error.h fnmatch.h getopt.h obstack.h \ pathmax.h regex.h rx.h xalloca.h xdirent.h xfnmatch.h \ @@ -19,4 +19,4 @@ INCLUDES = -I. -I$(srcdir) \ -I../intl -I$(top_srcdir)/intl \ -I.. -I$(top_srcdir) DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -sys_LIBADD = @REGEXOBJ@ @LIBOBJS@ @ALLOCA@ +libsys_a_LIBADD = @REGEXOBJ@ @LIBOBJS@ @ALLOCA@ diff --git a/libidu/Makefile.am b/libidu/Makefile.am index 5fde198..4e94492 100644 --- a/libidu/Makefile.am +++ b/libidu/Makefile.am @@ -2,9 +2,9 @@ AUTOMAKE_OPTIONS = ansi2knr -noinst_LIBRARIES = idu +noinst_LIBRARIES = libidu.a -idu_SOURCES = dynvec.c hash.c idfile.c idread.c idwrite.c fnprint.c \ +libidu_a_SOURCES = dynvec.c hash.c idfile.c idread.c idwrite.c fnprint.c \ scanners.c walker.c idudir = $(prefix)/share |