From 5e92f5f9b53e0ef6d77beecca3ef8399f7aca321 Mon Sep 17 00:00:00 2001 From: brodsom Date: Tue, 8 Jul 2003 12:24:12 +0000 Subject: [PATCH] Posix build move build process and temporary databases to 'gen' --- Makefile.in | 2 +- builds/posix/Makefile.in.codes | 10 +++++----- builds/posix/Makefile.in.embed.qli | 4 ++-- builds/posix/Makefile.in.firebird | 8 ++++---- builds/posix/Makefile.in.msgs | 4 ++-- builds/posix/Makefile.in.refDatabases | 4 ++-- clean.sh | 16 ++++++---------- configure.in | 4 ++-- 8 files changed, 24 insertions(+), 28 deletions(-) diff --git a/Makefile.in b/Makefile.in index 4f898cdbc4..1a8f52a111 100644 --- a/Makefile.in +++ b/Makefile.in @@ -3,4 +3,4 @@ all: firebird firebird install package packages dist clean clobber: - $(MAKE) -C src $@ + $(MAKE) -C gen $@ diff --git a/builds/posix/Makefile.in.codes b/builds/posix/Makefile.in.codes index 04bfbb28f7..81bd752727 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.7 2003-07-08 01:05:22 brodsom Exp $ +# $Id: Makefile.in.codes,v 1.8 2003-07-08 12:24:12 brodsom Exp $ # ROOT=.. ObjModuleName=codes @@ -61,12 +61,12 @@ CODES_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CODES_Sources) AllObjects = $(CODES_Objects) Dependencies = $(AllObjects:.o=.d) -generated_headers: build_codes include/gen/ids.h +generated_headers: build_codes $(SRC_ROOT)/include/gen/ids.h # Rebuild error codes build_codes: $(BIN)/codes msg.fdb - $(BIN)/codes include/gen + $(BIN)/codes $(SRC_ROOT)/include/gen $(SRC_ROOT)/jrd/codes.cpp: $(SRC_ROOT)/jrd/codes.epp $(GPRE_CURRENT) $(GPRE_FLAGS) $< $@ @@ -76,8 +76,8 @@ $(BIN)/codes: $(CODES_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A) # Rebuild ids.h -./include/gen/ids.h: jrd/ids.m jrd/relations.h - m4 $< > include/gen/ids.h +$(SRC_ROOT)/include/gen/ids.h: $(SRC_ROOT)/jrd/ids.m $(SRC_ROOT)/jrd/relations.h + m4 $< > $(SRC_ROOT)/include/gen/ids.h include $(ROOT)/gen/make.shared.targets diff --git a/builds/posix/Makefile.in.embed.qli b/builds/posix/Makefile.in.embed.qli index 983899022a..90de387bf4 100644 --- a/builds/posix/Makefile.in.embed.qli +++ b/builds/posix/Makefile.in.embed.qli @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.embed.qli,v 1.10 2003-04-10 07:50:01 eku Exp $ +# $Id: Makefile.in.embed.qli,v 1.11 2003-07-08 12:24:12 brodsom Exp $ # ROOT=.. ObjModuleName=embed.qli @@ -67,7 +67,7 @@ $(QLI): $(QLI_Objects) # with it. metadata.fdb is what is needed here. create_yachts: -$(RM) yachts.lnk - -$(LN) -f $(SRC_ROOT)/metadata.fdb yachts.lnk + -$(LN) -f metadata.fdb yachts.lnk # qli_help diff --git a/builds/posix/Makefile.in.firebird b/builds/posix/Makefile.in.firebird index 196e07b5a0..ab196cf09c 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.37 2003-07-08 01:05:22 brodsom Exp $ +# $Id: Makefile.in.firebird,v 1.38 2003-07-08 12:24:12 brodsom Exp $ # ROOT=.. @@ -171,11 +171,11 @@ firebird_boot: updateBuildNum boot_phase1 boot_phase2 updateBuildNum : jrd/build_no.h $(GEN_ROOT)/Make.Version -jrd/build_no.h : misc/writeBuildNum.sh +jrd/build_no.h : $(SRC_ROOT)/misc/writeBuildNum.sh (cd ..; ./src/misc/writeBuildNum.sh rebuildHeader) -$(GEN_ROOT)/Make.Version : misc/writeBuildNum.sh - misc/writeBuildNum.sh createMakeVersion $@ +$(GEN_ROOT)/Make.Version : $(SRC_ROOT)/misc/writeBuildNum.sh + $(SRC_ROOT)/misc/writeBuildNum.sh createMakeVersion $@ # diff --git a/builds/posix/Makefile.in.msgs b/builds/posix/Makefile.in.msgs index 93d9d89557..eda8a0476d 100644 --- a/builds/posix/Makefile.in.msgs +++ b/builds/posix/Makefile.in.msgs @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.msgs,v 1.12 2003-07-08 10:45:47 brodsom Exp $ +# $Id: Makefile.in.msgs,v 1.13 2003-07-08 12:24:12 brodsom Exp $ # ROOT=.. ObjModuleName=msgs @@ -147,7 +147,7 @@ indicator.loc: master_msg_db.lnk: - $(LN) -f $(SRC_ROOT)/msg.fdb master_msg_db.lnk + $(LN) -f msg.fdb master_msg_db.lnk diff --git a/builds/posix/Makefile.in.refDatabases b/builds/posix/Makefile.in.refDatabases index 4f8b590967..23ff2fe019 100644 --- a/builds/posix/Makefile.in.refDatabases +++ b/builds/posix/Makefile.in.refDatabases @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.refDatabases,v 1.16 2003-04-10 07:50:03 eku Exp $ +# $Id: Makefile.in.refDatabases,v 1.17 2003-07-08 12:24:12 brodsom Exp $ # ROOT=.. ObjModuleName=refDatabases @@ -75,7 +75,7 @@ empty.fdb : $(BIN)/create_db yachts.lnk: empty.fdb $(RM) -f yachts.lnk - $(LN) -f $(SRC_ROOT)/empty.fdb yachts.lnk + $(LN) -f empty.fdb yachts.lnk diff --git a/clean.sh b/clean.sh index 96d0074f3b..ab9ac06ac5 100644 --- a/clean.sh +++ b/clean.sh @@ -13,22 +13,18 @@ rm configure 2>/dev/null rm libtool 2>/dev/null rm Makefile 2>/dev/null +echo Removing files in builds directory + +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 + 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/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 diff --git a/configure.in b/configure.in index 1b6d65b657..5119ae58d9 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.141 2003-07-08 01:04:52 brodsom Exp $ +dnl $Id: configure.in,v 1.142 2003-07-08 12:23:42 brodsom Exp $ dnl ############################# INITIALISATION ############################### @@ -706,7 +706,7 @@ gen/make.defaults:${MAKE_SRC_DIR}/make.defaults gen/make.platform:${MAKE_SRC_DIR}/prefix.${MAKEFILE_PREFIX} gen/make.shared.variables:${MAKE_SRC_DIR}/make.shared.variables gen/make.shared.targets:${MAKE_SRC_DIR}/make.shared.targets -src/Makefile:${MAKE_SRC_DIR}/Makefile.in.firebird +gen/Makefile:${MAKE_SRC_DIR}/Makefile.in.firebird gen/Makefile.libfbcommon:${MAKE_SRC_DIR}/Makefile.in.libfbcommon gen/Makefile.codes:${MAKE_SRC_DIR}/Makefile.in.codes gen/Makefile.boot.gpre:${MAKE_SRC_DIR}/Makefile.in.boot.gpre