diff options
author | Jan Engelhardt <jengelh@medozas.de> | 2011-09-08 16:07:16 +0200 |
---|---|---|
committer | Jan Engelhardt <jengelh@medozas.de> | 2011-09-08 16:07:16 +0200 |
commit | 891d5790b3f4caeed80f1449d280617c54df8837 (patch) | |
tree | 6328d4a4a0d4bffb76fc5ecf297b4386a1257191 /extensions | |
parent | bf42cf92ea0c53e5470a20d62d00e5e83379f4d5 (diff) | |
parent | 153c23d9b14285b24aae3e96da0b547dcc7ee051 (diff) |
Merge branch 'stable'
Diffstat (limited to 'extensions')
-rw-r--r-- | extensions/GNUmakefile.in | 17 | ||||
-rw-r--r-- | extensions/libxt_CONNSECMARK.c | 2 |
2 files changed, 16 insertions, 3 deletions
diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 2b48d841..a9edb1e6 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -68,7 +68,16 @@ targets_install := .PHONY: all install clean distclean FORCE -all: ${targets} +all: ${targets} check + +check: ${targets} + @echo " CHECK unknown symbols in .so files"; \ + . ../iptables/libxtables.la; \ + for i in "" lib*.so; do \ + [ -z "$$i" ] && continue; \ + LD_PRELOAD="$$dlname" LD_LIBRARY_PATH=../iptables/.libs \ + ldd -r $$i 2>&1 >/dev/null; \ + done; install: ${targets_install} @mkdir -p "${DESTDIR}${xtlibdir}"; @@ -90,11 +99,15 @@ init%.o: init%.c # Shared libraries # lib%.so: lib%.oo - ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $<; + ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< ${$*_LIBADD}; lib%.oo: ${srcdir}/lib%.c ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<; +# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD +xt_RATEEST_LIBADD = -lm +xt_statistic_LIBADD = -lm + # # Static bits diff --git a/extensions/libxt_CONNSECMARK.c b/extensions/libxt_CONNSECMARK.c index df2e6b82..0b3cd79d 100644 --- a/extensions/libxt_CONNSECMARK.c +++ b/extensions/libxt_CONNSECMARK.c @@ -87,7 +87,7 @@ CONNSECMARK_save(const void *ip, const struct xt_entry_target *target) const struct xt_connsecmark_target_info *info = (struct xt_connsecmark_target_info*)target->data; - printf("--"); + printf(" --"); print_connsecmark(info); } |