diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0f40bf1fb351b13f35ce6b796ea3e8711dfdbe5d..17e4c1b0fae55af4bd30a7d3dbb113717278af33 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
## Process this file with automake to produce Makefile.in
-SUBDIRS = tests
+SUBDIRS = . tests
-noinst_LIBRARIES = libcoreutils.a libnagiosplug.a
+noinst_LIBRARIES = libnagiosplug.a
-# Will auto pick up fsusage.c mountlist.c
-libcoreutils_a_SOURCES = \
- cloexec.c cloexec.h \
- exit.h \
- full-read.c full-read.h \
- full-write.c full-write.h \
- gettext.h \
- safe-read.c safe-read.h \
- safe-write.c safe-write.h strcase.h xalloc-die.c
-# intprops.h required for getloadavg.c
-# This needs to be an EXTRA_DIST because the m4s
-# that have AC_LIBSOURCES for intprops.h are not necessary and
-# the getloadavg m4 is an autoconf one, so doesn't
-# know about intprops.h. Confused? You will be!
-EXTRA_DIST = intprops.h
+libnagiosplug_a_SOURCES = utils_base.c utils_disk.c utils_tcp.c utils_cmd.c
+EXTRA_DIST = utils_base.h utils_disk.h utils_tcp.h utils_cmd.h parse_ini.h extra_opts.h
-other_coreutils_files = \
- error.c error.h \
- fsusage.c \
- getloadavg.c \
- malloc.c \
- mountlist.c \
- realloc.c \
- strtod.c \
- exitfail.c exitfail.h \
- fsusage.h \
- getopt.c getopt1.c \
- mountlist.h \
- unlocked-io.h \
- xalloc.h \
- xmalloc.c
+if USE_PARSE_INI
+libnagiosplug_a_SOURCES += parse_ini.c extra_opts.c
+endif USE_PARSE_INI
+INCLUDES = -I$(srcdir) -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
-libcoreutils_a_LIBADD = $(LIBOBJS)
-libcoreutils_a_DEPENDENCIES = $(libcoreutils_a_LIBADD)
-
-libnagiosplug_a_SOURCES = snprintf.c utils_base.c utils_disk.c
-
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/intl -I$(top_srcdir)/plugins
-
-print_coreutil_files:
- @echo $(libcoreutils_a_SOURCES) $(other_coreutils_files) $(EXTRA_DIST)
-
-test:
- cd tests && make test
-
-# Below are from coreutil's lib/Makefile.am
-BUILT_SOURCES = $(STDBOOL_H)
-EXTRA_DIST += stdbool_.h
-MOSTLYCLEANFILES = stdbool.h stdbool.ht
-# Create stdbool.h on systems that lack a working one.
-stdbool.h: stdbool_.h
- sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' $(srcdir)/stdbool_.h > $@t
- mv $@t $@
-
-BUILT_SOURCES += $(GETOPT_H)
-EXTRA_DIST += getopt_.h getopt_int.h
-
-# We need the following in order to create an <getopt.h> when the system
-# doesn't have one that works with the given compiler.
-all-local $(lib_OBJECTS): $(GETOPT_H)
-getopt.h: getopt_.h
- cp $(srcdir)/getopt_.h $@-t
- mv $@-t $@
-MOSTLYCLEANFILES += getopt.h getopt.h-t
+test test-debug:
+ cd tests && make $@