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

Updated build system to remove jrd_static.a, and make it possible to build

Browse Source 
completely statically linked executables.
This commit is contained in:
bellardo 2001-08-07 02:15:26 +00:00
parent ee1c082041
commit a96cc90b94
20 changed files with 113 additions and 182 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/make.new/Makefile.in.alice
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.alice,v 1.3 2001-08-01 04:18:37 skywalker Exp $ # $Id: Makefile.in.alice,v 1.4 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -56,8 +56,8 @@ Dependencies = $(All_Objects:.o=.d)
# Ok so alice, all-else became the program gfix. # Ok so alice, all-else became the program gfix.
gfix: $(BIN)/gfix gfix: $(BIN)/gfix
$(BIN)/gfix: $(ALICE_Objects) $(LIBGDS_LA) $(BIN)/gfix: $(ALICE_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
# $(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) # $(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@

12
src/make.new/Makefile.in.burp
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.burp,v 1.2 2001-08-01 08:11:52 skywalker Exp $ # $Id: Makefile.in.burp,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -62,7 +62,7 @@ all: gbak_static gbak gsplit
gbak_static : $(BIN)/gbak_static gbak_static : $(BIN)/gbak_static
$(BIN)/gbak_static : $(BURP_Objects) $(LIB)/jrd_static.a $(BIN)/gbak_static : $(BURP_Objects) $(BOOT_GDSLIB_Objects)
$(CXX) $(LINK_OPTS) $^ -o $@ $(COREFOUNDATION_LINK) $(LINK_LIBS) $(CXX) $(LINK_OPTS) $^ -o $@ $(COREFOUNDATION_LINK) $(LINK_LIBS)
@ -75,8 +75,8 @@ $(BIN)/gbak_static : $(BURP_Objects) $(LIB)/jrd_static.a
gbak: $(BIN)/gbak gbak: $(BIN)/gbak
$(BIN)/gbak: $(BURP_Objects) $(LIBGDS_LA) $(BIN)/gbak: $(BURP_Objects) $(LIBGDS_DEP)
$(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CXX) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
@ -85,8 +85,8 @@ gsplit : $(BIN)/gsplit
# be careful of split vs spit here the public name is gsplit the internal # be careful of split vs spit here the public name is gsplit the internal
# one is spit, so be careful the macros have the right name. # one is spit, so be careful the macros have the right name.
$(BIN)/gsplit: $(SPIT_Objects) $(LIBGDS_LA) $(BIN)/gsplit: $(SPIT_Objects) $(LIBGDS_DEP)
$(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CXX) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@

15
src/make.new/Makefile.in.dsql
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.dsql,v 1.2 2001-08-01 04:18:37 skywalker Exp $ # $Id: Makefile.in.dsql,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -52,21 +52,10 @@ Dependencies = $(AllObjects:.o=.d)
.PHONY: jrd_static
jrd_static : $(LIB)/jrd_static.a($(DSQL_Objects))
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# In phase2 we add the same objects as before, we just rebuild them as
# portable and load them into a shared libgds.so library.
# Build all our files that belong in the shared library.
.PHONY: jrdlib_dependencies .PHONY: jrdlib_dependencies
jrdlib_dependencies: $(DSQL_Objects) jrdlib_dependencies: $(DSQL_Objects)

6
src/make.new/Makefile.in.dudley
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.dudley,v 1.3 2001-08-06 15:08:18 skywalker Exp $ # $Id: Makefile.in.dudley,v 1.4 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -56,8 +56,8 @@ all: gdef
gdef: $(BIN)/gdef gdef: $(BIN)/gdef
$(BIN)/gdef: $(DUDLEY_Objects) $(LIBGDS_LA) $(BIN)/gdef: $(DUDLEY_Objects) $(LIBGDS_DEP)
$(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CXX) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@

10
src/make.new/Makefile.in.example5
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.example5,v 1.1 2001-07-29 23:43:23 skywalker Exp $ # $Id: Makefile.in.example5,v 1.2 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -146,9 +146,9 @@ employee.gdb: empbuild$(EXEC_EXT) $(INPUT_FILES)
./empbuild employee.gdb ./empbuild employee.gdb
-$(CHMOD_6) employee.gdb -$(CHMOD_6) employee.gdb
empbuild: $(EMPBLD_OBJ) $(LIBGDS_LA) empbuild: $(EMPBLD_OBJ) $(LIBGDS_DEP)
-$(RM) $@ -$(RM) $@
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
empbuild.exe: $(EMPBLD_OBJ) empbuild.exe: $(EMPBLD_OBJ)
@ -180,9 +180,9 @@ intlbuild.gdb : intlddl.sql intlbld.sql
-$(RM) intlbuild.gdb -$(RM) intlbuild.gdb
$(ISQL) -i intlbld.sql $(ISQL) -i intlbld.sql
intlbld: $(INTLBLD_OBJ) $(LIBGDS_LA) intlbld: $(INTLBLD_OBJ) $(LIBGDS_DEP)
-$(RM) $@ -$(RM) $@
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
intlbld.exe: $(INTLBLD_OBJ) intlbld.exe: $(INTLBLD_OBJ)

17
src/make.new/Makefile.in.fbutil
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.fbutil,v 1.2 2001-08-01 04:18:37 skywalker Exp $ # $Id: Makefile.in.fbutil,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -43,22 +43,9 @@ AllObjects= $(FBUTIL_Objects)
Dependancies=$(AllObjects:.o=.d) Dependancies=$(AllObjects:.o=.d)
.PHONY: all libs progs # Build all our objects that belong in the shared library.
jrd_static : $(LIB)/jrd_static.a($(FBUTIL_Objects))
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# In phase2 we add the same objects as before, we just rebuild them as
# portable and load them into a shared libgds.so library.
.PHONY: jrdlib_dependencies .PHONY: jrdlib_dependencies
jrdlib_dependencies: $(FBUTIL_Objects) jrdlib_dependencies: $(FBUTIL_Objects)

16
src/make.new/Makefile.in.firebird
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.firebird,v 1.3 2001-08-02 07:03:59 skywalker Exp $ # $Id: Makefile.in.firebird,v 1.4 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=.. ROOT=..
@ -74,7 +74,7 @@ firebird: phase1 phase2 phase3
# (If you really want to rebuild it you need to remove the executable file # (If you really want to rebuild it you need to remove the executable file
# $(BIN)/gpre_static). # $(BIN)/gpre_static).
# #
.PHONY: phase1 phase1_build jrd_boot gpre_boot jrd_static gpre_static .PHONY: phase1 phase1_build jrd_boot gpre_boot gpre_static
phase1: $(GPRE_STATIC) phase1: $(GPRE_STATIC)
@ -82,19 +82,11 @@ phase1: $(GPRE_STATIC)
$(GPRE_STATIC): $(GPRE_STATIC):
$(MAKE) phase1_build $(MAKE) phase1_build
phase1_build: jrd_boot gpre_boot build_alt_use_boot jrd_static gpre_static phase1_build: jrd_boot gpre_boot build_alt_use_boot jrdlib_dependencies gpre_static
gpre_static : jrd_static gpre_static : jrdlib_dependencies
$(MAKE) -C gpre $@ $(MAKE) -C gpre $@
jrd_static : gpre_boot
$(MAKE) -C jrd $@
$(MAKE) -C dsql $@
$(MAKE) -C lock $@
$(MAKE) -C remote $@
$(MAKE) -C pipe $@
$(MAKE) -C wal $@
build_alt_use_boot: # Create header file so jrd/alt.cpp does not use security. build_alt_use_boot: # Create header file so jrd/alt.cpp does not use security.
$(MAKE) -C jrd $@ # Also 'hack' security to build dummy .o files $(MAKE) -C jrd $@ # Also 'hack' security to build dummy .o files
$(MAKE) -C utilities $@ $(MAKE) -C utilities $@

8
src/make.new/Makefile.in.gpre
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.gpre,v 1.4 2001-08-04 22:48:18 bellardo Exp $ # $Id: Makefile.in.gpre,v 1.5 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -81,15 +81,15 @@ $(GPRE_BOOT): $(GPRECommon_Objects) $(GPREBoot_Objects) $(LIB)/jrd_boot.a
$(LN) $(@F) $(GPRE_CURRENT) $(LN) $(@F) $(GPRE_CURRENT)
$(GPRE_STATIC):$(GPRECommon_Objects) $(GPRE_Objects) $(LIB)/jrd_static.a $(GPRE_STATIC):$(GPRECommon_Objects) $(GPRE_Objects) $(BOOT_GDSLIB_Objects)
$(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ $(STATICLINK_LIBS) $(STATICEXE_LINK) $(LINK_OPTS) $^ -o $@ $(STATICLINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
-$(RM) $(GPRE_CURRENT) -$(RM) $(GPRE_CURRENT)
$(LN) $(@F) $(GPRE_CURRENT) $(LN) $(@F) $(GPRE_CURRENT)
$(GPRE):$(GPRECommon_Objects) $(GPRE_Objects) $(LIBGDS_LA) $(GPRE):$(GPRECommon_Objects) $(GPRE_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
-$(RM) $(GPRE_CURRENT) -$(RM) $(GPRE_CURRENT)
$(LN) $(@F) $(GPRE_CURRENT) $(LN) $(@F) $(GPRE_CURRENT)

10
src/make.new/Makefile.in.isql
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.isql,v 1.2 2001-08-01 08:11:52 skywalker Exp $ # $Id: Makefile.in.isql,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -66,8 +66,8 @@ isql: $(ISQL)
$(ISQL): $(ISQL_Objects) $(LIBGDS_LA) $(ISQL): $(ISQL_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
@ -79,8 +79,8 @@ $(ISQL): $(ISQL_Objects) $(LIBGDS_LA)
muisql: $(MUISQL) muisql: $(MUISQL)
$(MUISQL): $(ISQL_Objects) $(LIBGDS_LA) $(MUISQL): $(ISQL_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
# Again this wants to change to $(GEN_SRC) directory # Again this wants to change to $(GEN_SRC) directory

24
src/make.new/Makefile.in.jrd
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.jrd,v 1.5 2001-08-06 15:08:18 skywalker Exp $ # $Id: Makefile.in.jrd,v 1.6 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -53,7 +53,7 @@ GPRE_FLAGS = -n -z -gds_cxx -raw -ids
.PHONY: jrd_boot jrd_static .PHONY: jrd_boot
# This is the very first library built it contains just enough methods # This is the very first library built it contains just enough methods
@ -68,24 +68,20 @@ jrd_boot : $(LIB)/jrd_boot.a
$(LIB)/jrd_boot.a: $(BOOT_Objects) $(LIB)/jrd_boot.a: $(BOOT_Objects)
-$(RM) $@ -$(RM) $@
$(AR) $@ $^ $(AR) $@ $^
-ranlib $@ -$(RANLIB) $@
$(CHMOD_6) $@ $(CHMOD_6) $@
# Add all the jrd objects to the jrd static library. # Add all the jrd objects to the jrd static library.
jrd_static : $(LIB)/jrd_static.a($(JRD_Objects)) $(LIBGDS_A) : $(GDSLIB_Objects)
$(RANLIB) $(LIB)/jrd_static.a ar -q $@ $^
-$(RANLIB) $@
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# This is the first dynamic link library that we build in phase2 it still # This is the first dynamic link library that we build in phase2 it still
# does not contain security objects. # does not contain security objects. Also used to produce the object files
# that the *_static programs link against.
jrdlib_dependencies: $(JRD_Objects) jrdlib_dependencies: $(JRD_Objects)
@ -660,9 +656,9 @@ rebuild_codes: codes
./codes $(ROOT)/src/include/gen ./codes $(ROOT)/src/include/gen
codes: codes.o $(STDIO) $(LIBGDS_LA) codes: codes.o $(STDIO) $(LIBGDS_DEP)
-$(RM) codes -$(RM) codes
$(EXE_LINK) $(LINK_OPTIONS) $(CXX_INCLUDE_DIRS) -o codes $^ $(EXE_LINK) $(LINK_OPTIONS) $(LIBGDS_LINK) $(CXX_INCLUDE_DIRS) -o codes $^
$(CHMOD_7) codes $(CHMOD_7) codes

31
src/make.new/Makefile.in.lock
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.lock,v 1.3 2001-08-04 22:48:18 bellardo Exp $ # $Id: Makefile.in.lock,v 1.4 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -54,7 +54,7 @@ Dependencies = $(All_Objects:.o=.d)
.PHONY: jrd_static gds_lock_manager lock_print lock_config_file .PHONY: gds_lock_manager lock_print lock_config_file
all: jrdlib_dependencies gds_lock_manager lock_print lock_config_file all: jrdlib_dependencies gds_lock_manager lock_print lock_config_file
@ -62,24 +62,11 @@ all: jrdlib_dependencies gds_lock_manager lock_print lock_config_file
other_targets: lock_driver # is a lock test program other_targets: lock_driver # is a lock test program
# jrd_static
#
# As part of the boot build process a static library is build with the lock
# object in it. After the boot has built it is no longer required.
jrd_static : $(LIB)/jrd_static.a($(LOCK_Objects))
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# jrdlib_dependencies # jrdlib_dependencies
# #
# In phase2 we add the same objects as before, we just rebuild them as # Used in phase1 and phase2 to build the LOCK objects that belong in the
# portable and load them into a shared libgds.so library. # shared library.
jrdlib_dependencies: $(LOCK_Objects) jrdlib_dependencies: $(LOCK_Objects)
@ -92,7 +79,7 @@ jrdlib_dependencies: $(LOCK_Objects)
gds_lock_manager : $(BIN)/gds_lock_mgr gds_lock_manager : $(BIN)/gds_lock_mgr
$(BIN)/gds_lock_mgr: $(LOCKMGR_Objects) $(LIB)/jrd_static.a $(BIN)/gds_lock_mgr: $(LOCKMGR_Objects) $(BOOT_GDSLIB_Objects)
$(CXX) $(LINK_OPTS) $^ -o $@ $(CXX) $(LINK_OPTS) $^ -o $@
$(CHMOD_S7) $@ $(CHMOD_S7) $@
@ -105,8 +92,8 @@ $(BIN)/gds_lock_mgr: $(LOCKMGR_Objects) $(LIB)/jrd_static.a
lock_print : $(BIN)/lock_print lock_print : $(BIN)/lock_print
$(BIN)/lock_print: $(LOCKPRINT_Objects) $(LIBGDS_LA) $(BIN)/lock_print: $(LOCKPRINT_Objects) $(LIBGDS_DEP)
$(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CXX) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_S7) $@ $(CHMOD_S7) $@
@ -132,8 +119,8 @@ $(INTERBASE)/isc_config : config_params
lock_driver : $(BIN)/lock_driver lock_driver : $(BIN)/lock_driver
$(BIN)/lock_driver: $(LOCKDRIVER_OBJECTS) $(LIBGDS_LA) $(BIN)/lock_driver: $(LOCKDRIVER_OBJECTS) $(LIBGDS_DEP)
$(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CXX) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_S7) $@ $(CHMOD_S7) $@

22
src/make.new/Makefile.in.msgs
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.msgs,v 1.3 2001-08-06 19:36:58 bellardo Exp $ # $Id: Makefile.in.msgs,v 1.4 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -82,28 +82,28 @@ do_check: $(CHECK_MESSAGES) $(BUILD_FILE)
$(CHECK_MESSAGES): $(CHECK_OBJECTS) $(LIBGDS_LA) $(CHECK_MESSAGES): $(CHECK_OBJECTS) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
$(BUILD_FILE): $(BUILD_OBJECTS) $(LIBGDS_LA) $(BUILD_FILE): $(BUILD_OBJECTS) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
$(ENTER_MESSAGES): $(ENTER_OBJECTS) $(LIBGDS_LA) $(ENTER_MESSAGES): $(ENTER_OBJECTS) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
$(MODIFY_MESSAGES): $(MODIFY_OBJECTS) $(LIBGDS_LA) $(MODIFY_MESSAGES): $(MODIFY_OBJECTS) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
$(CHANGE_MESSAGES): $(CHANGE_OBJECTS) $(LIBGDS_LA) $(CHANGE_MESSAGES): $(CHANGE_OBJECTS) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@

17
src/make.new/Makefile.in.pipe
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.pipe,v 1.2 2001-08-01 04:18:37 skywalker Exp $ # $Id: Makefile.in.pipe,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -44,22 +44,9 @@ AllObjects = $(PIPE_Objects)
Dependencies = $(All_Objects:.o=.d) Dependencies = $(All_Objects:.o=.d)
.PHONY: jrd_static # Build the PIPE objects that belong in the shared library.
jrd_static : $(LIB)/jrd_static.a($(PIPE_Objects))
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# In phase2 we add the same objects as before, we just rebuild them as
# portable and load them into a shared libgds.so library.
.PHONY: jrdlib_dependencies .PHONY: jrdlib_dependencies
jrdlib_dependencies: $(PIPE_Objects) jrdlib_dependencies: $(PIPE_Objects)

6
src/make.new/Makefile.in.qli
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.qli,v 1.2 2001-08-01 08:11:52 skywalker Exp $ # $Id: Makefile.in.qli,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -63,8 +63,8 @@ allx: qli # allx is used since there is a local all.cpp file.
# #
qli : $(QLI) qli : $(QLI)
$(QLI): $(QLI_Objects) $(LIBGDS_LA) $(QLI): $(QLI_Objects) $(LIBGDS_DEP)
$(CXX) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CXX) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_S7) $@ $(CHMOD_S7) $@

21
src/make.new/Makefile.in.remote
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.remote,v 1.3 2001-08-01 04:18:37 skywalker Exp $ # $Id: Makefile.in.remote,v 1.4 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -57,22 +57,9 @@ AllObjects = $(INTERFACE_Objects) $(SERVER_Objects) $(INETSERVER_Objects)
Dependencies = $(AllObjects:.o=.d) Dependencies = $(AllObjects:.o=.d)
.PHONY: jrd_static # Build the INTERFACE objects that go in the shared library
jrd_static : $(LIB)/jrd_static.a($(INTERFACE_Objects))
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# In phase2 we add the same objects as before, we just rebuild them as
# portable and load them into a shared libgds.so library.
.PHONY: jrdlib_dependencies .PHONY: jrdlib_dependencies
jrdlib_dependencies: $(INTERFACE_Objects) jrdlib_dependencies: $(INTERFACE_Objects)
@ -88,8 +75,8 @@ all: inet_server
inet_server : $(BIN)/gds_inet_server inet_server : $(BIN)/gds_inet_server
$(BIN)/gds_inet_server: $(SERVER_Objects) $(INETSERVER_Objects) $(LIBGDS_LA) $(BIN)/gds_inet_server: $(SERVER_Objects) $(INETSERVER_Objects) $(LIBGDS_DEP)
$(CC) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(CC) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_S7) $@ $(CHMOD_S7) $@

33
src/make.new/Makefile.in.utilities
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.utilities,v 1.5 2001-08-06 15:08:18 skywalker Exp $ # $Id: Makefile.in.utilities,v 1.6 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -45,7 +45,8 @@ CREATEDB_Objects = $(CREATEDB_Sources:%.cpp=$(OBJ)/%.o)
DROP_Sources = drop.cpp dropv3.cpp DROP_Sources = drop.cpp dropv3.cpp
DROP_Objects = $(DROP_Sources:%.cpp=$(OBJ)/%.o) DROP_Objects = $(DROP_Sources:%.cpp=$(OBJ)/%.o)
GSEC_Sources = gsec.cpp security.cpp #GSEC_Sources = gsec.cpp security.cpp
GSEC_Sources = gsec.cpp
GSEC_Objects = $(GSEC_Sources:%.cpp=$(OBJ)/%.o) GSEC_Objects = $(GSEC_Sources:%.cpp=$(OBJ)/%.o)
GSTAT_Sources = dba.cpp ppg.cpp GSTAT_Sources = dba.cpp ppg.cpp
@ -103,12 +104,12 @@ ibguard : $(IBGUARD)
$(CREATE_DB): $(CREATEDB_Objects) $(LIB)/jrd_static.a $(CREATE_DB): $(CREATEDB_Objects) $(BOOT_GDSLIB_Objects)
$(STATICEXE_LINK) $(STATICLINK_OPTS) $^ -o $@ $(STATICLINK_LIBS) $(STATICEXE_LINK) $(STATICLINK_OPTS) $^ -o $@ $(STATICLINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
$(GDS_DROP): $(DROP_Objects) $(LIB)/jrd_static.a $(GDS_DROP): $(DROP_Objects) $(BOOT_GDSLIB_Objects)
$(STATICEXE_LINK) $(STATICLINK_OPTS) $^ -o $@ $(STATICLINK_LIBS) $(STATICEXE_LINK) $(STATICLINK_OPTS) $^ -o $@ $(STATICLINK_LIBS)
$(CHMOD_S7) $@ $(CHMOD_S7) $@
@ -185,8 +186,8 @@ have_added_sysdba_user.flg : $(ISC_GDB) $(GSEC)
# no it aint MOD 13-7-2001 # no it aint MOD 13-7-2001
$(GSEC): $(GSEC_Objects) $(LIBGDS_LA) $(GSEC): $(GSEC_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
@ -195,32 +196,32 @@ $(GSEC): $(GSEC_Objects) $(LIBGDS_LA)
# dba/gstat # dba/gstat
$(GSTAT): $(GSTAT_Objects) $(LIBGDS_LA) $(GSTAT): $(GSTAT_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
# ibguard # ibguard
$(IBGUARD): $(IBGUARD_Objects) $(LIBGDS_LA) $(IBGUARD): $(IBGUARD_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
# ibmgr # ibmgr
$(IBMGR_BIN): $(IBMGR_Objects) $(LIBGDS_LA) $(IBMGR_BIN): $(IBMGR_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
# rebuild # rebuild
$(GDS_REBUILD): $(REBUILD_Objects) $(LIBGDS_LA) $(GDS_REBUILD): $(REBUILD_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@
@ -228,8 +229,8 @@ $(GDS_REBUILD): $(REBUILD_Objects) $(LIBGDS_LA)
$(GDS_RELAY): $(RELAY_Objects) $(LIBGDS_LA) $(GDS_RELAY): $(RELAY_Objects) $(LIBGDS_DEP)
$(EXE_LINK) $(LINK_OPTS) $^ -o $@ $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(LIBGDS_LINK) $^ -o $@ $(LINK_LIBS)
$(CHMOD_7) $@ $(CHMOD_7) $@

17
src/make.new/Makefile.in.wal
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.wal,v 1.2 2001-08-01 04:18:37 skywalker Exp $ # $Id: Makefile.in.wal,v 1.3 2001-08-07 02:15:26 bellardo Exp $
# #
ROOT=../.. ROOT=../..
@ -45,22 +45,9 @@ Dependencies = $(All_Objects:.o=.d)
.PHONY: jrd_static # Build the WAL objects that belong in the shared library.
jrd_static : $(LIB)/jrd_static.a($(WAL_Objects))
$(LIB)/jrd_static.a(%.o) : %.o
ar crv $@ $%
# In phase2 we add the same objects as before, we just rebuild them as
# portable and load them into a shared libgds.so library.
.PHONY: jrdlib_dependencies .PHONY: jrdlib_dependencies
jrdlib_dependencies: $(WAL_Objects) jrdlib_dependencies: $(WAL_Objects)

6
src/make.new/make.defaults
View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: make.defaults,v 1.5 2001-08-04 22:48:18 bellardo Exp $ # $Id: make.defaults,v 1.6 2001-08-07 02:15:26 bellardo Exp $
# #
@ -86,8 +86,12 @@ LIBGDS_A = $(LIB)/libgds.a
ifdef UseSharedLibraries ifdef UseSharedLibraries
LIBGDS_LA = $(LIBGDS_SO) LIBGDS_LA = $(LIBGDS_SO)
LIBGDS_DEP =
LIBGDS_LINK = $(LIBGDS_SO)
else else
LIBGDS_LA = $(LIBGDS_A) LIBGDS_LA = $(LIBGDS_A)
LIBGDS_DEP = $(LIBGDS_LA)
LIBGDS_LINK =
endif endif

11
src/make.new/make.shared.variables
View File

@ -157,5 +157,14 @@ GDSLIB_Objects = $(JRD_Objects) \
$(SECURITY_Objects) \ $(SECURITY_Objects) \
$(FBUTIL_Objects) $(FBUTIL_Objects)
GDSLIB_SharedObjects = $(GDSLIB_Objects:.o=.lo) # Notice that $(SECURITY_Objects) are missing, because that file can't be
# compiled until later in the build process.
BOOT_GDSLIB_Objects = $(JRD_Objects) \
$(DSQL_Objects) \
$(LOCK_Objects) \
$(INTERFACE_Objects) \
$(PIPE_Objects) \
$(WAL_Objects) \
$(GPRELIB_Objects) \
$(FBUTIL_Objects)

7
src/make.new/prefix.darwin
View File

@ -15,7 +15,7 @@
# All Rights Reserved. # All Rights Reserved.
# Contributor(s): ______________________________________. # Contributor(s): ______________________________________.
# Start of file prefix.darwin: $(VERSION) @PLATFORM@ # Start of file prefix.darwin: $(VERSION) @PLATFORM@
#$Id: prefix.darwin,v 1.3 2001-08-07 00:41:03 bellardo Exp $ #$Id: prefix.darwin,v 1.4 2001-08-07 02:15:26 bellardo Exp $
#_____________________________________________________________________________ #_____________________________________________________________________________
@ -204,6 +204,11 @@ CFLAGS := $(CARBONCORE_DIR_FLAG) $(CFLAGS)
CXXFLAGS:= $(CXXFLAGS) $(CFLAGS) CXXFLAGS:= $(CXXFLAGS) $(CFLAGS)
# Set up the link line to work with the framework.
ifdef UseSharedLibraries
LIBGDS_LINK = -F$(FIREBIRD) -framework $(FBFW_PREFIX)
endif
# Set DYLD_FRAMEWORK_PATH to point to the framework we are building. # Set DYLD_FRAMEWORK_PATH to point to the framework we are building.