firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-01-23 04:43:03 +01:00
Code Issues

added path_utils to appropriate Makefiles

Browse Source
This commit is contained in:
alexpeshkoff 2007-04-19 09:09:25 +00:00
parent 6f831dfc5a
commit feb4e91351
13 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
builds/posix/Makefile.in.client.gbak
View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gbak,v 1.15 2005-12-20 12:14:52 alexpeshkoff Exp $
# $Id: Makefile.in.client.gbak,v 1.16 2007-04-19 09:09:25 alexpeshkoff Exp $
#
ROOT=..
@ -43,7 +43,7 @@ include $(ROOT)/gen/make.shared.variables
GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp\
common/classes/MetaName.cpp
common/classes/MetaName.cpp jrd/os/posix/path_utils.cpp
GBAK_Files = backup.epp restore.epp \
burp.cpp canonical.cpp misc.cpp mvol.cpp
GBAK_Sources = $(addprefix burp/, $(GBAK_Files)) $(GBAK_Other_Sources)

2
builds/posix/Makefile.in.client.gfix
View File

@ -40,7 +40,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp
GFIX_Other_Sources = jrd/isc.cpp jrd/ThreadData.cpp jrd/os/posix/path_utils.cpp
GFIX_Files = alice_meta.epp alice.cpp all.cpp exe.cpp tdr.cpp
GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)

2
builds/posix/Makefile.in.client.gpre
View File

@ -38,7 +38,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp
GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp jrd/os/posix/path_utils.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 \

2
builds/posix/Makefile.in.client.isql
View File

@ -41,7 +41,7 @@ include $(ROOT)/gen/make.shared.variables
unexport ISC_USER
unexport ISC_PASSWORD
ISQL_Other_Sources =
ISQL_Other_Sources = jrd/os/posix/path_utils.cpp
ISQL_Files = extract.epp isql.epp show.epp Extender.cpp
ISQL_Sources = $(addprefix isql/, $(ISQL_Files)) $(ISQL_Other_Sources)
ISQL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ISQL_Sources))))

2
builds/posix/Makefile.in.client.qli
View File

@ -39,7 +39,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
QLI_Other_Sources = jrd/dsc.cpp gpre/pretty.cpp
QLI_Other_Sources = jrd/dsc.cpp gpre/pretty.cpp jrd/os/posix/path_utils.cpp
QLI_Files= all.cpp command.cpp compile.cpp dtr.cpp err.cpp eval.cpp \
expand.cpp exe.cpp format.cpp gener.cpp help.cpp \

20
builds/posix/Makefile.in.client.util
View File

@ -65,6 +65,13 @@ DROP_Files= drop.cpp
DROP_Sources = $(addprefix utilities/, $(DROP_Files)) $(DROP_Other_Sources)
DROP_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(DROP_Sources))))
GSERV_Files= gserv.cpp
GSERV_Other_Sources = common/classes/fb_string.cpp common/classes/alloc.cpp \
common/classes/ClumpletReader.cpp common/classes/ClumpletWriter.cpp \
common/fb_exception.cpp
GSERV_Sources = $(addprefix utilities/, $(GSERV_Files)) $(GSERV_Other_Sources)
GSERV_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GSERV_Sources))))
GSTAT_Other_Sources = jrd/btn.cpp jrd/db_alias.cpp jrd/ods.cpp \
common/config/config.cpp common/config/config_file.cpp $(OS_SPECIFIC_Sources)
@ -72,7 +79,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)))) $(CLUMPLETS_Objects)
FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp
FBGUARD_Other_Sources = jrd/isc.cpp jrd/divorce.cpp jrd/os/posix/path_utils.cpp
FBGUARD_Files = guard.cpp util.cpp
FBGUARD_Sources = $(addprefix utilities/guard/, $(FBGUARD_Files)) $(FBGUARD_Other_Sources)
FBGUARD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBGUARD_Sources))))
@ -84,8 +91,9 @@ IBGUARD_B_Files = os/win32/chop.cpp
IBGUARD_B_Sources = $(addprefix remote/, $(IBGUARD_B_Files))
IBGUARD_B_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(IBGUARD_B_Sources))))
FBMGR_Other_Sources = jrd/os/posix/path_utils.cpp
FBMGR_Files = ibmgr.cpp srvrmgr.cpp
FBMGR_Sources = $(addprefix utilities/ibmgr/, $(FBMGR_Files))
FBMGR_Sources = $(addprefix utilities/ibmgr/, $(FBMGR_Files)) $(FBMGR_Other_Sources)
FBMGR_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(FBMGR_Sources))))
INSTREG_Files = install_reg.cpp registry.cpp
@ -107,13 +115,13 @@ RELAY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(RELAY_Sources)
AllObjects = $(CREATEDB_Object) $(DROP_Object) $(GSTAT_Object) $(FBGUARD_Objects) \
$(FBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects)
$(FBMGR_Objects) $(REBUILD_Objects) $(RELAY_Objects) $(GSERV_Objects)
Dependencies = $(AllObjects:.o=.d)
.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay create_db fb_lock_print
.PHONY: all gstat gsec fbguard fbmgr_bin nbackup gds_drop gds_relay create_db fb_lock_print gserv
all: $(CLIENT_UTIL_TARGETS)
@ -146,6 +154,10 @@ gds_drop: $(GDS_DROP)
$(GDS_DROP): $(DROP_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $(DROP_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
gserv: $(LIBFBCLIENT_SO) $(GSERV)
$(GSERV): $(GSERV_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $^ -o $@ -L$(LIB) $(LINK_LIBS) @PTHREAD_CFLAGS@ @PTHREAD_LIBS@
gds_relay: $(GDS_RELAY)

2
builds/posix/Makefile.in.embed.gbak
View File

@ -45,7 +45,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp
GBAK_Other_Sources = remote/xdr.cpp jrd/sdl.cpp jrd/os/posix/path_utils.cpp
GBAK_Files = backup.epp restore.epp \
burp.cpp canonical.cpp misc.cpp mvol.cpp
GBAK_Sources = $(addprefix burp/, $(GBAK_Files)) $(GBAK_Other_Sources)

2
builds/posix/Makefile.in.embed.gfix
View File

@ -48,7 +48,7 @@ include $(ROOT)/gen/make.shared.variables
GFIX_Files = alice_meta.epp \
alice.cpp all.cpp exe.cpp tdr.cpp
GFIX_Other_Sources += jrd/isc.cpp jrd/ThreadData.cpp
GFIX_Other_Sources += jrd/isc.cpp jrd/ThreadData.cpp jrd/os/posix/path_utils.cpp
GFIX_Sources = $(addprefix alice/, $(GFIX_Files)) $(GFIX_Other_Sources)
GFIX_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GFIX_Sources))))

2
builds/posix/Makefile.in.embed.gpre
View File

@ -38,7 +38,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp
GPRE_Other_Sources = jrd/dsc.cpp jrd/isc.cpp jrd/os/posix/path_utils.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 \

2
builds/posix/Makefile.in.embed.isql
View File

@ -41,7 +41,7 @@ include $(ROOT)/gen/make.shared.variables
unexport ISC_USER
unexport ISC_PASSWORD
ISQL_Other_Sources =
ISQL_Other_Sources = jrd/os/posix/path_utils.cpp
ISQL_Files = extract.epp isql.epp show.epp Extender.cpp
ISQL_Sources = $(addprefix isql/, $(ISQL_Files)) $(ISQL_Other_Sources)
ISQL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ISQL_Sources))))

2
builds/posix/Makefile.in.embed.qli
View File

@ -39,7 +39,7 @@ include $(ROOT)/gen/make.shared.variables
@SET_MAKE@
QLI_Other_Sources = jrd/dsc.cpp gpre/pretty.cpp
QLI_Other_Sources = jrd/dsc.cpp gpre/pretty.cpp jrd/os/posix/path_utils.cpp
QLI_Files= all.cpp command.cpp compile.cpp dtr.cpp err.cpp eval.cpp \
expand.cpp exe.cpp format.cpp gener.cpp help.cpp \

1
builds/posix/make.defaults
View File

@ -252,6 +252,7 @@ FB_CLASSIC_SERVER = $(BIN)/fb_inet_server$(EXEC_EXT)
# From utilities
CREATE_DB = $(BIN)/create_db$(EXEC_EXT)
GDS_DROP = $(BIN)/gds_drop$(EXEC_EXT)
GSERV = $(BIN)/gserv$(EXEC_EXT)
GSTAT = $(BIN)/gstat$(EXEC_EXT)
NBACKUP = $(BIN)/nbackup$(EXEC_EXT)
LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT)

2
builds/posix/prefix.linux_amd64
View File

@ -24,7 +24,7 @@ WARN_FLAGS=-Wall -Wno-switch -Wno-parentheses -Wno-unknown-pragmas -Wno-unused-v
CXXFLAGS:= $(CXXFLAGS) -fno-rtti
PROD_FLAGS=-DNDEBUG $(COMMON_FLAGS) $(OPTIMIZE_FLAGS)
DEV_FLAGS=-p $(COMMON_FLAGS) $(WARN_FLAGS)
DEV_FLAGS=$(COMMON_FLAGS) $(WARN_FLAGS)
OS_ServerFiles=inet_server.cpp