Cleanups.

4 files changed, 17 insertions, 61 deletions

diff --git a/Makefile.am b/Makefile.am
index 1274c0d4..3bde21b3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-DISTCHECK_CONFIGURE_FLAGS = --disable-doc --disable-vala --disable-coverage
+DISTCHECK_CONFIGURE_FLAGS = --disable-doc --disable-coverage
 
 AUTOMAKE_OPTIONS = subdir-objects
 ACLOCAL_AMFLAGS = -I m4
diff --git a/debian/rules b/debian/rules
index ccd04feb..de9043d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 Makefile:
-	./configure --prefix /usr --sysconfdir=/etc --disable-vala --disable-doc --disable-coverage
+	./configure --prefix /usr --sysconfdir=/etc --disable-doc --disable-coverage \
 
 build: build-stamp
 build-stamp: Makefile
diff --git a/libcontextsubscriber/src/Makefile.am b/libcontextsubscriber/src/Makefile.am
index 1ae698b6..9cc161a3 100644
--- a/libcontextsubscriber/src/Makefile.am
+++ b/libcontextsubscriber/src/Makefile.am
@@ -1,21 +1,22 @@
 lib_LTLIBRARIES = libcontextsubscriber.la
 libcontextsubscriber_la_SOURCES = contextproperty.cpp			\
-	  contextproperty.h propertyhandle.cpp propertyhandle.h		\
-	  provider.cpp provider.h safedbuspendingcallwatcher.h		\
-	  subscriberinterface.h subscriberinterface.cpp			\
-	  contextpropertyinfo.cpp contextpropertyinfo.h			\
-	  contextregistryinfo.cpp contextregistryinfo.h infobackend.h	\
-	  infobackend.cpp infoxmlbackend.h infoxmlbackend.cpp		\
-	  infoxmlkeysfinder.h infoxmlkeysfinder.cpp infokeydata.h	\
-	  cdbwriter.h cdbwriter.cpp cdbreader.cpp cdbreader.h		\
-	  infocdbbackend.cpp infocdbbackend.h dbusnamelistener.h	\
-	  dbusnamelistener.cpp handlesignalrouter.cpp			\
-	  handlesignalrouter.h queuedinvoker.cpp queuedinvoker.h	\
-	  loggingfeatures.h bluezinterface.h bluezinterface.cpp		\
-	  contextkitplugin.h contextkitplugin.cpp iproviderplugin.h
+	contextproperty.h propertyhandle.cpp propertyhandle.h		\
+	provider.cpp provider.h safedbuspendingcallwatcher.h		\
+	subscriberinterface.h subscriberinterface.cpp			\
+	contextpropertyinfo.cpp contextpropertyinfo.h			\
+	contextregistryinfo.cpp contextregistryinfo.h infobackend.h	\
+	infobackend.cpp infoxmlbackend.h infoxmlbackend.cpp		\
+	infoxmlkeysfinder.h infoxmlkeysfinder.cpp infokeydata.h		\
+	cdbwriter.h cdbwriter.cpp cdbreader.cpp cdbreader.h		\
+	infocdbbackend.cpp infocdbbackend.h dbusnamelistener.h		\
+	dbusnamelistener.cpp handlesignalrouter.cpp			\
+	handlesignalrouter.h queuedinvoker.cpp queuedinvoker.h		\
+	loggingfeatures.h bluezinterface.h bluezinterface.cpp		\
+	contextkitplugin.h contextkitplugin.cpp iproviderplugin.h
 
 includecontextsubscriberdir=$(includedir)/contextsubscriber
-includecontextsubscriber_HEADERS = contextproperty.h contextpropertyinfo.h contextregistryinfo.h
+includecontextsubscriber_HEADERS = contextproperty.h			\
+	contextpropertyinfo.h contextregistryinfo.h iproviderplugin.h
 
 AM_CXXFLAGS = -I$(top_srcdir)/common \
 	      $(QtCore_CFLAGS) $(QtXml_CFLAGS) $(QtDBus_CFLAGS)	\
diff --git a/tools/lcov.am b/tools/lcov.am
deleted file mode 100644
index 014d5c48..00000000
--- a/tools/lcov.am
+++ /dev/null
@@ -1,45 +0,0 @@
-lcov-reset:
-	lcov --base-directory=@top_srcdir@ --directory @top_srcdir@/libcontextprovider --zerocounters
-	lcov --base-directory=@top_srcdir@ --directory @top_srcdir@/contextd --zerocounters
-
-lcov-report:
-	lcov --directory @top_srcdir@/libcontextprovider \
-		 --capture \
-		--output-file @top_builddir@/lcov.info.tmp
-
-	lcov --directory @top_srcdir@/tests/contextd_tests \
-		-b @top_srcdir@/contextd --capture \
-		--output-file @top_builddir@/lcov.contextd.info.tmp
-
-	lcov --directory @top_srcdir@/libcontextprovider \
-		--output-file @top_builddir@/lcov.info.tmp \
-		--remove @top_builddir@/lcov.info.tmp \
-		$(shell find @top_srcdir@ -name \*.vala | sed 's/.vala/.c/' | xargs -n1 basename) \*.vapi \
-		/usr/include/\*
-
-	lcov --directory @top_srcdir@/tests/contextd_tests \
-		--output-file @top_builddir@/lcov.contextd.info.tmp \
-		--remove @top_builddir@/lcov.contextd.info.tmp \
-		$(shell find @top_srcdir@ -name \*.vala | sed 's/.vala/.c/' | xargs -n1 basename) \*.vapi context_provider.vala test_hal_plugin.vala libhal.vala \
-		/usr/include/\*
-
-	lcov --add-tracefile lcov.contextd.info.tmp --add-tracefile lcov.info.tmp -o lcov.info
-	rm @top_builddir@/lcov.info.tmp
-	rm @top_builddir@/lcov.contextd.info.tmp
-	$(mkdir_p) @top_builddir@/lcov.html
-	git_commit=`GIT_DIR=@top_srcdir@/.git git log -1 --pretty=format:%h 2>/dev/null`;\
-	genhtml --title "@PACKAGE_STRING@ $$git_commit" \
-		--output-directory @top_builddir@/lcov.html lcov.info
-	@echo
-	@echo 'lcov report can be found in:'
-	@echo 'file://@abs_top_builddir@/lcov.html/index.html'
-	@echo
-
-lcov-check:
-	. $(top_srcdir)/tools/autogen-helpers.sh ; \
-	version_check lcov lcov 'lcov' 1.6 "http://ltp.sourceforge.net"
-	$(MAKE) lcov-reset
-	$(MAKE) check $(LCOV_CHECK_ARGS)
-	$(MAKE) lcov-report
-
-## vim:set ft=automake: