From 126c1361ad5201973e6ebc761b3e38a67915de29 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 4 Aug 2008 18:37:38 +0200 Subject: Put xtables.c into its own library, libxtables.so iproute2's tc's m_ipt.c poses as a pseudo-iptables program to make use of the info structure composition of iptables extensions. Since tc would have to clone a lot of code, xtables.c is put into its own shared library and should not be relied upon by any other programs. Signed-off-by: Jan Engelhardt Signed-off-by: Patrick McHardy --- Makefile.am | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) (limited to 'Makefile.am') diff --git a/Makefile.am b/Makefile.am index b714b97f..48e012ef 100644 --- a/Makefile.am +++ b/Makefile.am @@ -11,55 +11,59 @@ endif # libiptc libiptc_libiptc_a_SOURCES = libiptc/libip4tc.c libiptc/libip6tc.c +lib_LTLIBRARIES = libxtables.la +libxtables_la_SOURCES = xtables.c +libxtables_la_LDFLAGS = -version 0:0:0 + # iptables, dynamic -iptables_SOURCES = iptables-standalone.c iptables.c xtables.c +iptables_SOURCES = iptables-standalone.c iptables.c iptables_LDFLAGS = -rdynamic -iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a +iptables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext4.a libxtables.la iptables_multi_SOURCES = iptables-multi.c iptables-save.c \ iptables-restore.c iptables-xml.c \ - iptables-standalone.c iptables.c xtables.c + iptables-standalone.c iptables.c iptables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI iptables_multi_LDFLAGS = ${iptables_LDFLAGS} iptables_multi_LDADD = ${iptables_LDADD} -iptables_restore_SOURCES = iptables-restore.c iptables.c xtables.c +iptables_restore_SOURCES = iptables-restore.c iptables.c iptables_restore_LDFLAGS = ${iptables_LDFLAGS} iptables_restore_LDADD = ${iptables_LDADD} -iptables_save_SOURCES = iptables-save.c iptables.c xtables.c +iptables_save_SOURCES = iptables-save.c iptables.c iptables_save_LDFLAGS = ${iptables_LDFLAGS} iptables_save_LDADD = ${iptables_LDADD} # iptables-multi, semi-static -iptables_static_SOURCES = ${iptables_multi_SOURCES} +iptables_static_SOURCES = ${iptables_multi_SOURCES} iptables.c xtables.c iptables_static_CFLAGS = ${iptables_multi_CFLAGS} -DNO_SHARED_LIBS=1 iptables_static_LDADD = -lm libiptc/libiptc.a extensions/libext4.a iptables_xml_SOURCES = iptables-xml.c # ip6tables, dynamic -ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c xtables.c +ip6tables_SOURCES = ip6tables-standalone.c ip6tables.c ip6tables_LDFLAGS = -rdynamic -ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a +ip6tables_LDADD = -ldl -lm libiptc/libiptc.a extensions/libext6.a libxtables.la ip6tables_multi_SOURCES = ip6tables-multi.c ip6tables-save.c \ ip6tables-restore.c ip6tables-standalone.c \ - ip6tables.c xtables.c + ip6tables.c ip6tables_multi_CFLAGS = ${AM_CFLAGS} -DIPTABLES_MULTI ip6tables_multi_LDFLAGS = ${ip6tables_LDFLAGS} ip6tables_multi_LDADD = ${ip6tables_LDADD} -ip6tables_restore_SOURCES = ip6tables-restore.c ip6tables.c xtables.c +ip6tables_restore_SOURCES = ip6tables-restore.c ip6tables.c ip6tables_restore_LDFLAGS = ${ip6tables_LDFLAGS} ip6tables_restore_LDADD = ${ip6tables_LDADD} -ip6tables_save_SOURCES = ip6tables-save.c ip6tables.c xtables.c +ip6tables_save_SOURCES = ip6tables-save.c ip6tables.c ip6tables_save_LDFLAGS = ${ip6tables_LDFLAGS} ip6tables_save_LDADD = ${ip6tables_LDADD} # iptables-multi, semi-static -ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} +ip6tables_static_SOURCES = ${ip6tables_multi_SOURCES} ip6tables.c xtables.c ip6tables_static_CFLAGS = ${ip6tables_multi_CFLAGS} -DNO_SHARED_LIBS=1 ip6tables_static_LDADD = -lm libiptc/libiptc.a extensions/libext6.a @@ -92,6 +96,8 @@ ip6tables.8: ${srcdir}/ip6tables.8.in extensions/matches6.man extensions/targets extensions/%: ${MAKE} ${AM_MAKEFLAGS} -C $(@D) $(@F) +pkgconfig_DATA = xtables.pc + .PHONY: tarball tarball: rm -Rf /tmp/${PACKAGE_TARNAME}-${PACKAGE_VERSION}; -- cgit v1.2.3