diff --git a/Makefile b/Makefile
index 549f5409..421f595f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,9 +1,30 @@
 MODDIR=.
 
+SUBDIRS = inst/pre \
+		make \
+		doc \
+		debug misc slog platform \
+		devutil \
+		hash \
+		hexdump \
+		lbuffer \
+		debug \
+		cfgfile gtopts \
+		lock sigsync shmem \
+		usrv uclnt statecheck msgfmt \
+		YMisc YError \
+		YThread YMutex YEvent YCbContr contr/Y2WayMap \
+		YTimeB YStopWatch YStopWatchList YStopWatchQueue YStopWatchThreadList \
+		lib include bin \
+		inst/post
+
+ifneq ($(wildcard $(MODDIR)/make/defs.mk),)
 include $(MODDIR)/make/defs.mk
-SUBDIRS = $(REQUIRED)
+endif
+
 include $(MODDIR)/make/rules.mk
 include $(MODDIR)/make/rpmdist.mk
+include $(MODDIR)/make/autoconf.mk
 
 all:
 	$(make_subdirs_target)