(no subject)

[Daniel Reed]

On Thu, 24 Mar 2005, Daniel Reed wrote:
>                 rm $DEST || exit 1 ;                            \
>         done ;                                                  \
>         REVERSEDIRS= ;                                          \
>         for D in data data/valid-messages data/invalid-messages data/incomplete-messages data/auth data/sha-1 data/valid-config-files data/valid-config-files/basic.d data/valid-config-files/system.d data/valid-service-files data/invalid-config-files data/equiv-config-files data/equiv-config-files/basic data/equiv-config-files/basic/basic.d data/equiv-config-files/entities data/equiv-config-files/entities/basic.d; do                             \
>                 REVERSEDIRS="$D $REVERSEDIRS" ;         \
>         done ;                                                  \
>         for D in $REVERSEDIRS; do                               \
>                 rmdir ../test/$D || exit 1 ;                    \
>         done ;                                                  \
> fi
> make[2]: *** [clean-local] Error 1

Actually, this kind of cleanup should probably only be done for a
distclean, as it destroys files that are generated at ./configure time
(not at build time), making it so you can make check after running
./configure until the first time you make clean.

-- 
Daniel Reed <n at ml.org>	http://naim-users.org/nmlorg/	http://naim.n.ml.org/
"I don't believe in making something user friendly just for the sake of
being user friendly, though; if you're decreasing the users' available
power, you're not really being all that friendly to them."
-------------- next part --------------
Index: test/Makefile.am
===================================================================
RCS file: /cvs/dbus/dbus/test/Makefile.am,v
retrieving revision 1.35
diff -u -r1.35 Makefile.am
--- test/Makefile.am	15 Jan 2005 07:15:38 -0000	1.35
+++ test/Makefile.am	24 Mar 2005 07:14:28 -0000
@@ -111,7 +111,7 @@
 	chmod u+w $(top_builddir)/test/data/valid-config-files/*.conf || exit 1
 
 ## this doesn't clean generated test data files when srcdir=builddir
-clean-local:
+distclean-local:
 	if test $(srcdir) != . ; then					\
 		FILES=`(cd $(top_builddir)/test && $(FIND_TESTS))` ;	\
 	        for F in $$FILES; do					\
@@ -124,6 +124,6 @@
 			REVERSEDIRS="$$D $$REVERSEDIRS" ;		\
 		done ;							\
 		for D in $$REVERSEDIRS; do				\
-			rmdir $(top_builddir)/test/$$D || exit 1 ;	\
+			test -d $(top_builddir)/test/$$D && (rmdir $(top_builddir)/test/$$D || exit 1) || true ;	\
 		done ;							\
 	fi