Drop unused Makefile.decl

14 files changed, 14 insertions, 75 deletions

diff --git a/Makefile.am b/Makefile.am
index d4702b77..c3cfde45 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 ACLOCAL_AMFLAGS = --install -I m4 ${ACLOCAL_FLAGS}
 
diff --git a/data/Makefile.am b/data/Makefile.am
index ae148b32..4a02d40f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,4 @@
-NULL=
+NULL =
 
 SUBDIRS = \
 	ontology \
diff --git a/datahub/Makefile.am b/datahub/Makefile.am
index 8cf136b4..3d467062 100644
--- a/datahub/Makefile.am
+++ b/datahub/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 bin_PROGRAMS = zeitgeist-datahub
 
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 1228baa6..a1bf3721 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 SUBDIRS = \
 	vala \
diff --git a/examples/c/Makefile.am b/examples/c/Makefile.am
index 19bb6a09..9298c8f6 100644
--- a/examples/c/Makefile.am
+++ b/examples/c/Makefile.am
@@ -1,4 +1,4 @@
-include $(top_srcdir)/libzeitgeist/Makefile.decl
+NULL =
 
 AM_CFLAGS = \
 	-Wall  \
diff --git a/extensions/Makefile.am b/extensions/Makefile.am
index 72b9e245..2c67e713 100644
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -1,9 +1,9 @@
+NULL =
+
 if HAVE_FTS
 SUBDIRS = fts++
 endif
 
-NULL =
-
 #extensionsdir = $(libdir)/zeitgeist/extensions
 noinst_LTLIBRARIES = \
 	benchmark.la \
diff --git a/extensions/fts++/Makefile.am b/extensions/fts++/Makefile.am
index 1b3fc052..e1707717 100644
--- a/extensions/fts++/Makefile.am
+++ b/extensions/fts++/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 SUBDIRS = test
 
diff --git a/extensions/fts++/test/Makefile.am b/extensions/fts++/test/Makefile.am
index 2eae7ad1..2ae2eec8 100644
--- a/extensions/fts++/test/Makefile.am
+++ b/extensions/fts++/test/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 check_PROGRAMS = test-fts
 TESTS = test-fts
diff --git a/libzeitgeist/Makefile.decl b/libzeitgeist/Makefile.decl
deleted file mode 100644
index 8882b23f..00000000
--- a/libzeitgeist/Makefile.decl
+++ /dev/null
@@ -1,60 +0,0 @@
-# GLIB - Library of useful C routines
-#
-# This file is copied almost verbatim from the GLib-2.0 distribution
-#
-
-GTESTER = gtester 			# for non-GLIB packages
-GTESTER_REPORT = $(top_builddir)/test/gtester-report	# for the GLIB package
-
-# initialize variables for unconditional += appending
-EXTRA_DIST =
-TEST_PROGS =
-
-### testing rules
-
-# test: run all tests in cwd and subdirs
-test:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || ${GTESTER} --verbose ${TEST_PROGS}
-	@ for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done
-# test-report: run tests in subdirs and generate report
-# perf-report: run tests in subdirs with -m perf and generate report
-# full-report: like test-report: with -m perf and -m slow
-test-report perf-report full-report:	${TEST_PROGS}
-	@test -z "${TEST_PROGS}" || { \
-	  case $@ in \
-	  test-report) test_options="-k";; \
-	  perf-report) test_options="-k -m=perf";; \
-	  full-report) test_options="-k -m=perf -m=slow";; \
-	  esac ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then	\
-	    ${GTESTER} --verbose $$test_options -o test-report.xml ${TEST_PROGS} ; \
-	  elif test -n "${TEST_PROGS}" ; then \
-	    ${GTESTER} --verbose $$test_options -o `mktemp "$$GTESTER_LOGDIR/log-XXXXXX"` ${TEST_PROGS} ; \
-	  fi ; \
-	}
-	@ ignore_logdir=true ; \
-	  if test -z "$$GTESTER_LOGDIR" ; then \
-	    GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \
-	    ignore_logdir=false ; \
-	  fi ; \
-	  for subdir in $(SUBDIRS) ; do \
-	    test "$$subdir" = "." -o "$$subdir" = "po" || \
-	    ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \
-	  done ; \
-	  $$ignore_logdir || { \
-	    echo '<?xml version="1.0"?>' > $@.xml ; \
-	    echo '<report-collection>'  >> $@.xml ; \
-	    for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \
-	      sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \
-	    done ; \
-	    echo >> $@.xml ; \
-	    echo '</report-collection>' >> $@.xml ; \
-	    rm -rf "$$GTESTER_LOGDIR"/ ; \
-	    ${GTESTER_REPORT} --version 2>/dev/null 1>&2 ; test "$$?" != 0 || ${GTESTER_REPORT} $@.xml >$@.html ; \
-	  }
-.PHONY: test test-report perf-report full-report
-# run make test as part of make check
-check-local: test
diff --git a/src/Makefile.am b/src/Makefile.am
index 65751ef5..518f1354 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 bin_PROGRAMS = zeitgeist-daemon
 noinst_LTLIBRARIES = libzeitgeist-engine.la
diff --git a/test/Makefile.am b/test/Makefile.am
index dddac694..07f06e2d 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 SUBDIRS = \
 	dbus \
diff --git a/test/c/Makefile.am b/test/c/Makefile.am
index ad527475..9a840c2b 100644
--- a/test/c/Makefile.am
+++ b/test/c/Makefile.am
@@ -1,5 +1,4 @@
-#include $(top_srcdir)/libzeitgeist/Makefile.decl
-NULL = 
+NULL =
 
 EXTRA_DIST = \
 	test.desktop
diff --git a/test/dbus/Makefile.am b/test/dbus/Makefile.am
index 920c70a1..dcfd9230 100644
--- a/test/dbus/Makefile.am
+++ b/test/dbus/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 EXTRA_DIST = \
 	blacklist-test.py \
diff --git a/test/direct/Makefile.am b/test/direct/Makefile.am
index 59e9f5f3..56061c28 100644
--- a/test/direct/Makefile.am
+++ b/test/direct/Makefile.am
@@ -1,4 +1,4 @@
-NULL = 
+NULL =
 
 EXTRA_DIST = \
 	assertions.vapi \