Merge pull request #58 from ikeydoherty/cleanup

Cleanup

Author: ikeydoherty

.clang-format

@@ -29,7 +29,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializersBeforeComma: false
 #uncomment for clang 3.9
 #BreakStringLiterals: false
-ColumnLimit: 100
+ColumnLimit: 120
 CommentPragmas:  '\*\<'
 ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4

.travis.yml

@@ -39,7 +39,7 @@ before_install:
 script:
     - lcov --version | grep "1.10"
     - export CC="gcc-5"
-    - ./configure --enable-coverage && make && make check && make distcheck && make check-valgrind
+    - ./configure --enable-coverage && make && make check && make distcheck
     - clang-format-3.8 -i $(find . -name '*.[ch]') && git diff --exit-code
 
 

Makefile.am

@@ -2,6 +2,10 @@ include $(top_srcdir)/common.mk
 
 ACLOCAL_AMFLAGS = -I m4
 
+if COVERAGE
+AM_CFLAGS += --coverage
+endif
+
 EXTRA_DIST = ${top_srcdir}/README.md \
 	     ${top_srcdir}/LICENSE \
 	     ${top_srcdir}/common.mk \
@@ -18,15 +22,20 @@ EXTRA_DIST = ${top_srcdir}/README.md \
 	     ${top_srcdir}/tests/dummy_data/eopkg/files/security/cve-2013-4459.nopatch \
 	     ${top_srcdir}/tests/dummy_data/pkgbuild/PKGBUILD \
 	     ${top_srcdir}/tests/dummy_data/pkgbuild/cve-2014-5461.patch \
-	     ${top_srcdir}/test-init.sh
+	     ${top_srcdir}/test-init.sh \
+	     ${top_srcdir}/data/packages.template
 
 NULL =
 CLEANFILES =
 
-SUBDIRS = \
-	data \
-	src \
-	docs
+dist_man_MANS = \
+	docs/cve-check-tool.1
+
+# Install the template file to disk
+templatedir=$(datadir)/cve-check-tool/
+template_DATA = data/packages.template
+
+include src/Makefile.am
 
 if COVERAGE
 coverage:

configure.ac

@@ -83,11 +83,7 @@ fi
 
 AM_CONDITIONAL([RELATIVE_PLUGINS], [test "$enable_relative_plugins" = "yes"])
 
-AC_CONFIG_FILES([Makefile
-                 data/Makefile
-                 docs/Makefile
-                 src/Makefile
-                 src/plugins/Makefile])
+AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
 

data/Makefile.am

@@ -1,12 +1,3 @@
-include $(top_srcdir)/common.mk
-
-if COVERAGE
-AM_CFLAGS += --coverage
-endif
-
-SUBDIRS = . \
-	plugins
-
 bin_PROGRAMS = \
 	cve-check-tool \
 	cve-check-update
@@ -15,23 +6,23 @@ noinst_LTLIBRARIES = \
 	libcve.la
 
 libcve_la_SOURCES = \
-	library/common.h \
-	library/cve-check-tool.h \
-	library/cve-string.h \
-	library/cve-string.c \
-	library/hashmap.h \
-	library/hashmap.c \
-	library/cve-db-lock.h \
-	library/cve-db-lock.c \
-	library/fetch.c \
-	library/fetch.h \
-	library/template.c \
-	library/template.h \
-	library/util.c \
-	library/util.h \
-	plugins/packaging/faux/faux.h \
-	core.h \
-	core.c
+	src/library/common.h \
+	src/library/cve-check-tool.h \
+	src/library/cve-string.h \
+	src/library/cve-string.c \
+	src/library/hashmap.h \
+	src/library/hashmap.c \
+	src/library/cve-db-lock.h \
+	src/library/cve-db-lock.c \
+	src/library/fetch.c \
+	src/library/fetch.h \
+	src/library/template.c \
+	src/library/template.h \
+	src/library/util.c \
+	src/library/util.h \
+	src/plugins/packaging/faux/faux.h \
+	src/core.h \
+	src/core.c
 
 libcve_la_CFLAGS = \
 	$(CVE_CHECK_TOOL_CFLAGS) \
@@ -41,12 +32,12 @@ libcve_la_LIBADD = \
 	$(CVE_CHECK_TOOL_LIBS) 
 
 cve_check_tool_SOURCES = \
-	main.c \
-	update.h \
-	update.c \
-	plugin-manager.c \
-	plugin-manager.h \
-	plugin.h
+	src/main.c \
+	src/update.h \
+	src/update.c \
+	src/plugin-manager.c \
+	src/plugin-manager.h \
+	src/plugin.h
 
 
 cve_check_tool_CFLAGS = \
@@ -60,9 +51,9 @@ cve_check_tool_LDADD = \
 	-ldl
 
 cve_check_update_SOURCES = \
-	update.c \
-	update.h \
-	update-main.c
+	src/update.c \
+	src/update.h \
+	src/update-main.c
 
 
 cve_check_update_CFLAGS = \
@@ -74,3 +65,5 @@ cve_check_update_LDADD = \
 	$(CVE_CHECK_TOOL_LIBS) \
 	libcve.la \
 	-ldl
+
+include src/plugins/Makefile.am