Menu
▾
▴
[Firebird-checkins] CVS: firebird2/builds/posix Makefile.in.embed.gbak,1.8,1.8.2.1 Makefile.in.embed.gdef,1.7,1.7.2.1 Makefile.in.embed.gfix,1.11,1.11.2.1 Makefile.in.embed.gpre,1.14.2.2,1.14.2.3 Makefile.in.embed.isql,1.8,1.8.2.1 Makefile.in.embed.qli,1.14,1.14.2.1 Makefile.in.embed.util,1.14.2.2,1.14.2.3
|
From: Adriano d. S. F. <asf...@us...> - 2004-12-13 17:25:06
|
Build Version : T2.0.0.9872 Firebird 2.0 UNSTABLE (writeBuildNum.sh,v 1.9876 2004/12/13 17:21:24 asfernandes ) Update of /cvsroot/firebird/firebird2/builds/posix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31914/builds/posix Modified Files: Tag: B2_0_intl Makefile.in.embed.gbak Makefile.in.embed.gdef Makefile.in.embed.gfix Makefile.in.embed.gpre Makefile.in.embed.isql Makefile.in.embed.qli Makefile.in.embed.util Log Message: Merge HEAD changes from 2004-12-02 to 2004-12-12 into B2_0_intl branch Index: Makefile.in.embed.gbak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.gbak,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -b -U3 -r1.8 -r1.8.2.1 --- Makefile.in.embed.gbak 30 Apr 2004 23:02:07 -0000 1.8 +++ Makefile.in.embed.gbak 13 Dec 2004 17:21:21 -0000 1.8.2.1 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -40,18 +39,20 @@ @SET_MAKE@ -GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp +GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp \ +common/classes/fb_string.cpp common/classes/alloc.cpp common/fb_exception.cpp GBAK_Files = backup.epp restore.epp \ burp.cpp canonical.cpp misc.cpp mvol.cpp GBAK_Sources = $(addprefix burp/, $(GBAK_Files)) $(GBAK_Other_Sources) GBAK_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GBAK_Sources)))) +GSPLIT_Other_Sources = common/classes/fb_string.cpp common/classes/alloc.cpp common/fb_exception.cpp GSPLIT_Files= spit.cpp -GSPLIT_Sources = $(addprefix burp/, $(GSPLIT_Files)) +GSPLIT_Sources = $(addprefix burp/, $(GSPLIT_Files)) $(GSPLIT_Other_Sources) GSPLIT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSPLIT_Sources)))) -AllObjects = $(GBAK_Objects) $(GSPLIT_Objects) +AllObjects = $(GBAK_Objects) $(GSPLIT_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -61,14 +62,14 @@ gbak : $(LIBFBEMBED_SO) $(GBAK) -$(GBAK): $(GBAK_Objects) +$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) gsplit : $(LIBFBEMBED_SO) $(GSPLIT) -$(GSPLIT): $(GSPLIT_Objects) +$(GSPLIT): $(GSPLIT_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) include $(ROOT)/gen/make.shared.targets Index: Makefile.in.embed.gdef =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.gdef,v retrieving revision 1.7 retrieving revision 1.7.2.1 diff -b -U3 -r1.7 -r1.7.2.1 --- Makefile.in.embed.gdef 30 Apr 2004 23:02:07 -0000 1.7 +++ Makefile.in.embed.gdef 13 Dec 2004 17:21:21 -0000 1.7.2.1 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -54,7 +53,7 @@ GDEF_Sources = $(addprefix dudley/, $(GDEF_Files)) $(GDEF_Other_Sources) GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources)))) -AllObjects = $(GDEF_Objects) +AllObjects = $(GDEF_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -64,8 +63,8 @@ gdef: $(BIN)/gdef -$(BIN)/gdef: $(GDEF_Objects) $(LIBFBEMBED_SO) - $(LD) $(LINK_OPTS) $(GDEF_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) +$(BIN)/gdef: $(GDEF_Objects) $(CLUMPLETS_Objects) $(LIBFBEMBED_SO) + $(LD) $(LINK_OPTS) $(GDEF_Objects) $(CLUMPLETS_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) Index: Makefile.in.embed.gfix =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.gfix,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -b -U3 -r1.11 -r1.11.2.1 --- Makefile.in.embed.gfix 9 Sep 2004 11:32:54 -0000 1.11 +++ Makefile.in.embed.gfix 13 Dec 2004 17:21:21 -0000 1.11.2.1 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -49,7 +48,7 @@ GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources) GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GFIX_Sources)))) -AllObjects = $(GFIX_Objects) +AllObjects = $(GFIX_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -59,7 +58,7 @@ gfix : $(LIBFBEMBED_SO) $(GFIX) -$(GFIX): $(GFIX_Objects) +$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) Index: Makefile.in.embed.gpre =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.gpre,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -b -U3 -r1.14.2.2 -r1.14.2.3 --- Makefile.in.embed.gpre 10 Oct 2004 19:55:06 -0000 1.14.2.2 +++ Makefile.in.embed.gpre 13 Dec 2004 17:21:21 -0000 1.14.2.3 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -40,7 +39,7 @@ @SET_MAKE@ GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp common/utils.cpp \ -common/fb_exception.cpp common/classes/alloc.cpp +common/fb_exception.cpp common/classes/alloc.cpp common/classes/fb_string.cpp GPRE_Files = gpre_meta.epp \ cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp gpre.cpp \ hsh.cpp int_cxx.cpp jrdmet.cpp movg.cpp msc.cpp par.cpp \ @@ -50,7 +49,7 @@ GPRE_Sources = $(addprefix gpre/, $(GPRE_Files)) $(GPRE_Other_Sources) GPRE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRE_Sources)))) -AllObjects = $(GPRE_Objects) +AllObjects = $(GPRE_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -59,7 +58,7 @@ gpre : $(LIBFBEMBED_SO) $(GPRE) -$(GPRE): $(GPRE_Objects) +$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) Index: Makefile.in.embed.isql =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.isql,v retrieving revision 1.8 retrieving revision 1.8.2.1 diff -b -U3 -r1.8 -r1.8.2.1 --- Makefile.in.embed.isql 30 Apr 2004 23:02:07 -0000 1.8 +++ Makefile.in.embed.isql 13 Dec 2004 17:21:21 -0000 1.8.2.1 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -42,12 +41,13 @@ unexport ISC_USER unexport ISC_PASSWORD -ISQL_Other_Sources = common/utils.cpp +ISQL_Other_Sources = common/utils.cpp \ +common/classes/fb_string.cpp common/classes/alloc.cpp common/fb_exception.cpp ISQL_Files = extract.epp isql.epp show.epp ISQL_Sources = $(addprefix isql/, $(ISQL_Files)) $(ISQL_Other_Sources) ISQL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ISQL_Sources)))) -AllObjects = $(ISQL_Objects) +AllObjects = $(ISQL_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -58,7 +58,7 @@ isql : $(LIBFBEMBED_SO) $(ISQL) -$(ISQL): $(ISQL_Objects) +$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) Index: Makefile.in.embed.qli =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.qli,v retrieving revision 1.14 retrieving revision 1.14.2.1 diff -b -U3 -r1.14 -r1.14.2.1 --- Makefile.in.embed.qli 30 Apr 2004 23:02:07 -0000 1.14 +++ Makefile.in.embed.qli 13 Dec 2004 17:21:21 -0000 1.14.2.1 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -51,7 +50,7 @@ QLI_Sources = $(addprefix qli/, $(QLI_Files)) $(QLI_Other_Sources) QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources)))) -AllObjects = $(QLI_Objects) +AllObjects = $(QLI_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -63,7 +62,7 @@ qli : create_yachts $(LIBFBEMBED_SO) $(QLI) -$(QLI): $(QLI_Objects) +$(QLI): $(QLI_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) $(CHMOD_S7) $@ Index: Makefile.in.embed.util =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.embed.util,v retrieving revision 1.14.2.2 retrieving revision 1.14.2.3 diff -b -U3 -r1.14.2.2 -r1.14.2.3 --- Makefile.in.embed.util 16 Nov 2004 10:57:36 -0000 1.14.2.2 +++ Makefile.in.embed.util 13 Dec 2004 17:21:21 -0000 1.14.2.3 @@ -27,7 +27,6 @@ # Contributor(s): # # -# $Id$ # ROOT=.. ObjModuleType=std @@ -106,10 +105,10 @@ AllObjects = $(CREATEDB_Object) $(DROP_Object) \ $(GSEC_Objects) $(GSTAT_Object) $(IBGUARD_Objects) \ - $(IBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) + $(IBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(CLUMPLETS_Objects) AllObjects = $(CREATEDB_Objects) $(DROP_Objects) \ - $(GSEC_Objects) $(GSTAT_Objects) + $(GSEC_Objects) $(GSTAT_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) @@ -132,7 +131,7 @@ nbackup: $(LIBFBEMBED_SO) $(NBACKUP) -$(NBACKUP): $(NBACKUP_Objects) +$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) fb_lock_print: $(LIBFBEMBED_SO) $(LOCKPRINT) @@ -143,7 +142,7 @@ gstat : $(LIBFBEMBED_SO) $(GSTAT) -$(GSTAT): $(GSTAT_Objects) +$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) @@ -162,7 +161,7 @@ gsec: $(LIBFBEMBED_SO) $(GSEC) -$(GSEC): $(GSEC_Objects) +$(GSEC): $(GSEC_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS) $(LIBFBCOMMON_A) ibguard: $(IBGUARD) |