Menu
▾
▴
[Firebird-checkins] CVS: firebird2/builds/posix Makefile.in.client.gbak,1.8,1.9 Makefile.in.client.gdef,1.9,1.10 Makefile.in.client.gfix,1.10,1.11 Makefile.in.client.gpre,1.16,1.17 Makefile.in.client.isql,1.8,1.9 Makefile.in.client.qli,1.4,1.5 Makefile.in.client.util,1.21,1.22
|
From: Frank Schlottmann-G. <fs...@us...> - 2005-02-05 10:31:23
|
Build Version : T2.0.0.10306 Firebird 2.0 Alpha 1 (writeBuildNum.sh,v 1.10314 2005/02/05 10:31:07 fsg Exp $ ) Update of /cvsroot/firebird/firebird2/builds/posix In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2630/firebird2/builds/posix Modified Files: Makefile.in.client.gbak Makefile.in.client.gdef Makefile.in.client.gfix Makefile.in.client.gpre Makefile.in.client.isql Makefile.in.client.qli Makefile.in.client.util Log Message: Fixed posix superserver build. FSG Index: Makefile.in.client.gbak =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gbak,v retrieving revision 1.8 retrieving revision 1.9 diff -b -U3 -r1.8 -r1.9 --- Makefile.in.client.gbak 30 Apr 2004 23:02:07 -0000 1.8 +++ Makefile.in.client.gbak 5 Feb 2005 10:30:48 -0000 1.9 @@ -41,7 +41,8 @@ @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) @@ -52,7 +53,7 @@ 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) @@ -62,11 +63,11 @@ gbak : $(LIBFBCLIENT_SO) $(GBAK) -$(GBAK): $(GBAK_Objects) +$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) -gsplit : $(LIBFBCLIENT_SO) $(GSPLIT) +gsplit : $(LIBFBCLIENT_SO) $(GSPLIT) $(CLUMPLETS_Objects) $(GSPLIT): $(GSPLIT_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.gdef =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gdef,v retrieving revision 1.9 retrieving revision 1.10 diff -b -U3 -r1.9 -r1.10 --- Makefile.in.client.gdef 30 Apr 2004 23:02:07 -0000 1.9 +++ Makefile.in.client.gdef 5 Feb 2005 10:30:48 -0000 1.10 @@ -52,9 +52,9 @@ hsh.cpp lex.cpp parse.cpp trn.cpp GDEF_Sources = $(addprefix dudley/, $(GDEF_Files)) $(GDEF_Other_Sources) -GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources)))) +GDEF_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GDEF_Sources)))) $(CLUMPLETS_Objects) -AllObjects = $(GDEF_Objects) +AllObjects = $(GDEF_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) Index: Makefile.in.client.gfix =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gfix,v retrieving revision 1.10 retrieving revision 1.11 diff -b -U3 -r1.10 -r1.11 --- Makefile.in.client.gfix 16 Aug 2004 12:56:20 -0000 1.10 +++ Makefile.in.client.gfix 5 Feb 2005 10:30:48 -0000 1.11 @@ -47,7 +47,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) @@ -57,7 +57,7 @@ gfix : $(LIBFBCLIENT_SO) $(GFIX) -$(GFIX): $(GFIX_Objects) +$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.gpre =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.gpre,v retrieving revision 1.16 retrieving revision 1.17 diff -b -U3 -r1.16 -r1.17 --- Makefile.in.client.gpre 7 Oct 2004 20:25:40 -0000 1.16 +++ Makefile.in.client.gpre 5 Feb 2005 10:30:48 -0000 1.17 @@ -40,7 +40,7 @@ @SET_MAKE@ GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp common/utils.cpp \ -common/fb_exception.cpp common/classes/alloc.cpp +common/classes/fb_string.cpp common/fb_exception.cpp common/classes/alloc.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 +50,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) @@ -60,7 +60,7 @@ gpre : $(LIBFBCLIENT_SO) $(GPRE) -$(GPRE): $(GPRE_Objects) +$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.isql =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.isql,v retrieving revision 1.8 retrieving revision 1.9 diff -b -U3 -r1.8 -r1.9 --- Makefile.in.client.isql 30 Apr 2004 23:02:07 -0000 1.8 +++ Makefile.in.client.isql 5 Feb 2005 10:30:48 -0000 1.9 @@ -42,12 +42,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 +59,7 @@ isql : $(LIBFBCLIENT_SO) $(ISQL) -$(ISQL): $(ISQL_Objects) +$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) Index: Makefile.in.client.qli =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.qli,v retrieving revision 1.4 retrieving revision 1.5 diff -b -U3 -r1.4 -r1.5 --- Makefile.in.client.qli 30 Apr 2004 23:02:07 -0000 1.4 +++ Makefile.in.client.qli 5 Feb 2005 10:30:48 -0000 1.5 @@ -49,9 +49,9 @@ hsh.cpp lex.cpp meta.cpp mov.cpp parse.cpp picstr.cpp proc.cpp \ report.cpp show.cpp QLI_Sources = $(addprefix qli/, $(QLI_Files)) $(QLI_Other_Sources) -QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources)))) +QLI_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(QLI_Sources)))) $(CLUMPLETS_Objects) -AllObjects = $(QLI_Objects) +AllObjects = $(QLI_Objects) $(CLUMPLETS_Objects) Dependencies = $(AllObjects:.o=.d) Index: Makefile.in.client.util =================================================================== RCS file: /cvsroot/firebird/firebird2/builds/posix/Makefile.in.client.util,v retrieving revision 1.21 retrieving revision 1.22 diff -b -U3 -r1.21 -r1.22 --- Makefile.in.client.util 7 Nov 2004 13:47:05 -0000 1.21 +++ Makefile.in.client.util 5 Feb 2005 10:30:48 -0000 1.22 @@ -51,7 +51,7 @@ common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources) NBACKUP_Files= nbackup.cpp NBACKUP_Sources = $(addprefix utilities/, $(NBACKUP_Files)) $(NBACKUP_Other_Sources) -NBACKUP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(NBACKUP_Sources)))) +NBACKUP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(NBACKUP_Sources)))) $(CLUMPLETS_Objects) CREATEDB_Files= create_db.cpp CREATEDB_Sources = $(addprefix utilities/, $(CREATEDB_Files)) @@ -72,7 +72,7 @@ GSTAT_Files = dba.epp ppg.cpp GSTAT_Sources = $(addprefix utilities/gstat/, $(GSTAT_Files)) $(GSTAT_Other_Sources) -GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources)))) +GSTAT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSTAT_Sources)))) $(CLUMPLETS_Objects) FBGUARD_Other_Sources = jrd/isc.cpp FBGUARD_Files = guard.cpp util.cpp @@ -127,7 +127,7 @@ nbackup: $(LIBFBCLIENT_SO) $(NBACKUP) -$(NBACKUP): $(NBACKUP_Objects) +$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(LD) $(LINK_OPTS) $(NBACKUP_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) fb_lock_print: $(LIBFBCLIENT_SO) $(LOCKPRINT) @@ -138,8 +138,8 @@ gstat : $(LIBFBCLIENT_SO) $(GSTAT) -$(GSTAT): $(GSTAT_Objects) - $(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) +$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects) + $(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS ) |