You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
Index: iptables-1.4.18/extensions/GNUmakefile.in
|
|
===================================================================
|
|
--- iptables-1.4.18.orig/extensions/GNUmakefile.in 2013-03-03 22:40:11.000000000 +0100
|
|
+++ iptables-1.4.18/extensions/GNUmakefile.in 2013-03-06 17:13:04.074584735 +0100
|
|
@@ -33,7 +33,6 @@
|
|
AM_VERBOSE_CXXLD = @echo " CXXLD " $@;
|
|
AM_VERBOSE_AR = @echo " AR " $@;
|
|
AM_VERBOSE_GEN = @echo " GEN " $@;
|
|
-AM_VERBOSE_NULL = @
|
|
endif
|
|
|
|
#
|
|
@@ -76,7 +75,7 @@
|
|
if test -n "${targets_install}"; then install -pm0755 $^ "${DESTDIR}${xtlibdir}/"; fi;
|
|
|
|
clean:
|
|
- rm -f *.la *.o *.lo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
|
|
+ rm -f *.o *.oo *.so *.a {matches,targets}.man initext.c initext4.c initext6.c;
|
|
rm -f .*.d .*.dd;
|
|
|
|
distclean: clean
|
|
@@ -90,22 +89,19 @@
|
|
#
|
|
# Shared libraries
|
|
#
|
|
-lib%.so: lib%.la
|
|
- ${AM_VERBOSE_NULL} ln -fs .libs/$@ $@
|
|
+lib%.so: lib%.oo
|
|
+ ${AM_VERBOSE_CCLD} ${CCLD} ${AM_LDFLAGS} -shared ${LDFLAGS} -o $@ $< -L../libxtables/.libs -L../libiptc/.libs -lxtables ${$*_LIBADD};
|
|
|
|
-lib%.la: lib%.lo
|
|
- ${AM_VERBOSE_CCLD} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=link ${CCLD} ${AM_LDFLAGS} -module ${LDFLAGS} -o $@ $< ../libxtables/libxtables.la ${$*_LIBADD} -rpath ${xtlibdir}
|
|
-
|
|
-lib%.lo: ${srcdir}/lib%.c
|
|
- ${AM_VERBOSE_CC} ../libtool ${AM_LIBTOOL_SILENT} --tag=CC --mode=compile ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init ${CFLAGS} -o $@ -c $<
|
|
+lib%.oo: ${srcdir}/lib%.c
|
|
+ ${AM_VERBOSE_CC} ${CC} ${AM_CPPFLAGS} ${AM_DEPFLAGS} ${AM_CFLAGS} -D_INIT=lib$*_init -DPIC -fPIC ${CFLAGS} -o $@ -c $<;
|
|
|
|
libxt_NOTRACK.so: libxt_CT.so
|
|
- ${AM_VERBOSE_GEN} ln -fs $< $@
|
|
+ ln -fs $< $@
|
|
libxt_state.so: libxt_conntrack.so
|
|
- ${AM_VERBOSE_GEN} ln -fs $< $@
|
|
+ ln -fs $< $@
|
|
|
|
# Need the LIBADDs in iptables/Makefile.am too for libxtables_la_LIBADD
|
|
-ip6t_NETMAP_LIBADD = ../libiptc/libip6tc.la
|
|
+ip6t_NETMAP_LIBADD = -lip6tc
|
|
xt_RATEEST_LIBADD = -lm
|
|
xt_statistic_LIBADD = -lm
|
|
|