diff --git a/builds/posix/Makefile.in.codes b/builds/posix/Makefile.in.codes
index af005d56bc..04bfbb28f7 100644
--- a/builds/posix/Makefile.in.codes
+++ b/builds/posix/Makefile.in.codes
@@ -29,7 +29,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.codes,v 1.6 2003-07-06 01:51:48 brodsom Exp $
+#  $Id: Makefile.in.codes,v 1.7 2003-07-08 01:05:22 brodsom Exp $
 #
 ROOT=..
 ObjModuleName=codes
@@ -68,7 +68,7 @@ generated_headers: build_codes include/gen/ids.h
 build_codes: $(BIN)/codes msg.fdb
 	$(BIN)/codes include/gen
 
-$(SRC)/jrd/codes.cpp: $(SRC)/jrd/codes.epp
+$(SRC_ROOT)/jrd/codes.cpp: $(SRC_ROOT)/jrd/codes.epp
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 
 $(BIN)/codes: $(CODES_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
diff --git a/builds/posix/Makefile.in.example5 b/builds/posix/Makefile.in.example5
index 9b1bf46779..023bea02fc 100644
--- a/builds/posix/Makefile.in.example5
+++ b/builds/posix/Makefile.in.example5
@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: Makefile.in.example5,v 1.6 2003-04-10 06:34:23 eku Exp $
+#   $Id: Makefile.in.example5,v 1.7 2003-07-08 01:05:22 brodsom Exp $
 # 
 
 ROOT=../..
@@ -138,14 +138,14 @@ nt_examples:
 
 employee.fdb:	empbuild$(EXEC_EXT) $(INPUT_FILES)
 	-$(RM) employee.fdb
-#	$(CP) $(SOURCE)/examples/empddl.sql .
-#	$(CP) $(SOURCE)/examples/indexoff.sql .
-#	$(CP) $(SOURCE)/examples/indexon.sql .
-#	$(CP) $(SOURCE)/examples/empdml.sql .
-#	$(CP) $(SOURCE)/examples/lang.inp .
-#	$(CP) $(SOURCE)/examples/proj.inp .
-#	$(CP) $(SOURCE)/examples/job.inp .
-#	$(CP) $(SOURCE)/examples/qtr.inp .
+#	$(CP) $(SRC_ROOT)/examples/empddl.sql .
+#	$(CP) $(SRC_ROOT)/examples/indexoff.sql .
+#	$(CP) $(SRC_ROOT)/examples/indexon.sql .
+#	$(CP) $(SRC_ROOT)/examples/empdml.sql .
+#	$(CP) $(SRC_ROOT)/examples/lang.inp .
+#	$(CP) $(SRC_ROOT)/examples/proj.inp .
+#	$(CP) $(SRC_ROOT)/examples/job.inp .
+#	$(CP) $(SRC_ROOT)/examples/qtr.inp .
 	./empbuild employee.fdb
 	-$(CHMOD_6) employee.fdb
 
@@ -171,11 +171,11 @@ empbuild.fdb : empddl.sql empbld.sql
 
 intlemp.fdb:	intlbld$(EXEC_EXT) $(INTL_FILES)
 	-$(RM) intlemp.fdb
-#	$(CP) $(SOURCE)/examples/intlddl.sql .
-#	$(CP) $(SOURCE)/examples/indexoff.sql .
-#	$(CP) $(SOURCE)/examples/indexon.sql .
-#	$(CP) $(SOURCE)/examples/intldml.sql .
-#	$(CP) $(SOURCE)/examples/lang.inp .
+#	$(CP) $(SRC_ROOT)/examples/intlddl.sql .
+#	$(CP) $(SRC_ROOT)/examples/indexoff.sql .
+#	$(CP) $(SRC_ROOT)/examples/indexon.sql .
+#	$(CP) $(SRC_ROOT)/examples/intldml.sql .
+#	$(CP) $(SRC_ROOT)/examples/lang.inp .
 	./intlbld intlemp.fdb
 	-$(CHMOD_6) intlemp.fdb
 
diff --git a/builds/posix/Makefile.in.firebird b/builds/posix/Makefile.in.firebird
index 5db2c497b4..196e07b5a0 100644
--- a/builds/posix/Makefile.in.firebird
+++ b/builds/posix/Makefile.in.firebird
@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.firebird,v 1.36 2003-04-10 06:34:24 eku Exp $
+#  $Id: Makefile.in.firebird,v 1.37 2003-07-08 01:05:22 brodsom Exp $
 #
 
 ROOT=..
@@ -169,12 +169,12 @@ firebird_boot: updateBuildNum boot_phase1 boot_phase2
 
 .PHONY: updateBuildNum external_libraries
 
-updateBuildNum : jrd/build_no.h $(MAKE_ROOT)/Make.Version
+updateBuildNum : jrd/build_no.h $(GEN_ROOT)/Make.Version
 
 jrd/build_no.h : misc/writeBuildNum.sh
 	(cd ..; ./src/misc/writeBuildNum.sh rebuildHeader)
 
-$(MAKE_ROOT)/Make.Version : misc/writeBuildNum.sh
+$(GEN_ROOT)/Make.Version : misc/writeBuildNum.sh
 	misc/writeBuildNum.sh createMakeVersion $@
 
 
@@ -191,7 +191,7 @@ endif
 external_libraries: $(EXTERNAL_LIBRARIES)
 
 $(LIBEDITLINE_A): 
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.extern.editline
+	$(MAKE) -f $(GEN_ROOT)/Makefile.extern.editline
 
 
 #---------------------------------------------------------------------------
@@ -221,20 +221,20 @@ boot_phase1_build: libfbcommon gpre_boot libfbstatic gpre_static @MANAGER_PROCES
 
 
 libfbcommon:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbcommon $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbcommon $@
 
 gpre_boot:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.boot.gpre $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.boot.gpre $@
 
 libfbstatic:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbstatic $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbstatic $@
 
 gpre_static:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.static.gpre $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.gpre $@
 
                              # The lock manager for classic (embedded) 
 lock_mgr :
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.lockmgr $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.lockmgr $@
 
 
 
@@ -264,19 +264,19 @@ $(ISC_GDB):
 boot_phase2_build: create_db empty_db gbak_static isql_static
 
 create_db:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.util $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $@
 
 gbak_static: @MANAGER_PROCESS_TARGET@
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.static.gbak $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.gbak $@
 
 isql_static: 
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.static.isql $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.static.isql $@
 
 empty_db :
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.refDatabases $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.refDatabases $@
 
 ref_databases : gbak_static
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.refDatabases $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.refDatabases $@
 
 
 security.fdb: gdef isql 		# build the security database
@@ -306,19 +306,19 @@ basic_targets: ref_databases msgs msgs_intl generated_headers intl extlib includ
 
 # hack to make code regeneration work
 generated_headers :
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.codes $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.codes $@
 
 msgs:                  # messages file for user $(FIREBIRD)/firebird.msg
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.msgs $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.msgs $@
 
 msgs_intl:             # international version of msgs file
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.msgs $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.msgs $@
 
 intl:                  # international lang components $(FIREBIRD)/intl/
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.intl
+	$(MAKE) -f $(GEN_ROOT)/Makefile.intl
 
 extlib:                # external programs than can be called
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.extlib
+	$(MAKE) -f $(GEN_ROOT)/Makefile.extlib
 
                        # distribution header include files
 includes:	include_generic 
@@ -326,7 +326,7 @@ includes:	include_generic
                        # examples still need a good makefile to ship with them
 examples:
 	$(MAKE) -C ../gen/v5_examples -f ../Makefile.v5_examples
-#	$(MAKE) -f $(MAKE_ROOT)/Makefile.v5_examples
+#	$(MAKE) -f $(GEN_ROOT)/Makefile.v5_examples
 
 otherfiles: misc_files script_files
 
@@ -340,31 +340,31 @@ classic_targets: libfbembed inet_server embed_gfix embed_gbak embed_isql \
 	embed_gpre embed_util embed_gdef embed_qli
 
 libfbembed:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbembed $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbembed $@
 
 inet_server:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.inet_server
+	$(MAKE) -f $(GEN_ROOT)/Makefile.inet_server
 
 embed_gfix:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.gfix
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.gfix
 
 embed_gbak:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.gbak
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.gbak
 
 embed_isql:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.isql
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.isql
 
 embed_gpre:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.gpre
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.gpre
 
 embed_util:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.util	
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util	
 
 embed_gdef:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.gdef
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.gdef
 
 embed_qli:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.qli
+	$(MAKE) -f $(GEN_ROOT)/Makefile.embed.qli
 
 
 #_ Firebird Server Targets (super and super client)__________________________
@@ -376,34 +376,34 @@ super_targets: libfbserver fbserver libfbclient client_gfix client_gbak \
 			client_isql client_gpre client_util # client_gdef
 
 libfbserver:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbserver $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbserver $@
 
 fbserver:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.fbserver $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.fbserver $@
 
 libfbclient:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbclient $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.libfbclient $@
 
 client_gfix:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.client.gfix
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.gfix
 
 client_gbak:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.client.gbak
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.gbak
 
 client_gpre:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.client.gpre
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.gpre
 
 client_isql:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.client.isql
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.isql
 
 client_util:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.client.util	
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.util	
 
 # Not sure we need this target in super - problems with WAL includes
 # MOD 04-Oct-2002
 
 client_gdef:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.client.gdef
+	$(MAKE) -f $(GEN_ROOT)/Makefile.client.gdef
 
 
 
@@ -536,7 +536,7 @@ $(BIN)/% :: $(SRC_ROOT)/install/misc/%
 .PHONY: install package packages dist
 
 install package packages dist:
-	$(MAKE) -f $(MAKE_ROOT)/Makefile.install $@
+	$(MAKE) -f $(GEN_ROOT)/Makefile.install $@
 
 
 #___________________________________________________________________________
diff --git a/builds/posix/Makefile.in.gpre b/builds/posix/Makefile.in.gpre
index 61533a99f9..8d53162c0b 100644
--- a/builds/posix/Makefile.in.gpre
+++ b/builds/posix/Makefile.in.gpre
@@ -29,7 +29,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.gpre,v 1.7 2003-03-27 11:21:45 aafemt Exp $
+#  $Id: Makefile.in.gpre,v 1.8 2003-07-08 01:05:22 brodsom Exp $
 #
 ROOT=../..
 
@@ -100,7 +100,7 @@ $(GPRE):$(GPRECommon_Objects) $(GPRE_Objects) $(LIBGDS_DEP)
 
 
 # gpre_meta needs a special boot build since there is no database.
-$(SRC)/gpre_meta.cpp:  $(SRC)/gpre_meta.epp
+$(SRC_ROOT)/gpre_meta.cpp:  $(SRC_ROOT)/gpre_meta.epp
 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
 
 
diff --git a/builds/posix/Makefile.in.v5_examples b/builds/posix/Makefile.in.v5_examples
index c6b464adb8..a9fe368bbb 100644
--- a/builds/posix/Makefile.in.v5_examples
+++ b/builds/posix/Makefile.in.v5_examples
@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: Makefile.in.v5_examples,v 1.8 2003-04-08 10:09:05 aafemt Exp $
+#  $Id: Makefile.in.v5_examples,v 1.9 2003-07-08 01:05:22 brodsom Exp $
 #
 ROOT=../..
 ObjModuleName=v5_examples
@@ -52,7 +52,7 @@ export PATH
 GPRE_FLAGS=	-r -m -z -n
 
 EXAMPLES_DEST=	$(FIREBIRD)/examples/v5/
-EXAMPLES_SRC=	$(SRC)/v5_examples/
+EXAMPLES_SRC=	$(SRC_ROOT)/v5_examples/
 
 
 EMPBLD_Objects=	empbuild.o
@@ -138,11 +138,11 @@ empbuild.fdb : $(EXAMPLES_SRC)empddl.sql $(EXAMPLES_SRC)empbld.sql
 
 intlemp.fdb:	intlbld$(EXEC_EXT) $(INTL_FILES)
 	-$(RM) intlemp.fdb
-#	$(CP) $(SOURCE)/examples/intlddl.sql .
-#	$(CP) $(SOURCE)/examples/indexoff.sql .
-#	$(CP) $(SOURCE)/examples/indexon.sql .
-#	$(CP) $(SOURCE)/examples/intldml.sql .
-#	$(CP) $(SOURCE)/examples/lang.inp .
+#	$(CP) $(SRC_ROOT)/examples/intlddl.sql .
+#	$(CP) $(SRC_ROOT)/examples/indexoff.sql .
+#	$(CP) $(SRC_ROOT)/examples/indexon.sql .
+#	$(CP) $(SRC_ROOT)/examples/intldml.sql .
+#	$(CP) $(SRC_ROOT)/examples/lang.inp .
 	./intlbld intlemp.fdb
 	-$(CHMOD_6) intlemp.fdb
 
@@ -164,11 +164,11 @@ intlbld.c:	intlbuild.fdb intlbld.e
 
 
 
-%.sql:: $(SRC)/v5_examples/%.sql
+%.sql:: $(SRC_ROOT)/v5_examples/%.sql
 	$(CP) $^ $@
 
-%.inp:: $(SRC)/v5_examples/%.inp
+%.inp:: $(SRC_ROOT)/v5_examples/%.inp
 	$(CP) $^ $@
 
-%.e:: $(SRC)/v5_examples/%.e
+%.e:: $(SRC_ROOT)/v5_examples/%.e
 	$(CP) $^ $@
diff --git a/builds/posix/make.defaults b/builds/posix/make.defaults
index 6d5470a4c6..50e2b6218e 100755
--- a/builds/posix/make.defaults
+++ b/builds/posix/make.defaults
@@ -26,7 +26,7 @@
 #   Contributor(s):
 # 
 # 
-#   $Id: make.defaults,v 1.23 2003-05-25 00:04:15 skidder Exp $
+#   $Id: make.defaults,v 1.24 2003-07-08 01:05:22 brodsom Exp $
 # 
 
 
@@ -41,11 +41,10 @@
 
 #_____________________________________________________________________________
 
+TMP_ROOT=$(ROOT)/temp
 GEN_ROOT=$(ROOT)/gen
 SRC_ROOT=$(ROOT)/src
 
-MAKE_ROOT=$(GEN_ROOT)
-
 FIREBIRD=$(GEN_ROOT)/firebird
 INTERBASE=$(FIREBIRD)
 
@@ -63,21 +62,13 @@ RealSrcRootPath = $(shell cd $(SRC_ROOT); pwd)
 #ModuleName:=$(notdir $(CURDIR))
 ModuleName:=$(subst $(RealSrcRootPath)/,,$(CURDIR))
 
-SRC=$(SRC_ROOT)
-#SRC=$(SRC_ROOT)/$(ModuleName)
-
-OBJ=$(GEN_ROOT)/$(ObjModuleName)
-DEP=$(OBJ)
+OBJ=$(TMP_ROOT)/$(ObjModuleName)
 
 GEN_SRC=$(OBJ)
 
   # This one is not so widely used at the momement.
   # but I would like it to become so.
 
-
-# I would like to remove this one.
-SOURCE=$(ROOT)/src
-
 #RealFirebirdPath = $(shell cd $(FIREBIRD); pwd)
 RealFirebirdPath = @NEW_FIREBIRD_DIR@
 
diff --git a/builds/posix/make.rules b/builds/posix/make.rules
index e2787e20a5..606ac5a9c5 100644
--- a/builds/posix/make.rules
+++ b/builds/posix/make.rules
@@ -26,7 +26,7 @@
 #   Contributor(s):
 #
 #
-#   $Id: make.rules,v 1.18 2003-05-25 00:07:30 skidder Exp $
+#   $Id: make.rules,v 1.19 2003-07-08 01:05:22 brodsom Exp $
 #
 
 #____________________________________________________________________________
@@ -177,11 +177,11 @@ DSQL_GPRE_FLAGS =  -lang_internal -r -m -z -n
 	$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
 
 
-$(SRC)/jrd/%.cpp:: $(SRC)/jrd/%.epp 
+$(SRC_ROOT)/jrd/%.cpp:: $(SRC_ROOT)/jrd/%.epp 
 	$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
 
 
-$(SRC)/dsql/%.cpp:: $(SRC)/dsql/%.epp 
+$(SRC_ROOT)/dsql/%.cpp:: $(SRC_ROOT)/dsql/%.epp 
 	$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
 
 
@@ -201,11 +201,11 @@ $(SRC)/dsql/%.cpp:: $(SRC)/dsql/%.epp
 #
 
 
-$(OBJ)/%.o:: $(SRC)/%.c 
+$(OBJ)/%.o:: $(SRC_ROOT)/%.c 
 	$(CC) $(CXXFLAGS) -c $(firstword $<) -o $@
 	@$(move-dep)
 
-$(OBJ)/%.o: $(SRC)/%.cpp 
+$(OBJ)/%.o: $(SRC_ROOT)/%.cpp 
 	$(CXX) $(CXXFLAGS) -c $(firstword $<) -o $@
 	@$(move-dep)
 
@@ -213,14 +213,14 @@ $(GEN_ROOT)/%.o: $(SRC_ROOT)/%.cpp
 	$(CXX) $(CXXFLAGS) -c $(firstword $<) -o $@
 	@$(move-dep)
 
-$(OBJ)/%.lo: $(SRC)/%.cpp 
+$(OBJ)/%.lo: $(SRC_ROOT)/%.cpp 
 	@$(move-dep)
 
 #$(OBJ)/%
 #.epp.cpp:
 #	$(GPRE_STATIC) $(GPRE_FLAGS) $<
 
-$(OBJ)/%.o: $(DEP)/%.d
+$(OBJ)/%.o: $(OBJ)/%.d
 
 .SUFFIXES: .epp .e
 
@@ -228,17 +228,17 @@ $(OBJ)/%.o: $(DEP)/%.d
 # since the .d file was just created then it will force a compile of the
 # .cpp files
 
-$(DEP)/%.d:: $(SRC)/%.c
+$(OBJ)/%.d:: $(SRC_ROOT)/%.c
 	@$(ECHO) "need to rebuild $^"
 	$(ECHO) $(OBJ)/$(*).o " : FORCE" > $@
 #	$(TOUCH) $^
 
-$(DEP)/%.d:: $(SRC)/%.epp
+$(OBJ)/%.d:: $(SRC_ROOT)/%.epp
 	@$(ECHO) "need to rebuild $^"
 	$(ECHO) $(OBJ)/$(*).o " : FORCE" > $@
 #	$(TOUCH) $^
 
-$(DEP)/%.d:: $(SRC)/%.cpp
+$(OBJ)/%.d:: $(SRC_ROOT)/%.cpp
 	@$(ECHO) "need to rebuild $^"
 	$(ECHO) $(OBJ)/$(*).o " : FORCE" > $@
 #	$(TOUCH) $^
diff --git a/builds/posix/make.shared.targets b/builds/posix/make.shared.targets
index 029d946c69..de0784a162 100644
--- a/builds/posix/make.shared.targets
+++ b/builds/posix/make.shared.targets
@@ -27,7 +27,7 @@
 #  Contributor(s):
 # 
 #
-#  $Id: make.shared.targets,v 1.12 2003-07-02 19:02:49 brodsom Exp $
+#  $Id: make.shared.targets,v 1.13 2003-07-08 01:05:22 brodsom Exp $
 #
 
 
@@ -44,25 +44,23 @@
 # The intermediate files dsql.tab.c dsql.tab.h and parse.cpp are generated 
 # and are also stored in the CVS tree. MOD 7-Oct-2002
 
-$(SRC)/dsql/parse.cpp: $(SRC)/dsql/parse.y $(SRC)/dsql/parse.sed
+$(SRC_ROOT)/dsql/parse.cpp: $(SRC_ROOT)/dsql/parse.y $(SRC_ROOT)/dsql/parse.sed
 	$(YACC) -l -d $<
-	$(MV) $(SRC)/y.tab.c $(SRC)/dsql/dsql.tab.c
-	$(MV) $(SRC)/y.tab.h $(SRC)/dsql/dsql.tab.h
-	sed -e 's/\\r//g' $(SRC)/dsql/parse.sed > $(SRC)/dsql/parse2.sed
-	sed -f $(SRC)/dsql/parse2.sed <$(SRC)/dsql/dsql.tab.c > $@  
-	-$(RM) $(SRC)/dsql/parse2.sed
+	$(MV) $(SRC_ROOT)/y.tab.c $(SRC_ROOT)/dsql/dsql.tab.c
+	$(MV) $(SRC_ROOT)/y.tab.h $(SRC_ROOT)/dsql/dsql.tab.h
+	sed -e 's/\\r//g' $(SRC_ROOT)/dsql/parse.sed > $(SRC_ROOT)/dsql/parse2.sed
+	sed -f $(SRC_ROOT)/dsql/parse2.sed <$(SRC_ROOT)/dsql/dsql.tab.c > $@  
+	-$(RM) $(SRC_ROOT)/dsql/parse2.sed
 
 
 
 
 # gpre_meta needs a special boot build since there is no database.
 
-$(SRC)/gpre/gpre_meta.cpp:  $(SRC)/gpre/gpre_meta.epp
+$(SRC_ROOT)/gpre/gpre_meta.cpp:  $(SRC_ROOT)/gpre/gpre_meta.epp
 	$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
 
 
-
-
 buildb: security.fdb yachts.lnk help.fdb
 
 security.fdb : $(ISC_GDB)
@@ -77,17 +75,17 @@ help.fdb:
 
 
 # These need to change to $(GEN_SRC) at some stage
-$(SRC)/dudley/exe.cpp $(SRC)/dudley/extract.epp:      yachts.lnk
+$(SRC_ROOT)/dudley/exe.cpp $(SRC_ROOT)/dudley/extract.epp:      yachts.lnk
 
-$(SRC)/qli/meta.cpp $(SRC)/qli/proc.cpp $(SRC)/qli/show.cpp: yachts.lnk
-$(SRC)/qli/help.cpp:        help.fdb
+$(SRC_ROOT)/qli/meta.cpp $(SRC_ROOT)/qli/proc.cpp $(SRC_ROOT)/qli/show.cpp: yachts.lnk
+$(SRC_ROOT)/qli/help.cpp:        help.fdb
 
 # Explicit dependence on generated header
-$(OBJ)/jrd/par.o:	$(SRC)/include/gen/blrtable.h
+$(OBJ)/jrd/par.o:	$(SRC_ROOT)/include/gen/blrtable.h
 
 # Rebuild blrtable.h
-$(SRC)/include/gen/blrtable.h: $(BLRTABLE)
-	$(BLRTABLE) > $(SRC)/include/gen/blrtable.h
+$(SRC_ROOT)/include/gen/blrtable.h: $(BLRTABLE)
+	$(BLRTABLE) > $(SRC_ROOT)/include/gen/blrtable.h
 
 $(BLRTABLE): $(BLRTABLE_Objects)
 	$(CXX) $(LINK_OPTS) $(BLRTABLE_Objects) -o $@ -L $(LIB) -lfbcommon $(LINK_LIBS)
diff --git a/builds/posix/make.shared.variables b/builds/posix/make.shared.variables
index ab508715ea..dc2d3547cc 100644
--- a/builds/posix/make.shared.variables
+++ b/builds/posix/make.shared.variables
@@ -300,4 +300,4 @@ LIBFBSTATIC_Objects = $(OS_SPECIFIC_Objects) \
 # blrtable builder
 
 BLRTABLE_Sources = jrd/blrtable.cpp
-BLRTABLE_Objects = $(addprefix $(GEN_ROOT)/, $(addsuffix .o, $(basename $(BLRTABLE_Sources))))
+BLRTABLE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(BLRTABLE_Sources))))
diff --git a/builds/posix/prefix.solaris b/builds/posix/prefix.solaris
index 25f7dbf710..6b4b44d1b0 100644
--- a/builds/posix/prefix.solaris
+++ b/builds/posix/prefix.solaris
@@ -33,7 +33,7 @@ LOCAL_LDFLAGS=@LDFLAGS@
 
 # if we keep sfio this needs to be set by configure (or move in to extern directory)
 # must use full sfio not stdio emulation to get file handle number fix
-#SFIO_DIR=$(SRC)/../../../sfio/sfio_2002
+#SFIO_DIR=$(SRC_ROOT)/../../../sfio/sfio_2002
 #SFIO_DIR=/data01/fb-dev/sfio/sfio_2002
 #SFIO_FLAGS= -DSFIO -I$(SFIO_DIR)/include
 #SFIO_LDFLAGS= -L$(SFIO)/lib
diff --git a/clean.sh b/clean.sh
index 7cf68da1f1..219641574e 100644
--- a/clean.sh
+++ b/clean.sh
@@ -1,7 +1,8 @@
-echo Removing directories
+echo Removing temporary directories
 
 rm -Rf autom4te.cache 2>/dev/null
 rm -Rf gen 2>/dev/null
+rm -Rf temp 2>/dev/null
 
 echo Removing files in this directory
 
@@ -16,16 +17,18 @@ echo Removing files in src directory
 
 rm src/include/gen/autoconfig.h 2>/dev/null
 rm src/include/gen/blrtable.h 2>/dev/null
-rm src/indicator.* 2>/dev/null
-rm -f src/*.fdb 2>/dev/null
-rm -f src/*.FDB 2>/dev/null
-rm -f src/*.lnk 2>/dev/null
 rm src/Makefile 2>/dev/null
 rm builds/make.new/config/config.guess 2>/dev/null
 rm builds/make.new/config/config.sub 2>/dev/null
 rm builds/make.new/config/ltmain.sh 2>/dev/null
 rm src/v5_examples/Makefile 2>/dev/null
 
+# removing databases
+rm src/indicator.* 2>/dev/null
+rm -f src/*.fdb 2>/dev/null
+rm -f src/*.FDB 2>/dev/null
+rm -f src/*.lnk 2>/dev/null
+
 # Cpp from epp files
 rm src/burp/backup.cpp 2>/dev/null
 rm src/burp/restore.cpp 2>/dev/null
@@ -33,6 +36,9 @@ rm src/dsql/array.cpp 2>/dev/null
 rm src/dsql/blob.cpp 2>/dev/null
 rm src/dsql/metd.cpp 2>/dev/null
 rm src/gpre/gpre_meta.cpp 2>/dev/null
+rm src/isql/extract.cpp 2>/dev/null
+rm src/isql/isql.cpp 2>/dev/null
+rm src/isql/show.cpp 2>/dev/null
 rm src/jrd/codes.cpp 2>/dev/null
 rm src/jrd/dfw.cpp 2>/dev/null
 rm src/jrd/dpm.cpp 2>/dev/null
@@ -47,7 +53,6 @@ rm src/jrd/ini.cpp 2>/dev/null
 rm src/jrd/met.cpp 2>/dev/null
 rm src/jrd/pcmet.cpp 2>/dev/null
 rm src/jrd/scl.cpp 2>/dev/null
-rm src/jrd/ 2>/dev/null
 rm src/msgs/build_file.cpp 2>/dev/null
 rm src/msgs/change_msgs.cpp 2>/dev/null
 rm src/msgs/check_msgs.cpp 2>/dev/null
diff --git a/configure.in b/configure.in
index 4d0b0f5508..1b6d65b657 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.140 2003-07-06 01:08:33 brodsom Exp $
+dnl $Id: configure.in,v 1.141 2003-07-08 01:04:52 brodsom Exp $
 
 dnl ############################# INITIALISATION ###############################
 
@@ -530,34 +530,24 @@ AC_SUBST(NEW_FIREBIRD_DIR)
 AC_DEFINE_UNQUOTED(FB_PREFIX, $(if test "x$prefix" = "xNONE" ; then echo \"$ac_default_prefix\"; else echo \"$prefix\"; fi))
 
 AC_CONFIG_COMMANDS(,,[
-mkdir -p gen/dudley
-mkdir -p gen/isql
-mkdir -p gen/lock
-mkdir -p gen/gpre
-mkdir -p gen/remote
-mkdir -p gen/wal
+dnl ### GEN ### directories for preprocessed cpp, databases and output
 mkdir -p gen/alice
-mkdir -p gen/refDatabases
-mkdir -p gen/v5_examples
-mkdir -p gen/journal
-mkdir -p gen/msgs
 mkdir -p gen/burp
 mkdir -p gen/dsql
-mkdir -p gen/extlib
-mkdir -p gen/intl
+mkdir -p gen/dudley
+mkdir -p gen/gpre
+mkdir -p gen/isql
 mkdir -p gen/jrd
+mkdir -p gen/msgs
 mkdir -p gen/qli
 mkdir -p gen/utilities
-mkdir -p gen/fbutil
-mkdir -p gen/codes
-mkdir -p gen/codes/jrd
+mkdir -p gen/v5_examples
 
-mkdir -p gen/install
-
-mkdir -p gen/common
-mkdir -p gen/common/classes
-mkdir -p gen/common/config
+dnl # some .o and .d in this directory (to be removed)
+mkdir -p gen/remote
 
+dnl # databases and output
+mkdir -p gen/refDatabases
 mkdir -p gen/firebird/include
 mkdir -p gen/firebird/intl
 mkdir -p gen/firebird/UDF
@@ -567,130 +557,108 @@ mkdir -p gen/firebird/lib
 mkdir -p gen/firebird/misc
 mkdir -p gen/firebird/help
 
-mkdir -p gen/jrd/os
-mkdir -p gen/jrd/os/darwin
-mkdir -p gen/jrd/os/posix
-mkdir -p gen/jrd/os/win32
-
-mkdir -p gen/libfbcommon
-mkdir -p gen/libfbcommon/classes
-dnl mkdir -p gen/libdsqlserver
-mkdir -p gen/libfbserver
-mkdir -p gen/libfbserver/jrd
-mkdir -p gen/libfbserver/dsql
-mkdir -p gen/libfbserver/lock
-mkdir -p gen/libfbserver/remote
-mkdir -p gen/libfbserver/pipe
-mkdir -p gen/libfbserver/gpre
-mkdir -p gen/libfbserver/alice
-mkdir -p gen/libfbserver/burp
-mkdir -p gen/libfbserver/utilities
-mkdir -p gen/libfbserver/fbutil
-mkdir -p gen/libfbserver/wal
-mkdir -p gen/libfbserver/common/classes
-mkdir -p gen/libfbserver/common/config
-mkdir -p gen/libfbserver/jrd/os/posix
-mkdir -p gen/libfbserver/jrd/os/win32
-mkdir -p gen/fbserver/remote
-mkdir -p gen/fbserver/ipserver
-mkdir -p gen/libfbclient/jrd
-mkdir -p gen/libfbclient/dsql
-mkdir -p gen/libfbclient/gpre
-mkdir -p gen/libfbclient/wal
-mkdir -p gen/libfbclient/remote
-mkdir -p gen/libfbclient/utilities
-mkdir -p gen/libfbclient/fbutil
-mkdir -p gen/libfbclient/common/classes
-mkdir -p gen/libfbclient/common/config
-mkdir -p gen/libfbclient/jrd/os/posix
-mkdir -p gen/libfbclient/jrd/os/win32
-mkdir -p gen/client.gbak/burp
-mkdir -p gen/client.gfix/alice
-mkdir -p gen/client.gpre/gpre
-mkdir -p gen/client.gdef/dudley
-mkdir -p gen/client.isql/isql
-mkdir -p gen/client.util/utilities
-mkdir -p gen/client.util/iscguard
-mkdir -p gen/client.util/remote
-mkdir -p gen/client.util/jrd/os/win32
-mkdir -p gen/intl/intl
-
-mkdir -p gen/libfbcommon/common/classes
-mkdir -p gen/libfbcommon/common/config
-mkdir -p gen/libfbcommon/fbutil
-mkdir -p gen/boot.gpre/jrd/os/posix
-mkdir -p gen/boot.gpre/jrd/os/darwin
-mkdir -p gen/boot.gpre/jrd/os/win32
-mkdir -p gen/boot.gpre/gpre
-mkdir -p gen/static.gpre
-mkdir -p gen/static.gpre/jrd
-mkdir -p gen/static.gpre/dsql
-mkdir -p gen/static.gpre/lock
-mkdir -p gen/static.gpre/remote
-mkdir -p gen/static.gpre/pipe
-mkdir -p gen/static.gpre/gpre
-mkdir -p gen/static.gpre/alice
-mkdir -p gen/static.gpre/utilities
-mkdir -p gen/static.gpre/fbutil
-mkdir -p gen/static.gpre/jrd/os/posix
-mkdir -p gen/static.gpre/jrd/os/win32
-mkdir -p gen/static.gpre/burp
-mkdir -p gen/static.gpre/wal
-mkdir -p gen/static.gbak/burp
-mkdir -p gen/static.isql/isql
-
-mkdir -p gen/libfbstatic
-mkdir -p gen/libfbstatic/jrd
-mkdir -p gen/libfbstatic/dsql
-mkdir -p gen/libfbstatic/lock
-mkdir -p gen/libfbstatic/remote
-mkdir -p gen/libfbstatic/pipe
-mkdir -p gen/libfbstatic/gpre
-mkdir -p gen/libfbstatic/alice
-mkdir -p gen/libfbstatic/utilities
-mkdir -p gen/libfbstatic/fbutil
-mkdir -p gen/libfbstatic/jrd/os/posix
-mkdir -p gen/libfbstatic/jrd/os/darwin
-mkdir -p gen/libfbstatic/jrd/os/win32
-mkdir -p gen/libfbstatic/burp
-mkdir -p gen/libfbstatic/wal
-mkdir -p gen/libfbstatic/common
-mkdir -p gen/libfbstatic/common/config
-mkdir -p gen/embed.lockmgr/lock
-mkdir -p gen/embed.util/utilities
-mkdir -p gen/embed.gbak/burp
-mkdir -p gen/embed.gfix/alice
-mkdir -p gen/embed.isql/isql
-mkdir -p gen/embed.gdef/dudley
-mkdir -p gen/embed.qli/qli
-mkdir -p gen/embed.gpre/gpre
-mkdir -p gen/inet_server/remote
-mkdir -p gen/inet_server/ipserver
-mkdir -p gen/msgs/msgs
-mkdir -p gen/extlib/extlib
-mkdir -p gen/extlib/extlib/fbudf
-mkdir -p gen/v5_examples/v5_examples
-
-mkdir -p gen/libfbembed
-mkdir -p gen/libfbembed/jrd
-mkdir -p gen/libfbembed/dsql
-mkdir -p gen/libfbembed/lock
-mkdir -p gen/libfbembed/remote
-mkdir -p gen/libfbembed/pipe
-mkdir -p gen/libfbembed/gpre
-mkdir -p gen/libfbembed/alice
-mkdir -p gen/libfbembed/utilities
-mkdir -p gen/libfbembed/fbutil
-mkdir -p gen/libfbembed/jrd/os/posix
-mkdir -p gen/libfbembed/jrd/os/win32
-mkdir -p gen/libfbembed/burp
-mkdir -p gen/libfbembed/wal
-mkdir -p gen/libfbembed/common/classes
-mkdir -p gen/libfbembed/common/config
 mkdir -p gen/RPM/RPMS/i686
 mkdir -p gen/RPM/BUILD
 
-mkdir -p gen/editline/extern/editline
+dnl #### TEMP ######### directories for .o and .d
+dnl # by module name
+
+mkdir -p temp/libfbserver
+mkdir -p temp/libfbserver/jrd
+mkdir -p temp/libfbserver/dsql
+mkdir -p temp/libfbserver/lock
+mkdir -p temp/libfbserver/remote
+mkdir -p temp/libfbserver/pipe
+mkdir -p temp/libfbserver/gpre
+mkdir -p temp/libfbserver/alice
+mkdir -p temp/libfbserver/burp
+mkdir -p temp/libfbserver/utilities
+mkdir -p temp/libfbserver/fbutil
+mkdir -p temp/libfbserver/wal
+mkdir -p temp/libfbserver/common/classes
+mkdir -p temp/libfbserver/common/config
+mkdir -p temp/libfbserver/jrd/os/posix
+mkdir -p temp/libfbserver/jrd/os/win32
+mkdir -p temp/fbserver/remote
+mkdir -p temp/fbserver/ipserver
+mkdir -p temp/libfbclient/jrd
+mkdir -p temp/libfbclient/dsql
+mkdir -p temp/libfbclient/gpre
+mkdir -p temp/libfbclient/remote
+mkdir -p temp/libfbclient/utilities
+mkdir -p temp/libfbclient/common/classes
+mkdir -p temp/libfbclient/common/config
+mkdir -p temp/libfbclient/jrd/os/posix
+mkdir -p temp/libfbclient/jrd/os/win32
+mkdir -p temp/client.gbak/burp
+mkdir -p temp/client.gfix/alice
+mkdir -p temp/client.gpre/gpre
+mkdir -p temp/client.gdef/dudley
+mkdir -p temp/client.isql/isql
+mkdir -p temp/client.util/utilities
+mkdir -p temp/client.util/iscguard
+mkdir -p temp/client.util/remote
+mkdir -p temp/client.util/jrd/os/win32
+mkdir -p temp/intl/intl
+
+mkdir -p temp/libfbcommon/common/classes
+mkdir -p temp/libfbcommon/common/config
+mkdir -p temp/boot.gpre/jrd/os/posix
+mkdir -p temp/boot.gpre/jrd/os/darwin
+mkdir -p temp/boot.gpre/jrd/os/win32
+mkdir -p temp/boot.gpre/gpre
+mkdir -p temp/static.gpre/gpre
+mkdir -p temp/static.gbak/burp
+mkdir -p temp/static.isql/isql
+
+mkdir -p temp/libfbstatic
+mkdir -p temp/libfbstatic/jrd
+mkdir -p temp/libfbstatic/dsql
+mkdir -p temp/libfbstatic/lock
+mkdir -p temp/libfbstatic/remote
+mkdir -p temp/libfbstatic/gpre
+mkdir -p temp/libfbstatic/jrd/os/posix
+mkdir -p temp/libfbstatic/jrd/os/darwin
+mkdir -p temp/libfbstatic/jrd/os/win32
+mkdir -p temp/libfbstatic/wal
+mkdir -p temp/libfbstatic/common/config
+
+mkdir -p temp/embed.lockmgr/lock
+mkdir -p temp/embed.util/utilities
+mkdir -p temp/embed.gbak/burp
+mkdir -p temp/embed.gfix/alice
+mkdir -p temp/embed.isql/isql
+mkdir -p temp/embed.gdef/dudley
+mkdir -p temp/embed.qli/qli
+mkdir -p temp/embed.gpre/gpre
+mkdir -p temp/inet_server/remote
+mkdir -p temp/inet_server/ipserver
+mkdir -p temp/msgs/msgs
+mkdir -p temp/extlib/extlib
+mkdir -p temp/extlib/extlib/fbudf
+mkdir -p temp/v5_examples/v5_examples
+
+mkdir -p temp/libfbembed
+mkdir -p temp/libfbembed/jrd
+mkdir -p temp/libfbembed/dsql
+mkdir -p temp/libfbembed/lock
+mkdir -p temp/libfbembed/remote
+mkdir -p temp/libfbembed/pipe
+mkdir -p temp/libfbembed/gpre
+mkdir -p temp/libfbembed/alice
+mkdir -p temp/libfbembed/utilities
+mkdir -p temp/libfbembed/fbutil
+mkdir -p temp/libfbembed/jrd/os/posix
+mkdir -p temp/libfbembed/jrd/os/win32
+mkdir -p temp/libfbembed/burp
+mkdir -p temp/libfbembed/wal
+mkdir -p temp/libfbembed/common/classes
+mkdir -p temp/libfbembed/common/config
+mkdir -p temp/codes
+mkdir -p temp/codes/jrd
+
+mkdir -p temp/editline/extern/editline
+
 ])