[grisbi-cvs] grisbi/src Makefile.am, 1.167, 1.168 main.c, 1.176, 1.177 gsb_data_account_cunit.c, 1.5, NONE gsb_data_account_cunit.h, 1.2, NONE gsb_real_cunit.c, 1.13, NONE gsb_real_cunit.h, 1.2, NONE main_cunit.c, 1.3, NONE main_cunit.h, 1.1, NONE utils_dates_cunit.c, 1.5, NONE utils_dates_cunit.h, 1.2, NONE

[Mathias Lorente]

Update of /cvsroot/grisbi/grisbi/src
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv20191

Modified Files:
	Makefile.am main.c 
Removed Files:
	gsb_data_account_cunit.c gsb_data_account_cunit.h 
	gsb_real_cunit.c gsb_real_cunit.h main_cunit.c main_cunit.h 
	utils_dates_cunit.c utils_dates_cunit.h 
Log Message:
Move tests from main source directory to tests directory

--- gsb_data_account_cunit.h DELETED ---

--- main_cunit.c DELETED ---

--- main_cunit.h DELETED ---

--- gsb_data_account_cunit.c DELETED ---

--- utils_dates_cunit.h DELETED ---

--- gsb_real_cunit.c DELETED ---

Index: Makefile.am
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/Makefile.am,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -d -r1.167 -r1.168
--- Makefile.am	28 Apr 2010 16:19:58 -0000	1.167
+++ Makefile.am	4 May 2010 20:58:26 -0000	1.168
@@ -4,15 +4,18 @@
 AM_CPPFLAGS = -I$(top_srcdir) -I$(includedir) -I../intl -DLOCALEDIR=\"$(localedir)\" -DPIXMAPS_DIR="\"$(datadir)/pixmaps/@PACKAGE@\"" -DPLUGINS_DIR="\"$(libdir)/@PACKAGE@\"" -DLOGO_PATH="\"$(datadir)/pixmaps/@PACKAGE@/grisbi-logo.png\"" -DDATA_PATH="\"$(datadir)/@PACKAGE@\"" -DHELP_PATH="\"$(datadir)/doc/@PACKAGE@\"" -Wall
 bin_PROGRAMS = grisbi
 
+noinst_LIBRARIES = libgrisbi.a
+
 # TODO: This manual setting of -Wl is a hack, I cannot get it from
 # configure right now because of no doc.
 grisbi_LDFLAGS = @lt_prog_compiler_wl@@export_dynamic_flag_spec@
 
-grisbi_LDADD = $(GTK_LIBS)
+grisbi_LDADD = libgrisbi.a $(GTK_LIBS)
 
 config_dir = config
 
-sources = \
+
+libgrisbi_a_sources = 		\
 	accueil.c		\
 	affichage.c		\
 	affichage_liste.c	\
@@ -115,8 +118,6 @@
 	import.c		\
 	import_csv.c		\
 	imputation_budgetaire.c	\
-	main.c			\
-	main_cunit.c			\
 	menu.c			\
 	meta_budgetary.c	\
 	meta_categories.c	\
@@ -152,7 +153,7 @@
         balance_estimate_hist.c \
 	balance_estimate_tab.c
 
-grisbi_INCLUDES =		\
+libgrisbi_a_INCLUDES =		\
 	$(include_config)       \
 	accueil.h		\
 	affichage.h		\
@@ -167,6 +168,7 @@
 	classement_echeances.h	\
         csv_parse.h             \
 	custom_list.h		\
+	erreur.h		\
         etats_affiche.h         \
         etats_csv.h             \
         etats_html.h            \
@@ -246,7 +248,6 @@
 	gsb_transactions_list.h	\
 	gsb_transactions_list_sort.h	\
 	dialog.h		\
-	erreur.h		\
 	etats_calculs.h		\
 	etats_config.h		\
 	etats_gtktable.h	\
@@ -263,8 +264,6 @@
 	import_csv.h		\
 	imputation_budgetaire.h	\
 	include.h		\
-	main.h			\
-	main_cunit.h			\
 	menu.h			\
         meta_budgetary.h        \
         meta_categories.h       \
@@ -297,20 +296,21 @@
 	utils_operations.h	\
 	utils_str.h
 
-cunit_sources = \
-	gsb_data_account_cunit.c	\
-	gsb_real_cunit.c	\
-	utils_dates_cunit.c	
+libgrisbi_a_SOURCES = $(libgrisbi_a_sources) $(sources_config) $(libgrisbi_a_INCLUDES)
 
-cunit_includes = \
-	gsb_data_account_cunit.h	\
-	gsb_real_cunit.h	\
-	utils_dates_cunit.h
 
-grisbi_SOURCES = $(sources) $(sources_config) $(grisbi_INCLUDES)  
+grisbi_sources = 		\
+	main.c
+
+grisbi_INCLUDES = 		\
+	main.h
+
+grisbi_SOURCES = $(grisbi_sources) $(sources_config) $(grisbi_INCLUDES) $(libgrisbi_a_INCLUDES)
+
+SUBDIRS =
 
 if HAVE_CUNIT
-grisbi_SOURCES += $(cunit_sources)
+SUBDIRS += tests
 endif
 
 EXTRA_DIST = grisbi.desktop grisbi.keys grisbi.mime
@@ -319,6 +319,5 @@
 mime_DATA = grisbi.keys grisbi.mime
 
 if HAVE_PLUGINS
-SUBDIRS = plugins/gnucash plugins/ofx plugins/openssl
-
+SUBDIRS += plugins/gnucash plugins/ofx plugins/openssl
 endif

--- gsb_real_cunit.h DELETED ---

--- utils_dates_cunit.c DELETED ---

Index: main.c
===================================================================
RCS file: /cvsroot/grisbi/grisbi/src/main.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- main.c	4 May 2010 12:27:53 -0000	1.176
+++ main.c	4 May 2010 20:58:26 -0000	1.177
@@ -38,7 +38,6 @@
 #include "./tip.h"
 #include "./utils.h"
 #include "./gsb_assistant_first.h"
-#include "./main_cunit.h"
 #include "./gsb_file.h"
 #include "./gsb_file_config.h"
 #include "./gsb_status.h"
@@ -125,7 +124,6 @@
 #endif
 
 #if IS_DEVELOPMENT_VERSION == 1
-    gsb_cunit_run_tests();
     initialize_debugging();
 #endif