X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=lib%2FMakefile.am;h=99fa591aeb95d450976ea912d70605e3643661dd;hb=18f6835edaf7d640a2c9e476cb1babdbdadbfd9b;hp=0d69089e86a7264bac79fb5d95c4b861c1a0ee17;hpb=a8cd7705e7898d77764aa12ddcc2e29de1860138;p=nagiosplug.git

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 0d69089..99fa591 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,61 +1,20 @@
 ## Process this file with automake to produce Makefile.in
 
-noinst_LIBRARIES = libcoreutils.a 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 xalloc-die.c
-
-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
-
-
-libcoreutils_a_LIBADD = $(LIBOBJS)
-libcoreutils_a_DEPENDENCIES = $(libcoreutils_a_LIBADD)
-
-libnagiosplug_a_SOURCES = snprintf.c
-
-INCLUDES = -I$(srcdir) -I$(top_srcdir)/intl
-
-print_coreutil_files:
-	@echo $(libcoreutils_a_SOURCES) $(other_coreutils_files) $(EXTRA_DIST)
-
-# 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
+SUBDIRS = . tests
+
+noinst_LIBRARIES = libnagiosplug.a
+
+AM_CPPFLAGS = -DNP_STATE_DIR_PREFIX=\"$(localstatedir)\"
+
+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
+
+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
+
+test test-debug:
+	cd tests && make $@