diff -r d47ebd34e581 -r 12e0db6b7d0e Makefile.am
--- a/Makefile.am	Sun Dec 18 01:51:03 2005 +0000
+++ b/Makefile.am	Sun Dec 18 03:01:53 2005 +0000
@@ -5,9 +5,7 @@
 	lemon.spec \
 	autopackage/default.apspec.in \
 	config/lx_check_cplex.m4 \
-	config/lx_check_glpk.m4 \
-	config/lx_enable_doc.m4 \
-	config/lx_enable_gui.m4
+	config/lx_check_glpk.m4
 
 if WANT_DOC
   MAYBE_DOC = doc
@@ -15,8 +13,14 @@
 if WANT_GUI
   MAYBE_GUI = gui
 endif
+if WANT_DEMO
+  MAYBE_DEMO = demo
+endif
+if WANT_BENCHMARK
+  MAYBE_BENCHMARK = benchmark
+endif
 
-SUBDIRS = lemon benchmark demo $(MAYBE_GUI) $(MAYBE_DOC) test
+SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
 
 MRPROPERFILES = \
 	aclocal.m4 \