8
0
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 00:43:02 +01:00

deleted libfbcommon as was suggested by Jim

This commit is contained in:
alexpeshkoff 2005-12-18 17:56:43 +00:00
parent f3b4058bee
commit f13cdb88d2
29 changed files with 115 additions and 112 deletions

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.boot.gpre,v 1.24 2005-08-08 13:47:25 alexpeshkoff Exp $
# $Id: Makefile.in.boot.gpre,v 1.25 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=boot
@ -69,8 +69,8 @@ Dependencies = $(AllObjects:.o=.d)
gpre_boot : $(GPRE_BOOT)
$(GPRE_BOOT): $(GPREBOOT_Objects) $(LIB)/libfbcommon.a
$(LD) $(LINK_OPTS) $(GPREBOOT_Objects) -o $@ -L$(LIB) -lfbcommon $(LINK_LIBS)
$(GPRE_BOOT): $(GPREBOOT_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
-$(RM) $(GPRE_CURRENT)
(cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gbak,v 1.13 2005-10-22 12:35:03 aafemt Exp $
# $Id: Makefile.in.client.gbak,v 1.14 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
@ -64,8 +64,8 @@ all: gbak gsplit
gbak : $(LIBFBCLIENT_SO) $(GBAK)
$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
gsplit : $(LIBFBCLIENT_SO) $(GSPLIT)

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gdef,v 1.12 2005-07-22 10:26:15 aafemt Exp $
# $Id: Makefile.in.client.gdef,v 1.13 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -64,8 +64,8 @@ all: gdef
gdef: $(GDEF)
$(GDEF): $(GDEF_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $(GDEF_Objects) -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(GDEF): $(GDEF_Objects) $(LIBFBCLIENT_SO) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $(GDEF_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gfix,v 1.15 2005-10-22 12:35:03 aafemt Exp $
# $Id: Makefile.in.client.gfix,v 1.16 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -57,8 +57,8 @@ Dependencies = $(AllObjects:.o=.d)
gfix : $(LIBFBCLIENT_SO) $(GFIX)
$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gpre,v 1.19 2005-07-22 10:26:15 aafemt Exp $
# $Id: Makefile.in.client.gpre,v 1.20 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -59,8 +59,8 @@ Dependencies = $(AllObjects:.o=.d)
gpre : $(LIBFBCLIENT_SO) $(GPRE)
$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -18,11 +18,11 @@
# All Rights Reserved.
# Contributor(s): ______________________________________.
#
# $Id: Makefile.in.client.gsec,v 1.6 2005-10-22 12:35:03 aafemt Exp $
# $Id: Makefile.in.client.gsec,v 1.7 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=superclient
CFLAGS+=-DSUPERCLIENT -DSTD_UTIL
CFLAGS+=-DSUPERCLIENT -DSTD_UTIL @PTHREAD_CFLAGS@
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform
@ -48,8 +48,8 @@ all: gsec
gsec: $(LIBFBCLIENT_SO) $(GSEC)
$(GSEC): $(GSEC_Objects)
$(LD) $(LINK_OPTS) $(GSEC_Objects) -o $@ -L$(LIB) -lfbclient $(LIBFBCOMMON_A) $(LINK_LIBS)
$(GSEC): $(GSEC_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.isql,v 1.11 2005-07-22 10:26:15 aafemt Exp $
# $Id: Makefile.in.client.isql,v 1.12 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -58,8 +58,8 @@ Dependencies = $(AllObjects:.o=.d)
isql : $(LIBFBCLIENT_SO) $(ISQL)
$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.qli,v 1.7 2005-07-22 10:26:15 aafemt Exp $
# $Id: Makefile.in.client.qli,v 1.8 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -61,8 +61,8 @@ all: qli
qli : create_yachts $(LIBFBCLIENT_SO) $(QLI)
$(QLI): $(QLI_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(QLI): $(QLI_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
$(CHMOD_S7) $@
# EKU: At this point yachts.lnk is a link to empty.fdb, but gpre will fail

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.util,v 1.30 2005-10-22 12:35:03 aafemt Exp $
# $Id: Makefile.in.client.util,v 1.31 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -126,19 +126,19 @@ $(CREATE_DB): $(CREATEDB_Objects)
nbackup: $(LIBFBCLIENT_SO) $(NBACKUP)
$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $(NBACKUP_Objects) -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
fb_lock_print: $(LIBFBCLIENT_SO) $(LOCKPRINT)
$(LOCKPRINT): $(LOCKPRINT_Objects)
$(LD) $(LINK_OPTS) $(LOCKPRINT_Objects) -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(LOCKPRINT): $(LOCKPRINT_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
gstat : $(LIBFBCLIENT_SO) $(GSTAT)
$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $(GSTAT_Objects) -o $@ -L$(LIB) -lfbcommon -lfbclient $(LINK_LIBS)
$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
@ -154,17 +154,15 @@ $(GDS_RELAY): $(RELAY_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $(RELAY_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
gsec: $(LIBFBCLIENT_SO)
fbguard: $(LIBFBCLIENT_SO) $(FBGUARD)
$(FBGUARD): $(FBGUARD_Objects)
$(LD) $(LINK_OPTS) $(FBGUARD_Objects) -o $@ -L$(LIB) -lfbcommon -lfbclient $(LIB_GUI) $(LINK_LIBS)
$(FBGUARD): $(FBGUARD_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
ibguard: $(LIBFBCLIENT_SO) $(IBGUARD)
$(IBGUARD): $(IBGUARD_A_Objects) $(IBGUARD_B_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbclient $(LIB_GUI) $(LINK_LIBS)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(FBCLASSES_Objects) $(FBCOMMON_Objects) -lfbclient $(LIB_GUI) $(LINK_LIBS)
fbmgr_bin: $(FBMGR_BIN)
@ -174,12 +172,12 @@ $(FBMGR_BIN): $(FBMGR_Objects) $(LIBFBCLIENT_SO)
instreg: $(INSTREG)
$(INSTREG): $(INSTREG_Objects)
$(LD) $(LINK_OPTS) $(INSTREG_Objects) -o $@ -L$(LIB) $(LINK_LIBS)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
instsvc: $(INSTSVC)
$(INSTSVC): $(INSTSVC_Objects) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(INSTSVC_Objects) -o $@ -L$(LIB) -lfbcommon $(LINK_LIBS)
$(INSTSVC): $(INSTSVC_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
# This one needs a bit of work.

View File

@ -21,7 +21,7 @@
# Contributor(s): ______________________________________.
#
#
# $Id: Makefile.in.codes,v 1.19 2005-06-10 10:32:50 aafemt Exp $
# $Id: Makefile.in.codes,v 1.20 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -62,8 +62,8 @@ build_codes: $(BIN)/codes$(EXEC_EXT) msg.fdb
$(SRC_ROOT)/misc/codes.cpp: $(SRC_ROOT)/misc/codes.epp
$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
$(BIN)/codes$(EXEC_EXT): $(CODES_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $(CODES_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(BIN)/codes$(EXEC_EXT): $(CODES_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) $(ICU_LIBS)
# Rebuild ids.h

View File

@ -67,8 +67,8 @@ all: gbak gsplit
gbak : $(LIBFBEMBED_SO) $(GBAK)
$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GBAK): $(GBAK_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)

View File

@ -62,8 +62,8 @@ all: gdef
gdef: $(GDEF)
$(GDEF): $(GDEF_Objects) $(CLUMPLETS_Objects) $(LIBFBEMBED_SO)
$(LD) $(LINK_OPTS) $(GDEF_Objects) $(CLUMPLETS_Objects) -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GDEF): $(GDEF_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)

View File

@ -63,8 +63,8 @@ Dependencies = $(AllObjects:.o=.d)
gfix : $(LIBFBEMBED_SO) $(GFIX)
$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GFIX): $(GFIX_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -57,8 +57,8 @@ Dependencies = $(AllObjects:.o=.d)
gpre : $(LIBFBEMBED_SO) $(GPRE)
$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GPRE): $(GPRE_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -57,8 +57,8 @@ Dependencies = $(AllObjects:.o=.d)
isql : $(LIBFBEMBED_SO) $(ISQL)
$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(ISQL): $(ISQL_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.lockmgr,v 1.9 2005-05-27 22:16:01 asfernandes Exp $
# $Id: Makefile.in.embed.lockmgr,v 1.10 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=boot
@ -56,8 +56,8 @@ all : lock_mgr
lock_mgr : $(BIN)/fb_lock_mgr
$(BIN)/fb_lock_mgr: $(LOCKMGR_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $(LOCKMGR_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
$(BIN)/fb_lock_mgr: $(LOCKMGR_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $(LOCKMGR_Objects) -o $@ -L$(LIB) -lfbstatic $(COMMON_Objects) $(LINK_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -60,8 +60,8 @@ all: qli
qli : create_yachts $(LIBFBEMBED_SO) $(QLI)
$(QLI): $(QLI_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(QLI): $(QLI_Objects) $(CLUMPLETS_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
$(CHMOD_S7) $@
# EKU: At this point yachts.lnk is a link to empty.fdb, but gpre will fail

View File

@ -132,43 +132,43 @@ all: $(EMBED_UTIL_TARGETS)
create_db: $(CREATE_DB)
$(CREATE_DB): $(CREATEDB_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(CREATEDB_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(CREATE_DB): $(CREATEDB_Objects) $(LIBFBSTATIC_A) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $(CREATEDB_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
nbackup: $(LIBFBEMBED_SO) $(NBACKUP)
$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(NBACKUP): $(NBACKUP_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
fb_lock_print: $(LIBFBEMBED_SO) $(LOCKPRINT)
$(LOCKPRINT): $(LOCKPRINT_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(LOCKPRINT): $(LOCKPRINT_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
gstat : $(LIBFBEMBED_SO) $(GSTAT)
$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GSTAT): $(GSTAT_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
gds_drop: $(GDS_DROP)
$(GDS_DROP): $(DROP_Objects) $(LIBFBEMBED_SO)
$(LD) $(LINK_OPTS) $(DROP_Objects) -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GDS_DROP): $(DROP_Objects) $(FBCOMMON_Objects) $(FBCLASSES_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
gds_relay: $(GDS_RELAY)
$(GDS_RELAY): $(RELAY_Objects) $(LIBFBEMBED_SO)
$(GDS_RELAY): $(RELAY_Objects) $(LIBFBEMBED_SO)
$(LD) $(LINK_OPTS) $(RELAY_Objects) -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
gsec: $(LIBFBEMBED_SO) $(GSEC)
gsec: $(GSEC)
$(GSEC): $(GSEC_Objects) $(CLUMPLETS_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbcommon -lfbembed $(LINK_LIBS)
$(GSEC): $(GSEC_Objects) $(CLUMPLETS_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbembed $(LINK_LIBS)
ibguard: $(IBGUARD)

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.examples,v 1.7 2005-06-22 09:21:37 alexpeshkoff Exp $
# $Id: Makefile.in.examples,v 1.8 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=../..
ObjModuleType=std
@ -119,8 +119,8 @@ $(EXAMPLES_DEST)/employee.fdb: $(EXAMPLES_DEST)/empbuild$(EXEC_EXT) $(INPUT_Sour
$(EXAMPLES_DEST)/isql$(EXEC_EXT):
-$(LN) $(ISQL_STATIC) $(EXAMPLES_DEST)/isql$(EXEC_EXT)
$(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(EXAMPLES_DEST)/empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empbuild.e
@ -137,8 +137,8 @@ $(EXAMPLES_DEST)/intlemp.fdb: $(EXAMPLES_DEST)/intlbld$(EXEC_EXT) $(INTL_Sources
./intlbld intlemp.fdb
-$(CHMOD_6) intlemp.fdb
$(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(EXE_LINK) $(LINK_OPTS) $(INTLBLD_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(EXAMPLES_DEST)/intlbld$(EXEC_EXT): $(INTLBLD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(EXE_LINK) $(LINK_OPTS) $(INTLBLD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intlbld.e

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.fbserver,v 1.21 2005-08-17 14:07:19 alexpeshkoff Exp $
# $Id: Makefile.in.fbserver,v 1.22 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=superserver
@ -43,7 +43,7 @@ include $(ROOT)/gen/make.shared.variables
SERVER_Files = $(OS_ServerFiles) server.cpp server_stub.cpp
SERVER_Sources = $(addprefix remote/, $(SERVER_Files))
SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Sources)))) $(LIBFBSERVER_Objects)
SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Sources)))) $(LIBFBSERVER_Objects) $(COMMON_Objects)
.PHONY: fbserver
@ -51,7 +51,7 @@ SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Source
fbserver : $(FB_SUPER_SERVER)
$(FB_SUPER_SERVER): $(SERVER_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LIB_GUI) $(LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -lfbcommon $(ICU_LIBS)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LIB_GUI) $(LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ $(ICU_LIBS)
AllObjects = $(SERVER_Objects)

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.libfbembed,v 1.16 2005-06-10 10:32:51 aafemt Exp $
# $Id: Makefile.in.libfbembed,v 1.17 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -53,7 +53,7 @@ SERVER_Files = $(OS_ServerFiles) server.cpp
SERVER_Sources = $(addprefix remote/, $(SERVER_Files))
SERVER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(SERVER_Sources))))
AllObjects = $(LIBFBEMBED_Objects) $(SERVER_Objects)
AllObjects = $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
Dependencies = $(AllObjects:.o=.d)
@ -61,9 +61,9 @@ Dependencies = $(AllObjects:.o=.d)
libfbembed : $(LIBFBEMBED_SONAME)
$(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects)
$(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(SERVER_Objects) $(COMMON_Objects)
$(LIB_LINK) $(LINK_FIREBIRD_SYMBOLS) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) \
$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) -lfbcommon $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
$(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ -L$(LIB) $(LIB_GUI) $(SO_LINK_LIBS) $(ICU_LIBS)
$(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
(cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.msgs,v 1.16 2005-06-10 10:32:51 aafemt Exp $
# $Id: Makefile.in.msgs,v 1.17 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -98,36 +98,36 @@ do_check: $(CHECK_MESSAGES) $(BUILD_FILE)
check_messages : $(CHECK_MESSAGES)
$(CHECK_MESSAGES): $(CHECK_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(CHECK_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(CHECK_MESSAGES): $(CHECK_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(CHECK_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(CHMOD_7) $@
build_file : $(BUILD_FILE)
$(BUILD_FILE): $(BUILD_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(BUILD_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(BUILD_FILE): $(BUILD_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(BUILD_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(CHMOD_7) $@
enter_messages : $(ENTER_MESSAGES)
$(ENTER_MESSAGES): $(ENTER_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(ENTER_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(ENTER_MESSAGES): $(ENTER_Objects) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(ENTER_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(CHMOD_7) $@
modify_messages: $(MODIFY_MESSAGES)
$(MODIFY_MESSAGES): $(MODIFY_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(MODIFY_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(MODIFY_MESSAGES): $(MODIFY_Objects) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(MODIFY_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(CHMOD_7) $@
change_messages: $(CHANGE_MESSAGES)
$(CHANGE_MESSAGES): $(CHANGE_Objects) $(LIBFBSTATIC_A) $(LIBFBCOMMON_A)
$(LD) $(LINK_OPTS) $(CHANGE_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(CHANGE_MESSAGES): $(CHANGE_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(CHANGE_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
$(CHMOD_7) $@

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.refDatabases,v 1.28 2005-06-10 10:32:51 aafemt Exp $
# $Id: Makefile.in.refDatabases,v 1.29 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=std
@ -66,6 +66,7 @@ MSG_FILES = $(addprefix $(SRC_ROOT)/msgs/, $(MSG_SCRIPTS))
empty_db : empty.fdb yachts.lnk
empty.fdb : $(CREATE_DB)
$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $(BIN)/create_db
-$(RM) $@
$(BIN)/create_db $@
$(TOUCH) $@

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.static.gbak,v 1.11 2005-06-10 10:32:51 aafemt Exp $
# $Id: Makefile.in.static.gbak,v 1.12 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=boot
@ -57,8 +57,8 @@ Dependencies = $(AllObjects:.o=.d)
gbak_static : $(GBAK_STATIC)
$(GBAK_STATIC) : $(GBAKSTATIC_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $(GBAKSTATIC_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(GBAK_STATIC) : $(GBAKSTATIC_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(CXX) $(LINK_OPTS) $(GBAKSTATIC_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
# Darwin may need this link as well
#$(COREFOUNDATION_LINK)

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.static.gpre,v 1.18 2005-06-10 10:32:51 aafemt Exp $
# $Id: Makefile.in.static.gpre,v 1.19 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=boot
@ -60,8 +60,8 @@ all : gpre_static
gpre_static : $(GPRE_STATIC)
$(GPRE_STATIC): $(GPRESTATIC_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(GPRESTATIC_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(GPRE_STATIC): $(GPRESTATIC_Objects) $(COMMON_Objects)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
-$(RM) $(GPRE_CURRENT)
(cd $(@D); $(LN) $(@F) $(notdir $(GPRE_CURRENT)))

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.static.isql,v 1.10 2005-06-10 10:32:51 aafemt Exp $
# $Id: Makefile.in.static.isql,v 1.11 2005-12-18 17:56:43 alexpeshkoff Exp $
#
ROOT=..
ObjModuleType=boot
@ -58,8 +58,8 @@ Dependencies = $(AllObjects:.o=.d)
isql_static : $(ISQL_STATIC)
$(ISQL_STATIC): $(ISQL_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(ISQL_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(ICU_LIBS)
$(ISQL_STATIC): $(ISQL_Objects) $(COMMON_Objects) $(LIBFBSTATIC_A)
$(LD) $(LINK_OPTS) $(ISQL_Objects) $(COMMON_Objects) -o $@ -L$(LIB) -lfbstatic $(LINK_LIBS) $(ICU_LIBS)
include $(ROOT)/gen/make.shared.targets

View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.defaults,v 1.42 2005-07-22 10:26:16 aafemt Exp $
# $Id: make.defaults,v 1.43 2005-12-18 17:56:43 alexpeshkoff Exp $
#
@ -172,7 +172,6 @@ LIBFBCLIENT_SONAME=$(LIB)/$(ClientLibraryName)
LIBFBINTL_SO = $(FIREBIRD)/intl/$(LIB_PREFIX)fbintl.$(SHRLIB_EXT)
LIBFBCOMMON_A = $(LIB)/libfbcommon.a
LIBFBSTATIC_A = $(LIB)/libfbstatic.a
LIBEDITLINE_A = $(LIB)/libeditline.a
LIBICU_SO = $(LIB)/$(LIB_PREFIX)icuuc.$(SHRLIB_EXT) \

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: make.shared.targets,v 1.20 2005-06-10 10:32:51 aafemt Exp $
# $Id: make.shared.targets,v 1.21 2005-12-18 17:56:43 alexpeshkoff Exp $
#
@ -88,7 +88,7 @@ $(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)
$(CXX) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS)
# Adding resources as prerequisite for some files

View File

@ -300,6 +300,13 @@ OS_SPECIFIC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(OS_SPECI
#________________________________________________________________________
#
# These objects are needed in any target
COMMON_Objects = $(FBCLASSES_Objects) \
$(FBCOMMON_Objects) \
$(CONFIG_Objects) \
$(VULCAN_Objects)
# These are the lists of object/shared object files that will go into libgds.a
# and libgds.$(SHRLIB_EXT).
@ -321,9 +328,7 @@ LIBFBEMBED_Objects =$(OS_SPECIFIC_Objects) \
# both refer to the same thing. (better way always possible)
# MOD 29-July-2002
LIBFBSERVER_Objects =$(LIBFBEMBED_Objects) \
$(FBCLASSES_Objects) \
$(FBCOMMON_Objects)
LIBFBSERVER_Objects =$(LIBFBEMBED_Objects)
# The following library is a 'reduced' set (although not that reduced)