[Simplemail-cvs] simplemail/tests makefile,1.40,1.41

[Sebastian B. <sb...@us...>]

Update of /cvsroot/simplemail/simplemail/tests
In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv32453/tests

Modified Files:
	makefile 
Log Message:
Renamed dovecot-conf to dovecot-default-conf and dovecot to dovecot-conf.


Index: makefile
===================================================================
RCS file: /cvsroot/simplemail/simplemail/tests/makefile,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- makefile	24 Dec 2013 09:23:20 -0000	1.40
+++ makefile	24 Dec 2013 09:23:38 -0000	1.41
@@ -78,8 +78,8 @@
 .PHONY: dovecot-bin
 dovecot-bin: $(DOVECOT_DIR)-root
 
-.PHONY: dovecot
-dovecot: dovecot-bin
+.PHONY: dovecot-conf
+dovecot-conf: dovecot-bin
 	mkdir -p $(DOVECOT_DIR)-root/home/test
 	rm -Rf $(DOVECOT_DIR)-root/etc/dovecot
 	cp -R dovecot-conf -Rf $(DOVECOT_DIR)-root/etc/dovecot
@@ -95,7 +95,8 @@
 	echo '}' >>$(DOVECOT_DIR)-root/etc/dovecot/conf.d/00-passwd.conf
 	echo 'test:{plain}test::::$(DOVECOT_ABSDIR)-root/home/test::userdb_mail=maildir:~/Maildir' >$(DOVECOT_DIR)-root/etc/dovecot/passwd
 
-dovecot-conf: dovecot-bin
+.PHONY: dovecot-default-conf
+dovecot-default-conf: dovecot-bin
 	cp -R $(DOVECOT_DIR)-root/share/doc/dovecot/example-config $(DOVECOT_DIR)-root/etc/dovecot
 
 .PHONY: dovecot-start
@@ -107,7 +108,7 @@
 	$(DOVECOT) stop
 
 .PHONY: imap-testsuite
-imap-testsuite: dovecot imap2_unittest
+imap-testsuite: dovecot-conf imap2_unittest
 	-$(DOVECOT) stop
 	$(DOVECOT)
 	sleep 2
@@ -119,7 +120,7 @@
 
 # run template
 define run.tmpl
-run-$(1): $(1) $(if $(findstring imap,$(1)), dovecot)
+run-$(1): $(1) $(if $(findstring imap,$(1)), dovecot-conf)
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 	./$$<
@@ -133,7 +134,7 @@
 
 # memleaks template
 define memleak.tmpl
-memleaks-$(1): $(1) $(if $(findstring imap,$(1)), dovecot)
+memleaks-$(1): $(1) $(if $(findstring imap,$(1)), dovecot-conf)
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML
@@ -155,7 +156,7 @@
 
 # helgrind template
 define helgrind.tmpl
-helgrind-$(1): $(1) $(if $(findstring imap,$(1)), dovecot)
+helgrind-$(1): $(1) $(if $(findstring imap,$(1)), dovecot-conf)
 	$(if $(findstring imap,$(1)), -$(DOVECOT) stop)
 	$(if $(findstring imap,$(1)), $(DOVECOT))
 ifdef USE_VALGRIND_XML