rewrite Makefile and few tests to support distcheck target

vorodevops · Oct 19, 2015 · 63fa92c · 63fa92c
1 parent ec47fed
commit 63fa92c
Show file tree

Hide file tree

Showing 4 changed files with 187 additions and 173 deletions.
diff --git a/tests/Makefile.am b/tests/Makefile.am
@@ -1,10 +1,35 @@
 if HAVE_CHECK
 TESTS = check_vnstat
 check_PROGRAMS = check_vnstat
-check_vnstat_CFLAGS = @CHECK_CFLAGS@ -DPROCNETDEV=\"testdir/proc/dev\" -DSYSCLASSNET=\"testdir/sysclassnet\"
-check_vnstat_LDADD = @CHECK_LIBS@ -lgd
-check_vnstat_SOURCES = vnstat_tests.c vnstat_tests.h common_tests.c common_tests.h database_tests.c database_tests.h config_tests.c config_tests.h ifinfo_tests.c ifinfo_tests.h misc_tests.c misc_tests.h daemon_tests.c daemon_tests.h
-check_vnstat_SOURCES += $(top_builddir)/src/cfg.c $(top_builddir)/src/cfg.h $(top_builddir)/src/common.c $(top_builddir)/src/common.h $(top_builddir)/src/daemon.c $(top_builddir)/src/daemon.h $(top_builddir)/src/dbaccess.c $(top_builddir)/src/dbaccess.h $(top_builddir)/src/dbcache.c $(top_builddir)/src/dbcache.h $(top_builddir)/src/dbjson.c $(top_builddir)/src/dbjson.h $(top_builddir)/src/dbmerge.c $(top_builddir)/src/dbmerge.h $(top_builddir)/src/dbshow.c $(top_builddir)/src/dbshow.h $(top_builddir)/src/dbxml.c $(top_builddir)/src/dbxml.h $(top_builddir)/src/ibw.c $(top_builddir)/src/ibw.h $(top_builddir)/src/ifinfo.c $(top_builddir)/src/ifinfo.h $(top_builddir)/src/image.c $(top_builddir)/src/image.h $(top_builddir)/src/misc.c $(top_builddir)/src/misc.h $(top_builddir)/src/traffic.c $(top_builddir)/src/traffic.h
+check_vnstat_CFLAGS = @CHECK_CFLAGS@ \
+  -DPROCNETDEV=\"testdir/proc/dev\" \
+  -DSYSCLASSNET=\"testdir/sysclassnet\" \
+  -DCFGFILE=\"$(top_srcdir)/cfg/vnstat.conf\" \
+  -I$(top_srcdir)/src
+check_vnstat_LDADD = @CHECK_LIBS@
+
+check_vnstat_SOURCES = vnstat_tests.c vnstat_tests.h \
+  common_tests.c common_tests.h \
+  database_tests.c database_tests.h \
+  config_tests.c config_tests.h \
+  ifinfo_tests.c ifinfo_tests.h \
+  misc_tests.c misc_tests.h \
+  daemon_tests.c daemon_tests.h
+
+check_vnstat_SOURCES += $(top_srcdir)/src/cfg.c $(top_srcdir)/src/cfg.h \
+  $(top_srcdir)/src/common.c $(top_srcdir)/src/common.h \
+  $(top_srcdir)/src/daemon.c $(top_srcdir)/src/daemon.h \
+  $(top_srcdir)/src/dbaccess.c $(top_srcdir)/src/dbaccess.h \
+  $(top_srcdir)/src/dbcache.c $(top_srcdir)/src/dbcache.h \
+  $(top_srcdir)/src/dbjson.c $(top_srcdir)/src/dbjson.h \
+  $(top_srcdir)/src/dbmerge.c $(top_srcdir)/src/dbmerge.h \
+  $(top_srcdir)/src/dbshow.c $(top_srcdir)/src/dbshow.h \
+  $(top_srcdir)/src/dbxml.c $(top_srcdir)/src/dbxml.h \
+  $(top_srcdir)/src/ibw.c $(top_srcdir)/src/ibw.h \
+  $(top_srcdir)/src/ifinfo.c $(top_srcdir)/src/ifinfo.h \
+  $(top_srcdir)/src/misc.c $(top_srcdir)/src/misc.h \
+  $(top_srcdir)/src/traffic.c $(top_srcdir)/src/traffic.h
+
 endif
 
 clean-local: