diff --git a/src/Makefile b/src/Makefile
index f605fa7b9..c4f56ab0b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -3,12 +3,41 @@
 #
 
 TOP = ..
-include $(TOP)/config/CONFIG_BASE
+include $(TOP)/configure/CONFIG
 
 #
-# Directories to build defined in CONFIG_BASE
+# for c++ build add the dirs gdd and cas after ca
+# (and uncomment the c++ files in src/lbCom/Makefile.Unix)
 #
+# tools is present for compatibility with base/config rules
+DIRS += tools
+DIRS += include
+DIRS += cxxTemplates
+DIRS += toolsComm
+DIRS += makeBaseApp
+DIRS += osi
+DIRS += libCom
+DIRS += dbStatic
+DIRS += db
+DIRS += registry
+DIRS += bpt
+DIRS += ca
+DIRS += util
+DIRS += misc
+DIRS += sequencer
+DIRS += dbtools
+DIRS += rsrv
+DIRS += rec
+DIRS += as
+DIRS += dev
+#FOR NOW JUST BUILD vxWorks dependent stuff
+DIRS += vxWorks
 
- 
-include $(TOP)/config/RULES_DIRS
+#
+# if CPLUSPLUS isnt empty then include C++ src codes
+#
+DIRS += $(patsubst %,gdd,$(strip $(CPLUSPLUS)))
+DIRS += $(patsubst %,cas,$(strip $(CPLUSPLUS)))
+
+include $(TOP)/configure/RULES_DIRS