diff options
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | extensions/GNUmakefile.in | 15 | ||||
| -rw-r--r-- | include/Makefile.am | 2 | ||||
| -rw-r--r-- | iptables/Makefile.am | 5 | ||||
| -rw-r--r-- | libipq/Makefile.am | 2 | ||||
| -rw-r--r-- | libiptc/Makefile.am | 2 | ||||
| -rw-r--r-- | utils/Makefile.am | 4 |
7 files changed, 28 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index 19a93a55..a0bf11e6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,9 +16,11 @@ SUBDIRS += extensions # Depends on extensions/libext.a: SUBDIRS += iptables +EXTRA_DIST = autogen.sh iptables-test.py xlate-test.py + if ENABLE_NFTABLES confdir = $(sysconfdir) -dist_conf_DATA = etc/ethertypes +dist_conf_DATA = etc/ethertypes etc/xtables.conf endif .PHONY: tarball diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 188e7a79..c37e4619 100644 --- a/extensions/GNUmakefile.in +++ b/extensions/GNUmakefile.in @@ -79,7 +79,7 @@ targets_install := .SECONDARY: -.PHONY: all install uninstall clean distclean FORCE +.PHONY: all install uninstall clean distclean FORCE dvi check installcheck all: ${targets} @@ -235,3 +235,16 @@ matches.man: ${initext_depfiles} $(wildcard ${srcdir}/lib*.man) targets.man: ${initext_depfiles} $(wildcard ${srcdir}/lib*.man) $(call man_run,$(call ex_targets,${pfx_build_mod} ${pfb_build_mod} ${pfa_build_mod} ${pf4_build_mod} ${pf6_build_mod} ${pfx_symlinks})) + +dist_initext_src = $(addprefix $(srcdir)/,${initext_sources}) +dist_sources = $(filter-out ${dist_initext_src},$(wildcard $(srcdir)/*.[ch])) + +distdir: + mkdir -p $(distdir) + cp -p ${dist_sources} $(distdir)/ + cp -p $(wildcard ${srcdir}/lib*.man) $(distdir)/ + cp -p $(srcdir)/*.{t,txlate} $(distdir)/ + +dvi: +check: all +installcheck: diff --git a/include/Makefile.am b/include/Makefile.am index ea34c2fe..348488a4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -11,6 +11,8 @@ nobase_include_HEADERS += \ libiptc/ipt_kernel_headers.h libiptc/libiptc.h \ libiptc/libip6tc.h libiptc/libxtc.h libiptc/xtcshared.h +EXTRA_DIST = iptables linux iptables.h ip6tables.h + uninstall-hook: dir=${includedir}/libiptc; { \ test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; \ diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 7ca2b1a4..4353dd00 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -63,7 +63,8 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \ ip6tables-save.8 iptables-extensions.8 \ iptables-apply.8 ip6tables-apply.8 -sbin_SCRIPTS = iptables-apply +dist_sbin_SCRIPTS = iptables-apply +dist_pkgdata_DATA = iptables.xslt if ENABLE_NFTABLES man_MANS += iptables-translate.8 ip6tables-translate.8 \ @@ -144,3 +145,5 @@ uninstall-hook: ); \ ( cd "$$dir" && rm -f ip6tables-apply ); \ } + +EXTRA_DIST = tests diff --git a/libipq/Makefile.am b/libipq/Makefile.am index 2cdaf32e..68da15fe 100644 --- a/libipq/Makefile.am +++ b/libipq/Makefile.am @@ -6,7 +6,7 @@ AM_LDFLAGS = ${regular_LDFLAGS} libipq_la_SOURCES = libipq.c lib_LTLIBRARIES = libipq.la -man_MANS = ipq_create_handle.3 ipq_destroy_handle.3 ipq_errstr.3 \ +dist_man_MANS = ipq_create_handle.3 ipq_destroy_handle.3 ipq_errstr.3 \ ipq_get_msgerr.3 ipq_get_packet.3 ipq_message_type.3 \ ipq_perror.3 ipq_read.3 ipq_set_mode.3 ipq_set_verdict.3 \ libipq.3 diff --git a/libiptc/Makefile.am b/libiptc/Makefile.am index 097842f2..d8fe169e 100644 --- a/libiptc/Makefile.am +++ b/libiptc/Makefile.am @@ -11,3 +11,5 @@ libip4tc_la_SOURCES = libip4tc.c libip4tc_la_LDFLAGS = -version-info 2:0:0 libip6tc_la_SOURCES = libip6tc.c libip6tc_la_LDFLAGS = -version-info 2:0:0 + +EXTRA_DIST = libiptc.c linux_list.h diff --git a/utils/Makefile.am b/utils/Makefile.am index 327a29e0..e9eec48f 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -6,13 +6,13 @@ AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include \ AM_LDFLAGS = ${regular_LDFLAGS} sbin_PROGRAMS = -pkgdata_DATA = +dist_pkgdata_DATA = man_MANS = if HAVE_LIBNFNETLINK man_MANS += nfnl_osf.8 sbin_PROGRAMS += nfnl_osf -pkgdata_DATA += pf.os +dist_pkgdata_DATA += pf.os nfnl_osf_LDADD = ${libnfnetlink_LIBS} |