build: fix a number of problems with 'make distcheck'

Signed-off-by: Paul Moore <[email protected]>
netlabel · Jul 10, 2015 · 6973574 · 6973574
1 parent 797df21
commit 6973574
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -19,9 +19,9 @@
 #
 
 ACLOCAL_AMFLAGS = -I m4
-SUBDIRS = libnetlabel netlabelctl tests doc
+SUBDIRS = include libnetlabel netlabelctl tests doc
 
-EXTRA_DIST = CHANGELOG LICENSE README
+EXTRA_DIST = CHANGELOG LICENSE README SUBMITTING_PATCHES
 
 # support silent builds
 AM_MAKEFLAGS_0 = --quiet --no-print-directory

diff --git a/configure.ac b/configure.ac
@@ -21,7 +21,7 @@ dnl #
 dnl ####
 dnl netlabel_tools defines
 dnl ####
-AC_INIT([netlabel_tools], [0.0.0])
+AC_INIT([netlabel_tools], [0.20])
 
 dnl ####
 dnl autoconf configuration
@@ -142,6 +142,7 @@ dnl makefiles
 dnl ####
 AC_CONFIG_FILES([
 	Makefile
+	include/Makefile
 	libnetlabel/Makefile
 	netlabelctl/Makefile
 	doc/Makefile

diff --git a/doc/Makefile.am b/doc/Makefile.am
@@ -18,6 +18,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+EXTRA_DIST = doxyfile
+
 dist_man8_MANS = \
 	man/man8/netlabel-config.8 \
 	man/man8/netlabelctl.8

diff --git a/libnetlabel/Makefile.am b/libnetlabel/Makefile.am
@@ -19,8 +19,10 @@
 #
 
 SOURCES = \
-	netlabel_comm.c netlabel_msg.c netlabel_init.c \
-	mod_mgmt.c mod_unlabeled.c mod_cipsov4.c
+	netlabel_comm.c netlabel_init.c netlabel_msg.c netlabel_internal.h \
+	mod_cipsov4.h mod_cipsov4.c \
+	mod_mgmt.h mod_mgmt.c \
+	mod_unlabeled.h mod_unlabeled.c
 
 noinst_LIBRARIES = libnetlabel.a
 

diff --git a/netlabelctl/Makefile.am b/netlabelctl/Makefile.am
@@ -18,16 +18,17 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-AM_CPPFLAGS = -I$(top_builddir)/include
+EXTRA_DIST = netlabel.service
 
 sbin_PROGRAMS = netlabelctl
 dist_sbin_SCRIPTS = netlabel-config
 
-sysconf_DATA = netlabel.rules
+dist_sysconf_DATA = netlabel.rules
 
 if HAVE_SYSTEMD
 systemdsystemunit_DATA = netlabel.service
 endif
 
-netlabelctl_SOURCES = main.c mgmt.c map.c unlabeled.c cipsov4.c
+netlabelctl_SOURCES = netlabelctl.h main.c mgmt.c map.c unlabeled.c cipsov4.c
+netlabelctl_CPPFLAGS = ${AM_CPPFLAGS} -I$(topdir)/include
 netlabelctl_LDADD = ../libnetlabel/libnetlabel.a
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -19,3 +19,19 @@
 #
 
 TESTS = regression
+
+EXTRA_DIST_TESTS = \
+	01-mgmt-version.tests \
+	02-mgmt-protocols.tests \
+	03-cipso_local.tests \
+	04-cipso_pass.tests \
+	05-cipso_trans.tests \
+	06-map_domain.tests \
+	07-map_addrselect.tests \
+	08-unlbl_default.tests
+
+EXTRA_DIST_TESTSCRIPTS = regression
+
+EXTRA_DIST = \
+	${EXTRA_DIST_TESTS} \
+	${EXTRA_DIST_TESTSCRIPTS}