Makefile: Fix for 'make distcheck'

Since extensions/ directory does not use automake, some targets have to
be added manually. Apart from that, several Makefiles either missed to
specify relevant files or did not specify them correctly for 'make dist'
to add them to the tarball.

Signed-off-by: Phil Sutter <phil@nwl.cc>

diff --git a/Makefile.am b/Makefile.am
index 19a93a5586d0f96e3e0360a249e79b065a817b57..a0bf11e6872c5c3193a1331844b1dcfefd506322 100644 (file)
--- 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 188e7a790256689b50dfec6c0b40d94ba9f9ba2a..c37e4619f91f908d058b4b1ca976ba8bb45b1424 100644 (file)
--- 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 ea34c2fef0d98788333986050a4a761233b00767..348488a45ce84bde51b57e2a403a05a5f8aea16e 100644 (file)
--- 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 7ca2b1a4ba76272a6cd9be64551a3e66f9887183..4353dd0094c9ea5a702cc536249a2deb66942fe3 100644 (file)
--- 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 2cdaf32e032929f8ed7294e29c8a027591b967c3..68da15fe56439c7d8921a08c289d18a03d02c505 100644 (file)
--- 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 097842f212bb54852c801358fb86b2543e1d3551..d8fe169e32487dfa553eda09a0e997df3ac74828 100644 (file)
--- 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 327a29e028c4dc5b1280c5f467e93fda177a18db..e9eec48ffc3b594fcadf5bfaa2b3b50d1fe1b528 100644 (file)
--- 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}