diff -r d8475431bbbb -r 8e85e6bbefdf Makefile.am
--- a/Makefile.am	Sat May 21 21:04:57 2005 +0000
+++ b/Makefile.am	Mon May 23 04:48:14 2005 +0000
@@ -9,7 +9,10 @@
 if WANT_DOCS
   MAYBE_DOC = doc
 endif
-SUBDIRS = src $(MAYBE_DOC)
+if WANT_GUI
+  MAYBE_GUI = gui
+endif
+SUBDIRS = lemon benchmark demo test $(MAYBE_GUI) $(MAYBE_DOC)
 
 MRPROPERFILES = \
 	aclocal.m4 \
@@ -26,19 +29,18 @@
 	config/mkinstalldirs \
 	doc/Makefile.in \
 	doc/doxygen.log \
-	src/Makefile.in \
-	src/lemon/Makefile.in \
-	src/test/Makefile.in \
-	src/benchmark/Makefile.in \
-	src/demo/Makefile.in \
-	src/gui/Makefile.in \
-	src/gui/src/Makefile.in
+	Makefile.in \
+	lemon/Makefile.in \
+	test/Makefile.in \
+	benchmark/Makefile.in \
+	demo/Makefile.in \
+	gui/Makefile.in
 
 docs:
 	$(MAKE) -C doc $(AM_MAKEFLAGS) clean html
 
 benchmark:
-	$(MAKE) -C src/benchmark $(AM_MAKEFLAGS)
+	$(MAKE) -C benchmark $(AM_MAKEFLAGS)
 
 mrproper:
 	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean