projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'collectd-4.7' into collectd-4.8
[collectd.git]
/
src
/
Makefile.am
diff --git
a/src/Makefile.am
b/src/Makefile.am
index
e91df83
..
b92a8b6
100644
(file)
--- a/
src/Makefile.am
+++ b/
src/Makefile.am
@@
-1,6
+1,6
@@
SUBDIRS = libcollectdclient
if BUILD_WITH_OWN_LIBIPTC
SUBDIRS = libcollectdclient
if BUILD_WITH_OWN_LIBIPTC
-SUBDIRS +=
lib
iptc
+SUBDIRS +=
own
iptc
endif
if BUILD_WITH_OWN_LIBOCONFIG
SUBDIRS += liboconfig
endif
if BUILD_WITH_OWN_LIBOCONFIG
SUBDIRS += liboconfig
@@
-373,8
+373,8
@@
pkglib_LTLIBRARIES += iptables.la
iptables_la_SOURCES = iptables.c
iptables_la_LDFLAGS = -module -avoid-version
if BUILD_WITH_OWN_LIBIPTC
iptables_la_SOURCES = iptables.c
iptables_la_LDFLAGS = -module -avoid-version
if BUILD_WITH_OWN_LIBIPTC
-iptables_la_LIBADD =
lib
iptc/libiptc.la
-iptables_la_DEPENDENCIES =
lib
iptc/libiptc.la
+iptables_la_LIBADD =
own
iptc/libiptc.la
+iptables_la_DEPENDENCIES =
own
iptc/libiptc.la
else
iptables_la_LIBADD = -liptc
endif
else
iptables_la_LIBADD = -liptc
endif