gnome-scan r808 - in trunk: . data doc lib modules modules/gsane modules/gsane/tests modules/gsfile src

[bersace svn gnome org]

Author: bersace
Date: Sat Jan 31 18:11:12 2009
New Revision: 808
URL: http://svn.gnome.org/viewvc/gnome-scan?rev=808&view=rev

Log:
Enable unit test framework

Added:
   trunk/modules/gsane/tests/
   trunk/modules/gsane/tests/Makefile.am
Removed:
   trunk/acinclude.m4
Modified:
   trunk/Makefile.am
   trunk/configure.ac
   trunk/data/Makefile.am
   trunk/doc/Makefile.am
   trunk/lib/Makefile.am
   trunk/modules/Makefile.am
   trunk/modules/gsane/Makefile.am
   trunk/modules/gsfile/Makefile.am
   trunk/src/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,5 +1,5 @@
-## Process this file with automake to produce Makefile.in
-## Created by Anjuta
+include $(top_srcdir)/Makefile.decl
+
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-tools
 
 SUBDIRS = \
@@ -28,7 +28,7 @@
 	@for f in $(C); do grep -q "_(" $$f && echo $$f; done | sort > $@
 	@echo $(desktop_IN) >> $@
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	ChangeLog		\
 	MAINTAINERS		\
         intltool-extract.in     \

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Sat Jan 31 18:11:12 2009
@@ -145,6 +145,7 @@
 	modules/Makefile
 	modules/gsfile/Makefile
 	modules/gsane/Makefile
+	modules/gsane/tests/Makefile
 	src/Makefile
 	data/Makefile
 	po/Makefile.in

Modified: trunk/data/Makefile.am
==============================================================================
--- trunk/data/Makefile.am	(original)
+++ trunk/data/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,5 +1,3 @@
-
-
 pkgicondir = @ICON_DIR@/hicolor
 gtkicondir = $(datadir)/icons/hicolor
 scalabledir = $(pkgicondir)/scalable
@@ -21,19 +19,6 @@
 		echo "***   $(PKG_UPDATE_ICON_CACHE)"; \
 	fi
 
-
-# devicesdir = $(scalabledir)/devices
-# devices_DATA = \
-# 	input-scanner.svg		\
-# 	input-scanner-flatbed.svg	\
-# 	input-scanner-multi-function.svg	\
-# 	input-scanner-sheetfed.svg	\
-# 	input-scanner-handheld.svg
-
-# devices24dir = $(24dir)/devices
-# devices24_DATA = \
-# 	input-scanner.png
-
 actionsdir = $(scalabledir)/actions
 actions_DATA = \
 	scan.svg	\
@@ -49,5 +34,5 @@
 	$(actions_DATA)		\
 	$(apps_DATA)
 
-# 	$(devices_DATA)		
-# 	$(devices24_DATA)	
+# Dumb rules for test units.
+test test-report perf-report full-report:

Modified: trunk/doc/Makefile.am
==============================================================================
--- trunk/doc/Makefile.am	(original)
+++ trunk/doc/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1 +1,4 @@
 SUBDIRS = ref
+
+# Dumb rules for test units.
+test test-report perf-report full-report:

Modified: trunk/lib/Makefile.am
==============================================================================
--- trunk/lib/Makefile.am	(original)
+++ trunk/lib/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DGETTEXT_PACKAGE=\""@GETTEXT_PACKAGE@"\"	\
@@ -67,7 +69,7 @@
 gnome-scan.vala.stamp: $(libgnome_scan_la_VALASOURCES)
 	valac --library= VAPINAME@ --thread -C $(libgnome_scan_la_VALAPKGADD) $^ && touch $@
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	gnome-scan.vala.stamp	\
 	$(libgnome_scan_la_VALASOURCES)	\
 	@VAPINAME  vapi @VAPINAME  gir \

Modified: trunk/modules/Makefile.am
==============================================================================
--- trunk/modules/Makefile.am	(original)
+++ trunk/modules/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 SUBDIRS = \
 	gsfile	\
 	gsane	\

Modified: trunk/modules/gsane/Makefile.am
==============================================================================
--- trunk/modules/gsane/Makefile.am	(original)
+++ trunk/modules/gsane/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,3 +1,7 @@
+include $(top_srcdir)/Makefile.decl
+
+SUBDIRS = tests
+
 INCLUDES = \
 	$(GNOME_SCAN_CFLAGS)	\
 	-I$(top_srcdir)/lib

Added: trunk/modules/gsane/tests/Makefile.am
==============================================================================
--- (empty file)
+++ trunk/modules/gsane/tests/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -0,0 +1,12 @@
+include $(top_srcdir)/Makefile.decl
+
+INCLUDES = \
+	$(GNOME_SCAN_CFLAGS)	\
+	-I$(top_srcdir)/lib
+
+LIBS = \
+	-L$(top_builddir)/modules/gsane/ -lgsane
+
+AM_CFLAGS = -Wall -g
+
+noinst_PROGRAMS = $(TEST_PROGS)

Modified: trunk/modules/gsfile/Makefile.am
==============================================================================
--- trunk/modules/gsfile/Makefile.am	(original)
+++ trunk/modules/gsfile/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = \
 	$(GNOME_SCAN_CFLAGS)	\
 	-I$(top_srcdir)/lib

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Jan 31 18:11:12 2009
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.decl
+
 INCLUDES = \
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\" \
@@ -76,7 +78,7 @@
 
 
 
-EXTRA_DIST = \
+EXTRA_DIST += \
 	flegita.vala.stamp	\
 	$(flegita_VALASOURCES)	\
 	$(wildcard flegita-gimp*.c)	\