mirror of
https://github.com/FirebirdSQL/firebird.git
synced 2025-01-22 20:03:02 +01:00
More changes to make fb2 compile on linux work with new build structure
This commit is contained in:
skywalker
parent
d3c70721cc
commit
c8d8db2ba1
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.boot.gpre,v 1.1 2002-07-29 15:04:05 skywalker Exp $
|
||||
# $Id: Makefile.in.boot.gpre,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=boot.gpre
|
||||
@ -75,17 +75,6 @@ $(GPRE_BOOT): $(GPREBOOT_Objects) $(LIB)/libfbcommon.a
|
||||
$(LN) $(@F) $(GPRE_CURRENT)
|
||||
|
||||
|
||||
|
||||
gpre_static: $(GPRE_STATIC)
|
||||
$(GPRE_STATIC):$(GPRECommon_Objects) $(GPRE_Objects) $(BOOT_GDSLIB_Objects)
|
||||
$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ $(STATICLINK_LIBS)
|
||||
$(CHMOD_7) $@
|
||||
-$(RM) $(GPRE_CURRENT)
|
||||
$(LN) $(@F) $(GPRE_CURRENT)
|
||||
|
||||
|
||||
|
||||
|
||||
FORCE:
|
||||
|
||||
-include $(Dependencies)
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.firebird,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: Makefile.in.firebird,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
|
||||
ROOT=..
|
||||
@ -46,8 +46,8 @@ ISC_PASSWORD= masterkey
|
||||
TEST_PATH = @FIREBIRD_BUILD_DIR@
|
||||
LD_LIBRARY_PATH=$(RealFirebirdPath)/lib
|
||||
|
||||
export ISC_USER
|
||||
export ISC_PASSWORD
|
||||
#export ISC_USER
|
||||
#export ISC_PASSWORD
|
||||
#export INTERBASE
|
||||
export FIREBIRD
|
||||
export DYLD_FRAMEWORK_PATH
|
||||
@ -203,17 +203,17 @@ boot_phase1_build: libfbcommon gpre_boot libfbstatic gpre_static
|
||||
libfbcommon:
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbcommon $@
|
||||
|
||||
gpre_boot: libfbcommon
|
||||
gpre_boot:
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.boot.gpre $@
|
||||
|
||||
libfbstatic: gpre_boot
|
||||
libfbstatic:
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.libfbstatic $@
|
||||
|
||||
gpre_static: gpre_boot libfbcommon libfbstatic
|
||||
gpre_static:
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.static.gpre $@
|
||||
|
||||
# The lock manager for classic (embedded)
|
||||
lock_mgr : libfbcommon libfbstatic
|
||||
lock_mgr :
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.embed.lockmgr $@
|
||||
|
||||
|
||||
@ -251,7 +251,10 @@ gbak_static: lock_mgr
|
||||
isql_static:
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.static.isql $@
|
||||
|
||||
empty_db ref_databases : gbak_static
|
||||
empty_db :
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.refDatabases $@
|
||||
|
||||
ref_databases : gbak_static
|
||||
$(MAKE) -f $(MAKE_ROOT)/Makefile.refDatabases $@
|
||||
|
||||
|
||||
|
||||
@ -29,7 +29,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.libfbstatic,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: Makefile.in.libfbstatic,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=libfbstatic
|
||||
@ -48,6 +48,7 @@ AllObjects= $(LIBFBSTATIC_Objects)
|
||||
Dependancies=$(AllObjects:.o=.d)
|
||||
|
||||
|
||||
|
||||
.PHONY: libfbstatic
|
||||
|
||||
|
||||
@ -64,6 +65,17 @@ $(LIB)/libfbstatic.a: $(LIBFBSTATIC_Objects)
|
||||
$(CHMOD_6) $@
|
||||
|
||||
|
||||
# This is the one where dyn_def.epp produced dyn_def.cpp and then the sed
|
||||
# script is run to remove a component of it. This is pretty ugly, and even
|
||||
# if we have to live with it, the makefile should be changed to make the
|
||||
# dependencies clearer. MOD July-2001
|
||||
|
||||
$(SRC)/jrd/dyn_def.cpp : $(SRC)/jrd/dyn_def.epp $(SRC)/jrd/dyn_def.sed
|
||||
$(GPRE_BOOT) $(JRD_GPRE_FLAGS) $< $(GEN_SRC)/jrd/dyn_deffoo.cpp
|
||||
sed -f $(SRC)/jrd/dyn_def.sed $(GEN_SRC)/jrd/dyn_deffoo.cpp > $@
|
||||
|
||||
|
||||
|
||||
clean:
|
||||
-rm $(AllObjects)
|
||||
-rm $(Dependancies)
|
||||
|
||||
@ -29,15 +29,15 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.msgs,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: Makefile.in.msgs,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=msgs
|
||||
|
||||
include $(ROOT)/src/make.rules
|
||||
include $(ROOT)/src/make.defaults
|
||||
include $(ROOT)/src/make.platform
|
||||
include $(ROOT)/src/make.shared.variables
|
||||
include $(ROOT)/gen/make.rules
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.platform
|
||||
include $(ROOT)/gen/make.shared.variables
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
@ -49,24 +49,24 @@ unexport ISC_PASSWORD
|
||||
|
||||
|
||||
|
||||
CHECK_Files = check_msgs.cpp
|
||||
CHECK_Files = check_msgs.epp
|
||||
CHECK_Sources = $(addprefix msgs/, $(CHECK_Files))
|
||||
CHECK_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CHECK_Sources))))
|
||||
|
||||
|
||||
BUILD_Files = build_file.cpp
|
||||
BUILD_Files = build_file.epp
|
||||
BUILD_Sources = $(addprefix msgs/, $(BUILD_Files))
|
||||
BUILD_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(BUILD_Sources))))
|
||||
|
||||
ENTER_Files = enter_msgs.cpp
|
||||
ENTER_Files = enter_msgs.epp
|
||||
ENTER_Sources = $(addprefix msgs/, $(ENTER_Files))
|
||||
ENTER_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(ENTER_Sources))))
|
||||
|
||||
MODIFY_Files = modify_msgs.cpp
|
||||
MODIFY_Files = modify_msgs.epp
|
||||
MODIFY_Sources = $(addprefix msgs/, $(MODIFY_Files))
|
||||
MODIFY_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(MODIFY_Sources))))
|
||||
|
||||
CHANGE_Files = change_msgs.cpp
|
||||
CHANGE_Files = change_msgs.epp
|
||||
CHANGE_Sources = $(addprefix msgs/, $(CHANGE_Files))
|
||||
CHANGE_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(CHANGE_Sources))))
|
||||
|
||||
@ -84,7 +84,7 @@ Programs = $(BUILD_FILE) $(CHECK_MESSAGES) $(ENTER_MESSAGES) \
|
||||
|
||||
all: build_file check_messages enter_messages modify_messages change_messages
|
||||
|
||||
msgs: msg.gdb master_msg_db $(Programs) do_check message_file
|
||||
msgs: master_msg_db $(Programs) do_check message_file
|
||||
|
||||
|
||||
do_check: $(CHECK_MESSAGES) $(BUILD_FILE)
|
||||
@ -148,11 +148,8 @@ indicator.loc:
|
||||
$(CHECK_MESSAGES) -d $(MSGSDIR)master_msg_db -l
|
||||
|
||||
|
||||
msg.gdb:
|
||||
ln -fs $(SRC_ROOT)/refDatabases/msg.gdb msg.gdb
|
||||
|
||||
master_msg_db:
|
||||
ln -fs $(SRC_ROOT)/refDatabases/msg.gdb master_msg_db
|
||||
ln -fs $(SRC_ROOT)/msg.gdb master_msg_db
|
||||
|
||||
|
||||
|
||||
|
||||
@ -29,16 +29,16 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.refDatabases,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: Makefile.in.refDatabases,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=refDatabases
|
||||
|
||||
|
||||
include $(ROOT)/src/make.rules
|
||||
include $(ROOT)/src/make.defaults
|
||||
include $(ROOT)/src/make.platform
|
||||
include $(ROOT)/src/make.shared.variables
|
||||
include $(ROOT)/gen/make.rules
|
||||
include $(ROOT)/gen/make.defaults
|
||||
include $(ROOT)/gen/make.platform
|
||||
include $(ROOT)/gen/make.shared.variables
|
||||
|
||||
@SET_MAKE@
|
||||
|
||||
@ -64,7 +64,7 @@ export INTERBASE
|
||||
# superuser. You do not have to be root to build classic, it's just a warning
|
||||
# and the build process works fine.
|
||||
|
||||
empty_db : empty.gdb
|
||||
empty_db : empty.gdb yachts.lnk
|
||||
|
||||
empty.gdb : $(BIN)/create_db
|
||||
-$(RM) $@
|
||||
@ -72,6 +72,12 @@ empty.gdb : $(BIN)/create_db
|
||||
touch $@
|
||||
chmod 444 $@
|
||||
|
||||
# Ok so Jim had/has a sailing theme, and the sample database that a lot
|
||||
# of .epp files require to compile is yachts.lnk. MOD 05-Aug-2002
|
||||
|
||||
yachts.lnk: empty.gdb
|
||||
ln -fs $(SRC_ROOT)/empty.gdb yachts.lnk
|
||||
|
||||
|
||||
|
||||
# These are the rest of the databases used to build the system. We also build
|
||||
@ -79,24 +85,24 @@ empty.gdb : $(BIN)/create_db
|
||||
|
||||
.PHONY: ref_databases
|
||||
|
||||
ref_databases : msg.gdb help.gdb metadata.gdb $(FIREBIRD)/help/help.gdb \
|
||||
$(FIREBIRD)/isc4.gdb
|
||||
ref_databases : msg.gdb help.gdb metadata.gdb isc4.gdb
|
||||
|
||||
msg.gdb: $(SRC_ROOT)/msgs/msg.gbak
|
||||
$(BIN)/gbak_static -MODE read_only -R $< msg.gdb
|
||||
chmod 444 msg.gdb
|
||||
touch $@
|
||||
|
||||
help.gdb: $(SRC_ROOT)/misc/help.gbak
|
||||
$(BIN)/gbak_static -MODE read_only -R $< help.gdb
|
||||
chmod 444 help.gdb
|
||||
touch $@
|
||||
help.gdb: $(FIREBIRD)/help/help.gdb
|
||||
ln -fs $^ $@
|
||||
|
||||
$(FIREBIRD)/help/help.gdb: $(SRC_ROOT)/misc/help.gbak
|
||||
$(BIN)/gbak_static -MODE read_only -R $< $@
|
||||
chmod 444 help.gdb
|
||||
touch $@
|
||||
|
||||
isc4.gdb: $(FIREBIRD)/isc4.gdb
|
||||
ln -fs $^ $@
|
||||
|
||||
$(FIREBIRD)/isc4.gdb: $(SRC_ROOT)/misc/isc4.gbak
|
||||
$(BIN)/gbak_static -MODE read_only -R $< $@
|
||||
# chmod 444 help.gdb
|
||||
|
||||
@ -27,7 +27,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: Makefile.in.static.gpre,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: Makefile.in.static.gpre,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
ROOT=..
|
||||
ObjModuleName=static.gpre
|
||||
@ -52,9 +52,9 @@ GPRESTATIC_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(GPRESTATI
|
||||
|
||||
|
||||
AllObjects = $(GPRESTATIC_Objects)
|
||||
|
||||
Dependencies = $(AllObjects:.o=.d)
|
||||
|
||||
|
||||
.PHONY: gpre_static
|
||||
|
||||
all : gpre_static
|
||||
@ -66,6 +66,13 @@ $(GPRE_STATIC): $(GPRESTATIC_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
|
||||
-$(RM) $(GPRE_CURRENT)
|
||||
$(LN) $(@F) $(GPRE_CURRENT)
|
||||
|
||||
|
||||
|
||||
# gpre_meta needs a special boot build since there is no database.
|
||||
$(SRC)/gpre/gpre_meta.cpp: $(SRC)/gpre/gpre_meta.epp
|
||||
$(GPRE_BOOT) -lang_internal $(GPRE_FLAGS) $< $@
|
||||
|
||||
|
||||
FORCE:
|
||||
|
||||
-include $(Dependencies)
|
||||
|
||||
@ -26,7 +26,7 @@
|
||||
# Contributor(s):
|
||||
#
|
||||
#
|
||||
# $Id: make.rules,v 1.1 2002-07-29 15:04:06 skywalker Exp $
|
||||
# $Id: make.rules,v 1.2 2002-08-05 07:14:53 skywalker Exp $
|
||||
#
|
||||
|
||||
#____________________________________________________________________________
|
||||
@ -197,6 +197,9 @@ endif
|
||||
|
||||
|
||||
GPRE_FLAGS= -r -m -z -n
|
||||
JRD_GPRE_FLAGS = -n -z -gds_cxx -raw -ids
|
||||
DSQL_GPRE_FLAGS = -lang_internal -r -m -z -n
|
||||
|
||||
|
||||
.SUFFIXES: .c .e .epp .cpp
|
||||
|
||||
@ -208,6 +211,13 @@ GPRE_FLAGS= -r -m -z -n
|
||||
$(GPRE_CURRENT) $(GPRE_FLAGS) $< $@
|
||||
|
||||
|
||||
$(SRC)/jrd/%.cpp:: $(SRC)/jrd/%.epp
|
||||
$(GPRE_CURRENT) $(JRD_GPRE_FLAGS) $< $@
|
||||
|
||||
|
||||
$(SRC)/dsql/%.cpp:: $(SRC)/dsql/%.epp
|
||||
$(GPRE_CURRENT) $(DSQL_GPRE_FLAGS) $< $@
|
||||
|
||||
|
||||
.SUFFIXES: .lo .o .cpp .c
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user