diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | Makefile.am | 17 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libiptc/.gitignore | 1 | ||||
| -rw-r--r-- | libiptc/Makefile.am | 12 | ||||
| -rw-r--r-- | libiptc/libiptc.pc.in (renamed from libiptc.pc.in) | 0 |
6 files changed, 18 insertions, 17 deletions
@@ -36,7 +36,6 @@ Makefile.in /ltmain.sh /missing /stamp-h1 -/libiptc.pc /xtables.pc /ip6tables diff --git a/Makefile.am b/Makefile.am index 48f01d81..02b5c096 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign subdir-objects AM_CFLAGS = ${regular_CFLAGS} AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include ${kinclude_CPPFLAGS} -SUBDIRS = extensions +SUBDIRS = extensions libiptc if ENABLE_DEVEL SUBDIRS += include endif @@ -15,19 +15,8 @@ endif if HAVE_LIBNFNETLINK SUBDIRS += utils endif -lib_LTLIBRARIES = -# libiptc -lib_LTLIBRARIES += libiptc/libip4tc.la libiptc/libip6tc.la libiptc/libiptc.la -libiptc_libiptc_la_SOURCES = -libiptc_libiptc_la_LIBADD = libiptc/libip4tc.la libiptc/libip6tc.la -libiptc_libiptc_la_LDFLAGS = -version-info 0:0:0 ${libiptc_LDFLAGS2} -libiptc_libip4tc_la_SOURCES = libiptc/libip4tc.c -libiptc_libip4tc_la_LDFLAGS = -version-info 0:0:0 -libiptc_libip6tc_la_SOURCES = libiptc/libip6tc.c -libiptc_libip6tc_la_LDFLAGS = -version-info 0:0:0 ${libiptc_LDFLAGS2} - -lib_LTLIBRARIES += libxtables.la +lib_LTLIBRARIES = libxtables.la libxtables_la_SOURCES = xtables.c xtoptions.c libxtables_la_LDFLAGS = -version-info ${libxtables_vcurrent}:0:${libxtables_vage} if ENABLE_SHARED @@ -80,7 +69,7 @@ iptables.8: ${srcdir}/iptables.8.in extensions/matches4.man extensions/targets4. ip6tables.8: ${srcdir}/ip6tables.8.in extensions/matches6.man extensions/targets6.man ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@; -pkgconfig_DATA = libiptc.pc xtables.pc +pkgconfig_DATA = xtables.pc .PHONY: tarball tarball: diff --git a/configure.ac b/configure.ac index daed602d..f3de3d38 100644 --- a/configure.ac +++ b/configure.ac @@ -111,6 +111,6 @@ libxtables_vmajor=$(($libxtables_vcurrent - $libxtables_vage)); AC_SUBST([libxtables_vmajor]) AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile - libipq/Makefile utils/Makefile - include/xtables.h include/iptables/internal.h libiptc.pc xtables.pc]) + libipq/Makefile libiptc/Makefile libiptc/libiptc.pc utils/Makefile + include/xtables.h include/iptables/internal.h xtables.pc]) AC_OUTPUT diff --git a/libiptc/.gitignore b/libiptc/.gitignore new file mode 100644 index 00000000..87675507 --- /dev/null +++ b/libiptc/.gitignore @@ -0,0 +1 @@ +/libiptc.pc diff --git a/libiptc/Makefile.am b/libiptc/Makefile.am new file mode 100644 index 00000000..a7d0ea26 --- /dev/null +++ b/libiptc/Makefile.am @@ -0,0 +1,12 @@ +# -*- Makefile -*- + +pkgconfig_DATA = libiptc.pc + +lib_LTLIBRARIES = libip4tc.la libip6tc.la libiptc.la +libiptc_la_SOURCES = +libiptc_la_LIBADD = libip4tc.la libip6tc.la +libiptc_la_LDFLAGS = -version-info 0:0:0 ${libiptc_LDFLAGS2} +libip4tc_la_SOURCES = libip4tc.c +libip4tc_la_LDFLAGS = -version-info 0:0:0 +libip6tc_la_SOURCES = libip6tc.c +libip6tc_la_LDFLAGS = -version-info 0:0:0 ${libiptc_LDFLAGS2} diff --git a/libiptc.pc.in b/libiptc/libiptc.pc.in index 99a35440..99a35440 100644 --- a/libiptc.pc.in +++ b/libiptc/libiptc.pc.in |