diff --git a/grauph/src/Makefile.am b/grauph/src/Makefile.am
index db353658..4c02c4c5 100644
--- a/grauph/src/Makefile.am
+++ b/grauph/src/Makefile.am
@@ -1,16 +1,3 @@
-SUBDIRS =
+SUBDIRS = libs progs
 DIST_SUBDIRS = common
 
-if BUILD_ENGINE
-SUBDIRS += engine 
-endif
-
-if BUILD_CONSOLE_CLIENTS
-SUBDIRS += clients 
-endif
-
-if BUILD_GTK_CLIENT
-SUBDIRS += clients 
-endif
-
-
diff --git a/grauph/src/progs/Makefile.am b/grauph/src/progs/Makefile.am
index 685976dc..ad10dcf6 100644
--- a/grauph/src/progs/Makefile.am
+++ b/grauph/src/progs/Makefile.am
@@ -3,10 +3,11 @@ AM_CXXFLAGS = -I$(top_srcdir)/src/common -fno-exceptions -fno-rtti
 SUBDIRS = . python supercollider
 
 if BUILD_CONSOLE_CLIENTS
-SUBDIRS += patch_loader patches demolition
+SUBDIRS += patch_loader demolition
 endif
 
 if BUILD_GTK_CLIENT
 SUBDIRS += gtk
 endif
 
+