[evlog-dev] PATCH: using autoconf/automake for evlog
"Zou, Yixiong" <[email protected]> Mon, 27 Jan 2003 09:25:58 -0800
| Newsgroups | gmane.linux.kernel.event-logging |
|---|---|
| Message-ID | <[email protected]> |
Hi everyone, I am very happy to see this mailing list become active again. :) I finally made the patch for autoconf/automake. The patch is diffed against the latest CVS code. It's about 40k. So quite big in size. Use "diffstat" to see all the changes. Here's how to use it: 1) apply the patch. For example: patch -p1 < ../autoconf.patch 2) chmod +x autogen.sh 3) mkdir config 4) ./autogen.sh 5) ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc 7) DESTDIR=/tmp/xx make install This would install everything using /tmp/xx as prefix. You can then compare this and the old Makefile install. You have to have autoconf version 2.53 because the autoconf script is written using the latest macro syntax. It is not compatible with the old autoconf 2.13 any more. RedHat 8.0 by default has all the right package. Otherwise you have to update. Tested it on my RedHat 8.0 box. But certainly not other platforms. I tried my best to make all the make targets work. You can even do a "make distcheck" that will generate a distribution tar ball. The only thing I know of is the man pages are not compressed because otherwise automake don't handle them well. But I don't think it is much of a deal to leave them uncompressed. I also made a "bootstrap" scripts. But haven't really tested it. It could be very useful though. :) It is likely that there will be few glitches. And it will be a pain to integrate everything. But once it's done, I am sure the benefit outweigh all the trouble. Let me know if you have any problem. Thank you. ------------------------------------------------------------------------ Yixiong Zou ([email protected]) (503) 677-4988 All views expressed in this email are those of the individual sender.
autoconf.patch
(application/octet-stream, 42.7 KB)
diff -ruN evlog-current/autogen.sh evlog/autogen.sh
--- evlog-current/autogen.sh 1969-12-31 16:00:00.000000000 -0800
+++ evlog/autogen.sh 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,39 @@
+#! /bin/sh
+#
+# Run all the stuff we need to generate the configure and Makefile.in
+# in the automake process.
+#
+# The order needs to be that. If autoheader does not run after
+# autoconf, it doesn't get all the symbols right. As automake requires
+# config.h.in, created by autoheader, it needs to run after it.
+#
+# $Id: aaaa,v 1.1.1.1 2002/09/18 17:24:54 yzou Exp $
+
+
+set -ex
+
+aclocal
+autoheader
+# Set GNU strictness
+
+libtoolize --automake --force
+automake --foreign --add-missing --force-missing --include-deps
+
+autoconf
+
+# $Log: aaaa,v $
+# Revision 1.1.1.1 2002/09/18 17:24:54 yzou
+# initial importing for evlog subagent.
+#
+# Revision 1.1 2002/03/08 19:48:11 yzou
+# adding new files. changing some directory structure.
+#
+# Revision 1.1 2002/02/26 02:23:25 yzou
+# converting the package to use automake.
+#
+# Revision 1.3.2.1 2001/11/14 23:53:17 inaky
+# Fix the invocation order.
+#
+# Revision 1.3 2001/11/10 02:48:03 inaky
+# Removed old logs, now CVS keywords ain't expanded
+#
diff -ruN evlog-current/bootstrap evlog/bootstrap
--- evlog-current/bootstrap 1969-12-31 16:00:00.000000000 -0800
+++ evlog/bootstrap 2003-01-26 20:36:53.000000000 -0800
@@ -0,0 +1,41 @@
+#! /bin/bash
+#
+# bootstrap script taken and modified from linux-ha project.
+# http://www.linux-ha.org
+#
+
+ConfigureLinux() {
+ DFLAGS=""
+ if
+ [ -f /etc/debian-version -a -s /etc/UnitedLinux-release ]
+ then
+ distro=Debian
+ DFLAGS="--with-initdir=/etc/init.d"
+ elif
+ [ -f /etc/SuSE-release -a -s /etc/SuSE-release ]
+ then
+ distro=SuSE
+ DFLAGS="--with-initdir=/etc/init.d"
+ elif
+ [ -f /etc/redhat-release -a -s /etc/redhat-release ]
+ then
+ distro=RedHat
+ DFLAGS="--with-initdir=/etc/init.d"
+ else
+ distro="Generic"
+ fi
+ CFENV="$distro Linux"
+ FLAGS="--prefix=/usr --sysconfdir=/etc --localstatedir=/var $DFLAGS"
+}
+
+Run() {
+ echo "Running $@"
+ "$@"
+}
+
+
+ConfigureLinux
+echo ""
+echo "Configure flags for $CFENV: $FLAGS"
+
+Run ./configure $FLAGS $@
diff -ruN evlog-current/configure.ac evlog/configure.ac
--- evlog-current/configure.ac 1969-12-31 16:00:00.000000000 -0800
+++ evlog/configure.ac 2003-01-26 20:36:04.000000000 -0800
@@ -0,0 +1,201 @@
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.53)
+
+# Update version number.
+AC_INIT([Enterprise Event Logging], [1.5.0], [[email protected]],
+ [evlog])
+
+AC_CONFIG_SRCDIR([user/include/evlog.h])
+AC_CONFIG_AUX_DIR(config)
+
+AM_INIT_AUTOMAKE
+AM_CONFIG_HEADER([config.h])
+
+# Checks for programs.
+AC_PROG_CXX
+AC_PROG_AWK
+AC_PROG_CC
+AM_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+AC_PROG_MAKE_SET
+AC_PROG_YACC
+AC_PROG_CPP
+AC_PROG_LIBTOOL
+
+# FIXME: Replace `main' with a function in `-ldl':
+AC_CHECK_LIB([dl], [dlopen])
+# FIXME: Replace `main' with a function in `-lnsl':
+AC_CHECK_LIB([nsl], [yp_bind])
+# FIXME: Replace `main' with a function in `-lpthread':
+AC_CHECK_LIB([pthread], [pthread_join])
+# FIXME: Replace `main' with a function in `-lz':
+AC_CHECK_LIB([z], [compress])
+
+# Checks for header files.
+AC_HEADER_DIRENT
+AC_HEADER_STDC
+AC_HEADER_SYS_WAIT
+AC_CHECK_HEADERS([fcntl.h limits.h locale.h malloc.h netdb.h netinet/in.h paths.h stddef.h stdint.h stdlib.h string.h strings.h sys/file.h sys/param.h sys/socket.h sys/time.h syslog.h unistd.h values.h wchar.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_C_CONST
+AC_TYPE_UID_T
+AC_C_INLINE
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIZE_T
+AC_CHECK_MEMBERS([struct stat.st_blksize])
+AC_STRUCT_ST_BLOCKS
+AC_CHECK_MEMBERS([struct stat.st_rdev])
+AC_HEADER_TIME
+AC_STRUCT_TM
+AC_CHECK_TYPES([ptrdiff_t])
+
+# Checks for library functions.
+AC_FUNC_FORK
+AC_FUNC_GETPGRP
+AC_FUNC_MALLOC
+AC_FUNC_MEMCMP
+AC_FUNC_MMAP
+AC_FUNC_SETPGRP
+AC_TYPE_SIGNAL
+AC_FUNC_STAT
+AC_FUNC_STRFTIME
+AC_FUNC_VPRINTF
+AC_CHECK_FUNCS([atexit bzero clock_gettime endgrent fdatasync ftruncate gethostname gettimeofday localtime_r memmove memset mkdir munmap putenv regcomp select setlocale socket strcasecmp strchr strcspn strdup strerror strncasecmp strrchr strspn strstr strtol strtoul sysinfo tzset])
+
+# Check the system header files directory
+KERN_HEADER_INCLUDEDIR="/usr/include/linux"
+AC_ARG_WITH(kernel-header-include,
+ [ --with-kernel-header-include=DIR directroy for kernel header files. [[default=/usr/include/linux]]],
+ [ KERN_HEADER_INCLUDEDIR="$withval" ])
+if
+ test "X$KERN_HEADER_INCLUDEDIR" = X
+then
+ AC_MSG_ERROR(Could not locate kernel header directory)
+fi
+AC_SUBST(KERN_HEADER_INCLUDEDIR)
+
+# Check the evlog configuration directory
+EVLOG_CONF_DIR="${sysconfdir}/evlog.d"
+AC_SUBST(EVLOG_CONF_DIR)
+
+# Check the system cron job directory
+CRONDIR="/etc/cron.d"
+AC_ARG_WITH(cron-dir,
+ [ --with-cron-dir=DIR directroy for system cron job files. [[default=/etc/cron.d]]],
+ [ CRONDIR="$withval" ])
+if
+ test "X$CRONDIR" = X
+then
+ AC_MSG_ERROR(Could not locate system cron job directory)
+fi
+AC_SUBST(CRONDIR)
+
+# Check the init (rc) scripts directory
+AC_MSG_CHECKING(which init (rc) directory to use)
+INITDOTD_DIR=""
+for initdir in /etc/init.d /etc/rc.d/init.d /sbin/init.d \
+ /usr/local/etc/rc.d /etc/rc.d
+do
+ if
+ test -d $initdir
+ then
+ INITDOTD_DIR=$initdir
+ AC_MSG_RESULT($INITDOTD_DIR);
+ break
+ fi
+done
+AC_ARG_WITH(initdir,
+ [ --with-initdir=DIR directroy for init (rc) scripts [[${INITDOTD_DIR}]]],
+ [ if test x"$withval" = xprefix; then INITDOTD_DIR=${prefix}; else
+ INITDOTD_DIR="$withval"; fi ])
+if
+ test "X$INITDOTD_DIR" = X
+then
+ AC_MSG_ERROR(Could not locate init directory)
+fi
+AC_SUBST(INITDOTD_DIR)
+
+# Check kernel version
+KERN_VERSION="v2.5.33"
+AC_ARG_WITH([kernel-version],
+ [ --with-kernel-version=KERN_VERSION kernel version to build evlog to.
+ [[${KERN_VERSION}]]],
+ [ KERN_VERSION="$withval" ])
+if
+ test "X$KERN_VERSION" = X
+then
+ AC_MSG_ERROR(No kernel version is given.)
+fi
+AC_SUBST(KERN_VERSION)
+
+# Check kernel header location
+KERNEL_HEADER_DIR="/usr/src/linux"
+
+AC_CONFIG_FILES([Makefile \
+ user/Makefile \
+ user/include/Makefile \
+ user/sysfiles/Makefile \
+ user/sysfiles/etc/Makefile \
+ user/sysfiles/etc/init.d/Makefile \
+ user/man/Makefile \
+ user/lib/Makefile \
+ user/lib/query/Makefile \
+ user/lib/template/Makefile \
+ user/lib/util/Makefile \
+ user/lib/test/Makefile \
+ user/lib/test/facreg/Makefile \
+ user/lib/test/bitfields/Makefile \
+ user/libevlsyslog/Makefile \
+ user/cmd/Makefile \
+ user/cmd/evlactiond/Makefile \
+ user/cmd/evlconfig/Makefile \
+ user/cmd/evlfacility/Makefile \
+ user/cmd/evlfacility/test/Makefile \
+ user/cmd/evlgentmpls/Makefile \
+ user/cmd/evlnotify/Makefile \
+ user/cmd/evlnotify/test/Makefile \
+ user/cmd/evlnotifyd/Makefile \
+ user/cmd/evlnotifyd/test/Makefile \
+ user/cmd/evlogd/Makefile \
+ user/cmd/evlogd/test/Makefile \
+ user/cmd/evlogmgr/Makefile \
+ user/cmd/evlogmgr/test/Makefile \
+ user/cmd/evlsend/Makefile \
+ user/cmd/evltc/Makefile \
+ user/cmd/evlview/Makefile ])
+
+AC_OUTPUT
+
+dnl *****************
+dnl Configure summary
+dnl *****************
+
+eval my_datadir="`eval echo ${datadir}`"
+eval my_includedir="`eval echo ${includedir}`"
+eval my_sysinclude_prefix="${sysinclude_prefix}"
+eval my_initdir="${INITDOTD_DIR}"
+eval my_libdir="`eval echo ${libdir}`"
+eval my_localstatedir="`eval echo ${localstatedir}`"
+eval my_mandir="`eval echo ${mandir}`"
+eval my_sbindir="`eval echo ${sbindir}`"
+eval my_sysconfdir="`eval echo ${sysconfdir}`"
+
+AC_MSG_RESULT([])
+AC_MSG_RESULT([$PACKAGE configuration:])
+AC_MSG_RESULT([ Version = $VERSION])
+AC_MSG_RESULT([ Kernel Version = $KERN_VERSION])
+AC_MSG_RESULT([ Kernel header directory = $KERN_HEADER_INCLUDEDIR])
+AC_MSG_RESULT([ evlog configuration directory = $EVLOG_CONF_DIR])
+AC_MSG_RESULT([ System Executables = $my_sbindir])
+AC_MSG_RESULT([ Man pages = $my_mandir])
+AC_MSG_RESULT([ Libraries = $my_libdir])
+AC_MSG_RESULT([ Header files = $my_includedir])
+AC_MSG_RESULT([ Data files = $my_datadir])
+AC_MSG_RESULT([ State information = $my_localstatedir])
+AC_MSG_RESULT([ System configuration = $my_sysconfdir])
+AC_MSG_RESULT([ Init (rc) scripts = $my_initdir])
+
diff -ruN evlog-current/Makefile.am evlog/Makefile.am
--- evlog-current/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES += config.h spec stamp-h
+MAINTAINERCLEANFILES += aclocal.m4 config.h.in configure stamp-h.in \
+ config.h stamp-h
+MOSTLYCLEANFILES +=
+
+EVL_LOG_H = $(top_srcdir)/kernel/@KERN_VERSION@/include/linux/evl_log.h
+kernel_header_includedir = @KERN_HEADER_INCLUDEDIR@
+kernel_header_include_HEADERS = $(EVL_LOG_H)
+
+EXTRA_DIST += Makefile.vars Makefile.rules COPYING
+
+# bins or src products may be required to generate stuff in etc and or
+# doc. Stuff in bin, intl and lib may be required to generate stuff in
+# the rest (so, this is a possible dependency order).
+SUBDIRS = user
+
+distcleancheck:
+ @:
diff -ruN evlog-current/Makefile.rules evlog/Makefile.rules
--- evlog-current/Makefile.rules 1969-12-31 16:00:00.000000000 -0800
+++ evlog/Makefile.rules 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,44 @@
+## -*-makefile-*-
+
+## SKEL v$Revision: 1.1.1.1 $: Common rules to all the makefiles
+## ----
+##
+## $Id: Makefile.rules,v 1.1.1.1 2002/09/18 17:24:54 yzou Exp $
+##
+## LONG DESCRIPTION HERE. EXPLAIN WHAT THIS FILE DOES OR IS USED
+## FOR. DON'T BE AFRAID TO USE TOO MUCH WORDING. HOWEVER,
+## SPECIFICATIONS SHOULD BE AT SKEL/doc.
+##
+## Full changelog at file bottom.
+##
+## (C) YEAR by AUTHOR <EMAIL>
+## [: THINGS DONE BY AUTHOR]
+
+## type: deep, strictness: gnu
+
+# Generate pre-parsed CC code.
+%.i: %.cc
+ $(COMPILE) -E -c $^ -o $@
+
+.PRECIOUS: %.ii
+%.cci: %.ii
+ -grep -v -e "^#" -e "^ *$$" $^ | indent > $@
+ mv -f $@ $^
+
+
+## FIXME: Your stuff here
+
+
+## $Log: Makefile.rules,v $
+## Revision 1.1.1.1 2002/09/18 17:24:54 yzou
+## initial importing for evlog subagent.
+##
+## Revision 1.1 2002/03/08 19:48:11 yzou
+## adding new files. changing some directory structure.
+##
+## Revision 1.1 2002/02/26 02:23:25 yzou
+## converting the package to use automake.
+##
+## Revision 1.2 2001/11/10 02:48:03 inaky
+## Removed old logs, now CVS keywords ain't expanded
+##
diff -ruN evlog-current/Makefile.vars evlog/Makefile.vars
--- evlog-current/Makefile.vars 1969-12-31 16:00:00.000000000 -0800
+++ evlog/Makefile.vars 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,43 @@
+## -*-makefile-*-
+
+## SKEL v$Revision: 1.1.1.1 $: Compilation wide variables
+## ----
+##
+## $Id: Makefile.vars,v 1.1.1.1 2002/09/18 17:24:54 yzou Exp $
+##
+## LONG DESCRIPTION HERE. EXPLAIN WHAT THIS FILE DOES OR IS USED
+## FOR. DON'T BE AFRAID TO USE TOO MUCH WORDING. HOWEVER,
+## SPECIFICATIONS SHOULD BE AT SKEL/doc.
+##
+## Full changelog at file bottom.
+##
+## (C) YEAR by AUTHOR <EMAIL>
+## [: THINGS DONE BY AUTHOR]
+
+## type: deep, strictness: gnu
+
+MAINTAINERCLEANFILES = Makefile.in
+DISTCLEANFILES = \\\#*\\\# Makefile
+MOSTLYCLEANFILES = *~ *.[aios] *.bak *.ci *.io
+
+EXTRA_DIST =
+
+## FIXME: Your stuff here
+
+
+## $Log: Makefile.vars,v $
+## Revision 1.1.1.1 2002/09/18 17:24:54 yzou
+## initial importing for evlog subagent.
+##
+## Revision 1.1 2002/03/08 19:48:11 yzou
+## adding new files. changing some directory structure.
+##
+## Revision 1.1 2002/02/26 02:23:25 yzou
+## converting the package to use automake.
+##
+## Revision 1.3 2001/11/10 03:21:11 inaky
+## Fixed little bits of the distribution
+##
+## Revision 1.2 2001/11/10 02:48:03 inaky
+## Removed old logs, now CVS keywords ain't expanded
+##
diff -ruN evlog-current/user/cmd/evlactiond/Makefile.am evlog/user/cmd/evlactiond/Makefile.am
--- evlog-current/user/cmd/evlactiond/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlactiond/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,23 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+action_conf_files := action_registry action_profile
+
+EXTRA_DIST += $(action_conf_files)
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlactiond
+evlactiond_SOURCES := evlactiond.h evlactiond.c
+evlactiond_LDADD := ../../lib/.libs/libevl.a
+
+evlaction_confdir := @EVLOG_CONF_DIR@
+evlaction_conf_DATA := $(action_conf_files)
diff -ruN evlog-current/user/cmd/evlconfig/Makefile.am evlog/user/cmd/evlconfig/Makefile.am
--- evlog-current/user/cmd/evlconfig/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlconfig/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,32 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += evlog.conf
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlconfig
+evlconfig_SOURCES := evlconfig.c
+evlconfig_LDADD := ../../lib/.libs/libevl.a
+evlconfig_CFLAGS := $(AM_CFLAGS)
+
+evlog_confdir := @EVLOG_CONF_DIR@
+evlog_conf_DATA := evlog.conf
+
+#
+# noinst_LTLIBRARIES = libevlconfig.la
+# libevlconfig_la_SOURCES := libevlconfig.h libevlconfig.c evlconfig.c
+# libevlconfig_la_LIBADD := $(top_srcdir)/user/lib/libevl.la
+# libevlconfig_la_CFLAGS := -DLIBEVLCONFIG
+#
+# testlib_SOURCES := testlib.c
+# testlib_LDADD := $(top_srcdir)/user/cmd/evlconfig/libevlconfig.la
+#
diff -ruN evlog-current/user/cmd/evlfacility/Makefile.am evlog/user/cmd/evlfacility/Makefile.am
--- evlog-current/user/cmd/evlfacility/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlfacility/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlfacility
+evlfacility_SOURCES := evlfacility.c
+evlfacility_LDADD := ../../lib/.libs/libevl.a
+
+SUBDIRS := . test
diff -ruN evlog-current/user/cmd/evlfacility/test/Makefile.am evlog/user/cmd/evlfacility/test/Makefile.am
--- evlog-current/user/cmd/evlfacility/test/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlfacility/test/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += test.sed $(facility_test_files)
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+facility_test_files := testfac1.sh \
+ testfac2.sh \
+ testfac3.sh \
+ testfac1.tpl.out \
+ testfac2.tpl.out \
+ testfac3.tpl.out
+
+facility_testdir := $(localstatedir)/evlog/test
+facility_test_SCRIPTS := $(facility_test_files)
diff -ruN evlog-current/user/cmd/evlgentmpls/Makefile.am evlog/user/cmd/evlgentmpls/Makefile.am
--- evlog-current/user/cmd/evlgentmpls/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlgentmpls/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlgentmpls
+evlgentmpls_SOURCES := evlgentmpls.c
+evlgentmpls_LDADD := ../../lib/.libs/libevl.a -lbfd
+
diff -ruN evlog-current/user/cmd/evlnotify/Makefile.am evlog/user/cmd/evlnotify/Makefile.am
--- evlog-current/user/cmd/evlnotify/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlnotify/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,20 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlnotify
+evlnotify_SOURCES := evlnotify.c
+evlnotify_LDADD := ../../lib/.libs/libevl.a
+
+SUBDIRS := . test
diff -ruN evlog-current/user/cmd/evlnotify/test/Makefile.am evlog/user/cmd/evlnotify/test/Makefile.am
--- evlog-current/user/cmd/evlnotify/test/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlnotify/test/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,30 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += $(notify_test_files)
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+notify_test_files := runacttests.sh \
+ test1.sh \
+ test2.sh \
+ test3.sh \
+ test4.sh \
+ test5.sh \
+ test6.sh \
+ test7.sh \
+ actions7.nfy \
+ rmactions.sh \
+ actions.nfy \
+ loadactions.sh
+
+notify_testdir := $(localstatedir)/evlog/test
+notify_test_SCRIPTS := $(notify_test_files)
diff -ruN evlog-current/user/cmd/evlnotifyd/Makefile.am evlog/user/cmd/evlnotifyd/Makefile.am
--- evlog-current/user/cmd/evlnotifyd/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlnotifyd/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlnotifyd
+evlnotifyd_SOURCES := evlnotifyd.h evlnotifyd.c serialize.c
+evlnotifyd_LDADD := ../../lib/.libs/libevl.a
+
+SUBDIRS := . test
+
diff -ruN evlog-current/user/cmd/evlnotifyd/test/Makefile.am evlog/user/cmd/evlnotifyd/test/Makefile.am
--- evlog-current/user/cmd/evlnotifyd/test/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlnotifyd/test/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,29 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+noinst_PROGRAMS := testclient test testnull
+LDADD := ../../../lib/.libs/libevl.a
+
+#
+# Specify these if needed. Otherwise, let automake do all the work
+#
+#testclient_SOURCES := testclient.c
+#testclient_LDADD := $(top_srcdir)/user/lib/.libs/libevl.a
+#
+#test_SOURCES := test.c
+#test_LDADD := $(top_srcdir)/user/lib/.libs/libevl.a
+#
+#testnull_SOURCES := testnull.c
+#testnull_LDADD := $(top_srcdir)/user/lib/.libs/libevl.a
diff -ruN evlog-current/user/cmd/evlogd/Makefile.am evlog/user/cmd/evlogd/Makefile.am
--- evlog-current/user/cmd/evlogd/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlogd/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,31 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+conf_files = evlhosts evlogrmtd.conf
+
+EXTRA_DIST += $(conf_files)
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlogd evlogrmtd
+
+evlogd_SOURCES := evlogd.c backendmgr.c ksym.c ksym_mod.c ksyms.h callback.h
+evlogd_LDADD := ../../lib/.libs/libevl.a
+evlogd_CFLAGS :=
+
+evlogrmtd_SOURCES := evlogrmtd.c shared/rmt_common.c shared/rmt_common.h
+evlogrmtd_LDADD := ../../lib/.libs/libevl.a
+
+evlog_confdir := @EVLOG_CONF_DIR@
+evlog_conf_DATA := $(conf_files)
+
+SUBDIRS := . test
+
diff -ruN evlog-current/user/cmd/evlogd/test/Makefile.am evlog/user/cmd/evlogd/test/Makefile.am
--- evlog-current/user/cmd/evlogd/test/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlogd/test/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,22 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += testevlog1.out testevlog1.sh
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+logdtestdir := $(localstatedir)/evlog/test
+logdtest_PROGRAMS := testdup testdup2
+logdtest_DATA := testevlog1.out
+logdtest_SCRIPTS := testevlog1.sh
+
+LDADD := ../../../lib/.libs/libevl.a
+
diff -ruN evlog-current/user/cmd/evlogmgr/Makefile.am evlog/user/cmd/evlogmgr/Makefile.am
--- evlog-current/user/cmd/evlogmgr/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlogmgr/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += evlogmgr.cron
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlogmgr
+evlogmgr_SOURCES := evl_logmgmt.h evlogmgr.c evl_logmgmt.c
+evlogmgr_LDADD := ../../lib/.libs/libevl.a
+
+logcrondir := @CRONDIR@
+logcron_DATA := evlogmgr.cron
+
+SUBDIRS := . test
+
diff -ruN evlog-current/user/cmd/evlogmgr/test/Makefile.am evlog/user/cmd/evlogmgr/test/Makefile.am
--- evlog-current/user/cmd/evlogmgr/test/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlogmgr/test/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += logmgmt1.sh
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+logmgrtestdir := $(localstatedir)/evlog/test
+logmgrtest_SCRIPTS := logmgmt1.sh
+
+
diff -ruN evlog-current/user/cmd/evlsend/Makefile.am evlog/user/cmd/evlsend/Makefile.am
--- evlog-current/user/cmd/evlsend/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlsend/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlsend
+evlsend_SOURCES := evlsend.c
+evlsend_LDADD := ../../lib/.libs/libevl.a
+
diff -ruN evlog-current/user/cmd/evltc/Makefile.am evlog/user/cmd/evltc/Makefile.am
--- evlog-current/user/cmd/evltc/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evltc/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evltc
+evltc_SOURCES := evltc.c funcs.c
+evltc_LDADD := ../../lib/.libs/libevl.a
+
diff -ruN evlog-current/user/cmd/evlview/Makefile.am evlog/user/cmd/evlview/Makefile.am
--- evlog-current/user/cmd/evlview/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/evlview/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,19 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+sbin_PROGRAMS := evlview
+evlview_SOURCES := evlview.c specfmt.c
+evlview_LDADD := ../../lib/.libs/libevl.a
+
diff -ruN evlog-current/user/cmd/Makefile.am evlog/user/cmd/Makefile.am
--- evlog-current/user/cmd/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/cmd/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,17 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# bins or src products may be required to generate stuff in etc and or
+# doc. Stuff in bin, intl and lib may be required to generate stuff in
+# the rest (so, this is a possible dependency order).
+SUBDIRS = evlogd evlsend evlview evlconfig evlnotifyd evlactiond evlnotify \
+ evlfacility evltc evlogmgr evlgentmpls
diff -ruN evlog-current/user/include/Makefile.am evlog/user/include/Makefile.am
--- evlog-current/user/include/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/include/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,6 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+include_HEADERS = posix_evlog.h posix_evlsup.h evlog.h evl_template.h evl_list.h
+noinst_HEADERS = scanner.h evl_common.h evl_util.h
+
+
diff -ruN evlog-current/user/lib/Makefile.am evlog/user/lib/Makefile.am
--- evlog-current/user/lib/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,52 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+MOSTLYCLEANFILES +=
+
+LIBEVLEXTRAFILES = facility_registry
+
+EXTRA_DIST += $(LIBEVLEXTRAFILES)
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+# Libraries
+
+evl_sources := posix1.c posix2.c posix_evlsup.c formatrec.c facreg.c \
+ evl_log_write.c syslogat.c
+
+# LIBRARIES: static
+lib_LIBRARIES = libevl.a
+
+libevl_a_SOURCES := $(evl_sources)
+libevl_a_CFLAGS := $(AM_CFLAGS)
+
+libevl_a_LIBADD := query/libevlquery.la \
+ template/libevltemplate.la \
+ util/libevlutil.la
+
+# LTLIBRARIES is for shared+static libs
+lib_LTLIBRARIES = libevl.la
+
+libevl_la_SOURCES := $(evl_sources)
+libevl_la_LIBADD := query/libevlquery.la \
+ template/libevltemplate.la \
+ util/libevlutil.la
+
+libevl_la_LDFLAGS :=
+
+# Extra files
+libevlextradir = @EVLOG_CONF_DIR@
+libevlextra_DATA = $(LIBEVLEXTRAFILES)
+
+# bins or src products may be required to generate stuff in etc and or
+# doc. Stuff in bin, intl and lib may be required to generate stuff in
+# the rest (so, this is a possible dependency order).
+SUBDIRS = query template util . test
+
+
diff -ruN evlog-current/user/lib/query/Makefile.am evlog/user/lib/query/Makefile.am
--- evlog-current/user/lib/query/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/query/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,44 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += query.y lex
+
+MOSTLYCLEANFILES += lex.qq.c q.tab.h q.tab.c
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+lex.qq.c: lex
+ flex -Pqq $(top_srcdir)/user/lib/query/lex
+
+q.tab.h: query.y
+ yacc -dl -b q -p qq $(top_srcdir)/user/lib/query/query.y
+
+q.tab.c: q.tab.h
+
+evlquery_sources := evl_parse.h q.tab.c lex.qq.c normalize.c evaluate.c qopt.c
+
+# worry about this later
+# nodist_evlquery_sources := q.tab.c lex.qq.c
+
+## LIBRARIES: static
+#noinst_LIBRARIES = libevlquery.a
+#
+#libevlquery_a_SOURCES := $(evlquery_sources)
+#libevlquery_a_CFLAGS := $(AM_CFLAGS)
+
+# LTLIBRARIES is for shared+static libs
+noinst_LTLIBRARIES = libevlquery.la
+
+libevlquery_la_SOURCES := $(evlquery_sources)
+
+libevlquery_la_LDFLAGS :=
+
+libevlquery_la_LIBADD :=
+
+
diff -ruN evlog-current/user/lib/template/Makefile.am evlog/user/lib/template/Makefile.am
--- evlog-current/user/lib/template/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/template/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,44 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += tmpllex.l tmplgram.y
+
+MOSTLYCLEANFILES += lex.tt.c tt.tab.h tt.tab.c
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+lex.tt.c: tmpllex.l
+ flex -Ptt $(top_srcdir)/user/lib/template/tmpllex.l
+
+tt.tab.c: tt.tab.h
+
+tt.tab.h: tmplgram.y
+ yacc -dl -b tt -p tt $(top_srcdir)/user/lib/template/tmplgram.y
+
+evltemplate_sources := tt.tab.c tt.tab.h lex.tt.c serial.c serialio.inc bvfmt.c template.c tmplfmt.c tmplmgmt.c
+
+# worry about this later
+# nodist_evltemplate_sources := lex.tt.c tt.tab.c tt.tab.h
+
+## LIBRARIES: static
+#noinst_LIBRARIES = libevltemplate.a
+#
+#libevltemplate_a_SOURCES := $(evltemplate_sources)
+#libevltemplate_a_CFLAGS := $(AM_CFLAGS)
+
+# LTLIBRARIES is for shared+static libs
+noinst_LTLIBRARIES = libevltemplate.la
+
+libevltemplate_la_SOURCES := $(evltemplate_sources)
+
+libevltemplate_la_LDFLAGS :=
+
+libevltemplate_la_LIBADD :=
+
+
diff -ruN evlog-current/user/lib/test/bitfields/Makefile.am evlog/user/lib/test/bitfields/Makefile.am
--- evlog-current/user/lib/test/bitfields/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/test/bitfields/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,56 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += mktest.sh rules bftest.cpre bftest.cpost bftest.tpre bftest.tpost\
+ mkc.awk mkt.awk bftest.sh bftestSN.sh bftest.t bftestS.t \
+ bftest.out bftestSN.out
+
+MOSTLYCLEANFILES += bftest.c bftestN.c bftestU.c bftestUN.c bftestS.c bftestSN.c
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+bitfields_testdir := $(localstatedir)/evlog/test
+bitfields_test_PROGRAMS := bftest bftestSN
+bitfields_test_SCRIPTS := bftest.sh bftestSN.sh
+
+bitfields_outputdir := $(localstatedir)/evlog/test
+bitfields_output_DATA := bftest.out bftestSN.out
+
+# .out is a default Makefile target. But we don't want automake to
+# mess with our .out files. So we have to override it here.
+bftest.out bftestSN.out:
+ @:
+
+bitfields_test_templatesdir := $(localstatedir)/evlog/test/templates/user
+bitfields_test_templates_DATA := bftest.t bftestS.t
+
+noinst_PROGRAMS := bftestN bftestU bftestUN bftestS
+
+LDADD := ../../libevl.la
+
+# FIXME: This should be done at configure time.
+# These rules also create the corresponding .t files (bftest.t or bftestU.t).
+bftest.c: mktest.sh bftest.cpre bftest.cpost bftest.tpre bftest.tpost mkc.awk mkt.awk
+ ./mktest.sh
+
+bftestN.c: mktest.sh bftest.cpre bftest.cpost bftest.tpre bftest.tpost mkc.awk mkt.awk
+ ./mktest.sh -n
+
+bftestU.c: mktest.sh bftest.cpre bftest.cpost bftest.tpre bftest.tpost mkc.awk mkt.awk
+ ./mktest.sh -u
+
+bftestUN.c: mktest.sh bftest.cpre bftest.cpost bftest.tpre bftest.tpost mkc.awk mkt.awk
+ ./mktest.sh -u -n
+
+bftestS.c: mktest.sh bftest.cpre bftest.cpost bftest.tpre bftest.tpost mkc.awk mkt.awk
+ ./mktest.sh -s
+
+bftestSN.c: mktest.sh bftest.cpre bftest.cpost bftest.tpre bftest.tpost mkc.awk mkt.awk
+ ./mktest.sh -s -n
+
diff -ruN evlog-current/user/lib/test/facreg/makefile evlog/user/lib/test/facreg/makefile
--- evlog-current/user/lib/test/facreg/makefile 2001-09-20 11:27:03.000000000 -0700
+++ evlog/user/lib/test/facreg/makefile 1969-12-31 16:00:00.000000000 -0800
@@ -1,17 +0,0 @@
-DEBUG=-g
-LIBS=../../libevl.a -lfl -lpthread
-TESTS=frtest2
-UROOT=../../..
-INC=-I$(UROOT)/include
-CFLAGS=$(DEBUG) $(INC)
-
-all: $(TESTS)
-
-frtest2: frtest2.o $(LIBS)
- $(CC) $(CFLAGS) -o frtest2 frtest2.o $(LIBS)
-
-clean:
- rm -f *.o
-
-clobber: clean
- rm -f $(TESTS)
diff -ruN evlog-current/user/lib/test/facreg/Makefile.am evlog/user/lib/test/facreg/Makefile.am
--- evlog-current/user/lib/test/facreg/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/test/facreg/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+noinst_PROGRAMS := frtest2
+
+LDADD := $(top_srcdir)/user/lib/.libs/libevl.a
+
+DEPENDENCIES := $(top_srcdir)/user/lib/libevl.la
+
diff -ruN evlog-current/user/lib/test/facreg/makefile.old evlog/user/lib/test/facreg/makefile.old
--- evlog-current/user/lib/test/facreg/makefile.old 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/test/facreg/makefile.old 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,17 @@
+DEBUG=-g
+LIBS=../../libevl.a -lfl -lpthread
+TESTS=frtest2
+UROOT=../../..
+INC=-I$(UROOT)/include
+CFLAGS=$(DEBUG) $(INC)
+
+all: $(TESTS)
+
+frtest2: frtest2.o $(LIBS)
+ $(CC) $(CFLAGS) -o frtest2 frtest2.o $(LIBS)
+
+clean:
+ rm -f *.o
+
+clobber: clean
+ rm -f $(TESTS)
diff -ruN evlog-current/user/lib/test/Makefile.am evlog/user/lib/test/Makefile.am
--- evlog-current/user/lib/test/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/test/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,106 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+MOSTLYCLEANFILES +=
+
+testscripts := testevlwrite.sh \
+ testevlwrite2.sh \
+ aligntest.sh \
+ aostest.sh \
+ aosApiTest.sh \
+ defaultTest.sh \
+ degenerate.sh \
+ delimiter.sh \
+ stattest.sh \
+ tmplMiscTest.sh \
+ syslogatTest.sh \
+ runtests.sh
+
+testtemplates := evl_log_write_test2.t \
+ aligntest.t \
+ aostest.t \
+ delimiter.t \
+ degenerate.t \
+ stattest.t \
+ stat.t \
+ tmplMiscTest.t
+
+testoutputfiles := evl_log_write.out \
+ evl_log_write.ppc.out \
+ evl_log_write.s390.out \
+ evl_log_write.s390x.out \
+ evl_log_write.ia64.out \
+ evl_log_write2.out \
+ aligntest.out \
+ aostest.out \
+ aosApiTest.out \
+ defaultTest.out \
+ defaultTest.ia64.out \
+ defaultTest.ppc.out \
+ defaultTest.s390.out \
+ defaultTest.s390x.out \
+ degenerate.out \
+ delimiter.out \
+ tmplMiscTest.out \
+ syslogatTest.out
+
+# .out is a default Makefile target. But we don't want automake to
+# mess with our .out files. So we have to override it here.
+$(testoutputfiles):
+ @:
+
+EXTRA_DIST += $(testscripts) $(testtemplates) $(testoutputfiles) defaultTest.t hr.t
+
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+testsdir = $(localstatedir)/evlog/test
+
+tests_PROGRAMS := evl_log_write_test \
+ evl_log_write_test2 \
+ aligntest \
+ aostest \
+ aosApiTest \
+ defaultTest \
+ degenerate \
+ delimiter \
+ stattest \
+ tmplMiscTest \
+ syslogatTest
+
+tests_SCRIPTS := $(testscripts)
+
+testsoutputdir = $(localstatedir)/evlog/test
+testsoutput_DATA := $(testoutputfiles)
+
+tests_templatedir = $(localstatedir)/evlog/test/templates/user
+tests_template_DATA := $(testtemplates)
+
+default_templatedir = $(localstatedir)/evlog/test/templates/local7
+default_template_DATA := defaultTest.t
+
+hr_templatedir = $(localstatedir)/evlog/test/templates/hr
+hr_template_DATA := hr.t
+
+tests_template_HEADERS := statdefs.h
+
+noinst_PROGRAMS := dumpTest \
+ fmtTest \
+ fussLog \
+ attttest \
+ seektest \
+ threadTest \
+ tweakLogGen \
+ printfTest
+
+LDADD := ../.libs/libevl.a
+
+SUBDIRS := bitfields
+
+DIST_SUBDIRS := bitfields facreg
diff -ruN evlog-current/user/lib/util/Makefile.am evlog/user/lib/util/Makefile.am
--- evlog-current/user/lib/util/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/lib/util/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,36 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST +=
+
+MOSTLYCLEANFILES +=
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+evlutil_sources := scanner.c evl_list.c format.c fmtbuf.c evl_common.c
+
+# worry about this later
+# nodist_evlutil_sources := q.tab.c lex.qq.c
+
+## LIBRARIES: static
+#noinst_LIBRARIES = libevlutil.a
+#
+#libevlutil_a_SOURCES := $(evlutil_sources)
+#libevlutil_a_CFLAGS := $(AM_CFLAGS)
+
+# LTLIBRARIES is for shared+static libs
+noinst_LTLIBRARIES = libevlutil.la
+
+libevlutil_la_SOURCES := $(evlutil_sources)
+
+libevlutil_la_LDFLAGS :=
+
+libevlutil_la_LIBADD :=
+
+
diff -ruN evlog-current/user/libevlsyslog/Makefile.am evlog/user/libevlsyslog/Makefile.am
--- evlog-current/user/libevlsyslog/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/libevlsyslog/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,43 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+
+EXTRA_DIST += slog_fwd libevlsyslog.conf
+
+MOSTLYCLEANFILES +=
+
+syslog_forwarddir := $(sbindir)
+syslog_forward_SCRIPTS := slog_fwd
+
+evlsyslog_confdir := @EVLOG_CONF_DIR@
+evlsyslog_conf_DATA := libevlsyslog.conf
+
+# General compilation flags
+INCLUDES = -I$(top_srcdir)/user/include -I$(top_srcdir)/kernel/@KERN_VERSION@/include
+
+# Libraries
+evlsyslog_sources := libevlsyslog.c
+
+evlsyslogdir := /lib
+
+# LIBRARIES: static
+evlsyslog_LIBRARIES = libevlsyslog.a
+
+libevlsyslog_a_SOURCES := $(evlsyslog_sources)
+libevlsyslog_a_CFLAGS := $(AM_CFLAGS)
+
+libevlsyslog_a_LIBADD :=
+
+# LTLIBRARIES is for shared+static libs
+evlsyslog_LTLIBRARIES = libevlsyslog.la
+
+libevlsyslog_la_SOURCES := $(evlsyslog_sources)
+
+# Another wired automake/libtool bug
+libevlsyslog_la_LDFLAGS := -Xcompiler -nostartfiles
+
+
diff -ruN evlog-current/user/Makefile.am evlog/user/Makefile.am
--- evlog-current/user/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/Makefile.am 2003-01-26 11:50:43.000000000 -0800
@@ -0,0 +1,24 @@
+## Process this file with automake to produce Makefile.in
+
+include $(top_srcdir)/Makefile.vars
+include $(top_srcdir)/Makefile.rules
+
+DISTCLEANFILES +=
+MAINTAINERCLEANFILES +=
+MOSTLYCLEANFILES +=
+
+TEMPLATFILES = templates/Makefile \
+ templates/logmgmt/Makefile \
+ templates/logmgmt/logmgmt.t \
+ templates/kern/kern.t
+
+templatedir = $(localstatedir)/evlog
+nobase_template_DATA = $(TEMPLATFILES)
+
+EXTRA_DIST += $(TEMPLATFILES)
+
+# bins or src products may be required to generate stuff in etc and or
+# doc. Stuff in bin, intl and lib may be required to generate stuff in
+# the rest (so, this is a possible dependency order).
+SUBDIRS = include lib libevlsyslog cmd sysfiles man
+
diff -ruN evlog-current/user/man/Makefile.am evlog/user/man/Makefile.am
--- evlog-current/user/man/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/man/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,17 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+manpages = evlview.1 evlog.1 evlsend.1 evlconfig.1 evlnotify.1 evlquery.1 evlfacility.1 evltc.1 evlogmgr.1 evlremote.1 evlgentmpls.1
+EXTRA_DIST = $(manpages)
+
+MOSTLYCLEANFILES = *.gz
+
+# Can't get compressed man page to work correctly with automake
+# Well, no big deal
+#
+# manfiles = $(manpages:.1=.1.gz)
+#
+# %.1.gz: %.1
+# gzip -c $< > $@
+
+man1_MANS = $(manpages)
+
diff -ruN evlog-current/user/sysfiles/etc/init.d/Makefile.am evlog/user/sysfiles/etc/init.d/Makefile.am
--- evlog-current/user/sysfiles/etc/init.d/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/sysfiles/etc/init.d/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,11 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EVLOGSCRIPTS = evlog evlogrmt evlnotify evlaction
+EXTRA_DIST = $(EVLOGSCRIPTS)
+
+evlog_initddir = @INITDOTD_DIR@
+evlog_initd_SCRIPTS = $(EVLOGSCRIPTS)
+
+evlog_optdir = /opt/evlog
+evlog_opt_SCRIPTS = $(EVLOGSCRIPTS)
+
diff -ruN evlog-current/user/sysfiles/etc/Makefile.am evlog/user/sysfiles/etc/Makefile.am
--- evlog-current/user/sysfiles/etc/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/sysfiles/etc/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = init.d
diff -ruN evlog-current/user/sysfiles/Makefile.am evlog/user/sysfiles/Makefile.am
--- evlog-current/user/sysfiles/Makefile.am 1969-12-31 16:00:00.000000000 -0800
+++ evlog/user/sysfiles/Makefile.am 2003-01-26 11:50:20.000000000 -0800
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = etc