diff --git a/src/Makefile.am b/src/Makefile.am
index 25711d6c984e881cb772b4298d662c5acf8593bf..0ed299b5fa48d830eb92cad8e6ddd77c1eed5bed 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
SUBDIRS = libcollectdclient
if BUILD_WITH_OWN_LIBIPTC
-SUBDIRS += libiptc
+SUBDIRS += owniptc
endif
if BUILD_WITH_OWN_LIBOCONFIG
SUBDIRS += liboconfig
if BUILD_PLUGIN_IPTABLES
pkglib_LTLIBRARIES += iptables.la
iptables_la_SOURCES = iptables.c
-iptables_la_LDFLAGS = -module -avoid-version
+iptables_la_CPPFLAGS = $(AM_CPPFLAGS) $(BUILD_WITH_LIBIPTC_CPPFLAGS)
+iptables_la_LDFLAGS = -module -avoid-version $(BUILD_WITH_LIBIPTC_LDFLAGS)
if BUILD_WITH_OWN_LIBIPTC
-iptables_la_LIBADD = libiptc/libiptc.la
-iptables_la_DEPENDENCIES = libiptc/libiptc.la
+iptables_la_LIBADD = owniptc/libiptc.la
+iptables_la_DEPENDENCIES = owniptc/libiptc.la
else
iptables_la_LIBADD = -liptc
endif
unixsock_la_SOURCES = unixsock.c \
utils_cmd_flush.h utils_cmd_flush.c \
utils_cmd_getval.h utils_cmd_getval.c \
+ utils_cmd_getthreshold.h utils_cmd_getthreshold.c \
utils_cmd_listval.h utils_cmd_listval.c \
utils_cmd_putval.h utils_cmd_putval.c \
utils_cmd_putnotif.h utils_cmd_putnotif.c
.pod.1:
pod2man --release=$(VERSION) --center=$(PACKAGE) $< \
- >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
+ >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
@if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
then \
echo "$@ has some POD errors!"; false; \
.pod.5:
pod2man --section=5 --release=$(VERSION) --center=$(PACKAGE) $< \
- >.pod2man.tmp 2>/dev/null && mv -f .pod2man.tmp $@ || true
+ >.pod2man.tmp.$$$$ 2>/dev/null && mv -f .pod2man.tmp.$$$$ $@ || true
@if grep '\<POD ERRORS\>' $@ >/dev/null 2>&1; \
then \
echo "$@ has some POD errors!"; false; \