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

-Modify object generation to be dependent on type (boot, std, superserver and superclient) not module. This saves 8% time in a full build.

-Add sqlda_pub.h to monolithic ibase
-Correct refDatabases symbols to avoid repeated generation of executables.
This commit is contained in:
brodsom 2004-04-30 23:02:07 +00:00
parent 9618af369d
commit e9444b9311
36 changed files with 97 additions and 97 deletions

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.boot.gpre,v 1.19 2004-01-21 07:15:58 skidder Exp $
# $Id: Makefile.in.boot.gpre,v 1.20 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=boot.gpre
ObjModuleType=boot
CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.fbudf,v 1.1 2003-09-27 23:29:07 brodsom Exp $
# $Id: Makefile.in.client.fbudf,v 1.2 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=extlib
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,11 +27,11 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gbak,v 1.7 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.client.gbak,v 1.8 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.gbak
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gdef,v 1.8 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.client.gdef,v 1.9 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.gdef
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gfix,v 1.8 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.client.gfix,v 1.9 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.gfix
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.gpre,v 1.13 2004-03-28 05:34:47 skidder Exp $
# $Id: Makefile.in.client.gpre,v 1.14 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.gpre
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.isql,v 1.7 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.client.isql,v 1.8 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.isql
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.qli,v 1.3 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.client.qli,v 1.4 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.qli
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.util,v 1.19 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.client.util,v 1.20 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=client.util
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -29,10 +29,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.codes,v 1.15 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.codes,v 1.16 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=codes
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.fbudf,v 1.2 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.fbudf,v 1.3 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=extlib
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.gbak,v 1.7 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.gbak,v 1.8 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.gbak
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.gdef,v 1.6 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.gdef,v 1.7 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.gdef
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.gfix,v 1.8 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.gfix,v 1.9 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.gfix
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.gpre,v 1.13 2004-03-28 05:34:47 skidder Exp $
# $Id: Makefile.in.embed.gpre,v 1.14 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.gpre
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.isql,v 1.7 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.isql,v 1.8 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.isql
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.lockmgr,v 1.6 2003-11-08 07:39:06 bellardo Exp $
# $Id: Makefile.in.embed.lockmgr,v 1.7 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.lockmgr
ObjModuleType=boot
CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.qli,v 1.13 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.qli,v 1.14 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.qli
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.embed.util,v 1.12 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.embed.util,v 1.13 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=embed.util
ObjModuleType=std
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.examples,v 1.2 2003-08-03 23:18:57 brodsom Exp $
# $Id: Makefile.in.examples,v 1.3 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=../..
ObjModuleName=examples
ObjModuleType=std
# Add the install include directory to the search path since the
# examples need to build using those headers values.

View File

@ -27,10 +27,11 @@
# Contributor(s):
#
#
# $Id: Makefile.in.extern.editline,v 1.2 2003-03-27 11:21:44 aafemt Exp $
# $Id: Makefile.in.extern.editline,v 1.3 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=editline
ObjModuleType=std
## Set your options:
## -DANSI_ARROWS ANSI arrows keys work like emacs.
## -DHIDE Make static functions static (non debug).

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.extlib,v 1.15 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.extlib,v 1.16 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=extlib
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.fbserver,v 1.13 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.fbserver,v 1.14 2004-04-30 23:02:07 brodsom Exp $
#
ROOT=..
ObjModuleName=fbserver
ObjModuleType=superserver
CFLAGS:=-DSUPERSERVER
ArchType=super

View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.firebird,v 1.52 2004-04-27 12:38:41 brodsom Exp $
# $Id: Makefile.in.firebird,v 1.53 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
@ -261,21 +261,21 @@ boot_phase2 : $(ISC_GDB)
$(ISC_GDB):
$(MAKE) boot_phase2_build
boot_phase2_build: create_db empty_db gbak_static isql_static
boot_phase2_build: $(CREATE_DB) empty_db $(GBAK_STATIC) $(ISQL_STATIC)
create_db:
$(CREATE_DB):
$(MAKE) -f $(GEN_ROOT)/Makefile.embed.util $@
gbak_static: @MANAGER_PROCESS_TARGET@
$(GBAK_STATIC): @MANAGER_PROCESS_TARGET@
$(MAKE) -f $(GEN_ROOT)/Makefile.static.gbak $@
isql_static:
$(ISQL_STATIC):
$(MAKE) -f $(GEN_ROOT)/Makefile.static.isql $@
empty_db :
$(MAKE) -f $(GEN_ROOT)/Makefile.refDatabases $@
ref_databases : gbak_static
ref_databases : $(GBAK_STATIC)
$(MAKE) -f $(GEN_ROOT)/Makefile.refDatabases $@
@ -432,7 +432,7 @@ include_generic: $(INCLUDE_DEST)/ib_util.h \
# All these files are #includes in ibase.h here we cat them all together
# and remove the embedded #includes to make it simpler for external usage.
IBASE_ExtraFiles = include/fb_types.h jrd/ibase.h jrd/blr.h include/gen/iberror.h
IBASE_ExtraFiles = include/fb_types.h dsql/sqlda_pub.h jrd/ibase.h jrd/blr.h include/gen/iberror.h
SRC_IBASE_ExtraFiles = $(addprefix $(SRC_ROOT)/, $(IBASE_ExtraFiles))
$(INCLUDE_DEST)/ibase.h: $(SRC_IBASE_ExtraFiles)

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.inet_server,v 1.13 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.inet_server,v 1.14 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=inet_server
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.intl,v 1.17 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.intl,v 1.18 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=intl
ObjModuleType=superclient
CFLAGS:=-DSUPERCLIENT
include $(ROOT)/gen/make.defaults
@ -55,8 +55,8 @@ INTL_Files1= ld.cpp cv_narrow.cpp \
INTL_Files2= ld2.cpp
INTL_Sources = $(INTL_Files1)
# INTL_Sources = $(INTL_Files1)
INTL_Sources = $(addprefix intl/, $(INTL_Files1))
INTL_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(INTL_Sources))))

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.libfbclient,v 1.21 2004-03-25 23:12:31 skidder Exp $
# $Id: Makefile.in.libfbclient,v 1.22 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=libfbclient
ObjModuleType=superclient
CFLAGS:=-DSUPERCLIENT
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.libfbcommon,v 1.6 2003-03-27 11:21:45 aafemt Exp $
# $Id: Makefile.in.libfbcommon,v 1.7 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=libfbcommon
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.libfbembed,v 1.12 2004-04-20 19:21:58 brodsom Exp $
# $Id: Makefile.in.libfbembed,v 1.13 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=libfbembed
ObjModuleType=std
ArchType=classic
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.libfbstatic,v 1.5 2003-03-27 11:21:45 aafemt Exp $
# $Id: Makefile.in.libfbstatic,v 1.6 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=libfbstatic
ObjModuleType=boot
CFLAGS:=-DBOOT_BUILD
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.msgs,v 1.13 2003-07-08 12:24:12 brodsom Exp $
# $Id: Makefile.in.msgs,v 1.14 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=msgs
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,11 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.refDatabases,v 1.20 2004-01-07 00:31:18 brodsom Exp $
# $Id: Makefile.in.refDatabases,v 1.21 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=refDatabases
ObjModuleType=std
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.static.gbak,v 1.7 2003-11-08 07:39:06 bellardo Exp $
# $Id: Makefile.in.static.gbak,v 1.8 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=static.gbak
ObjModuleType=boot
CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.static.gpre,v 1.14 2004-01-21 07:15:58 skidder Exp $
# $Id: Makefile.in.static.gpre,v 1.15 2004-04-30 23:02:06 brodsom Exp $
#
ROOT=..
ObjModuleName=static.gpre
ObjModuleType=boot
CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults

View File

@ -27,10 +27,10 @@
# Contributor(s):
#
#
# $Id: Makefile.in.static.isql,v 1.6 2003-03-27 11:21:45 aafemt Exp $
# $Id: Makefile.in.static.isql,v 1.7 2004-04-30 23:01:51 brodsom Exp $
#
ROOT=..
ObjModuleName=static.isql
ObjModuleType=boot
CFLAGS:= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults

View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.defaults,v 1.34 2004-03-25 23:12:31 skidder Exp $
# $Id: make.defaults,v 1.35 2004-04-30 23:02:07 brodsom Exp $
#
@ -65,7 +65,7 @@ RealSrcRootPath = $(shell cd $(SRC_ROOT); pwd)
#ModuleName:=$(notdir $(CURDIR))
ModuleName:=$(subst $(RealSrcRootPath)/,,$(CURDIR))
OBJ=$(TMP_ROOT)/$(ObjModuleName)
OBJ=$(TMP_ROOT)/$(ObjModuleType)
GEN_SRC=$(OBJ)
@ -193,24 +193,24 @@ FB_SUPER_SERVER = $(BIN)/fbserver$(EXEC_EXT)
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)
GSTAT = $(BIN)/gstat$(EXEC_EXT)
NBACKUP = $(BIN)/nbackup$(EXEC_EXT)
LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT)
GSEC = $(BIN)/gsec$(EXEC_EXT)
CREATE_DB = $(BIN)/create_db$(EXEC_EXT)
GDS_DROP = $(BIN)/gds_drop$(EXEC_EXT)
GSTAT = $(BIN)/gstat$(EXEC_EXT)
NBACKUP = $(BIN)/nbackup$(EXEC_EXT)
LOCKPRINT = $(BIN)/fb_lock_print$(EXEC_EXT)
GSEC = $(BIN)/gsec$(EXEC_EXT)
GFIX = $(BIN)/gfix$(EXEC_EXT)
GDS_REBUILD = $(BIN)/gds_rebuild$(EXEC_EXT)
GDS_RELAY = $(BIN)/gds_relay$(EXEC_EXT)
GDS_INSTALL = $(BIN)/gds_install$(EXEC_EXT)
GDS_INSTALL = $(BIN)/gds_install_service$(EXEC_EXT)
FBGUARD = $(BIN)/fbguard$(EXEC_EXT)
IBGUARD = $(BIN)/ibguard$(EXEC_EXT)
FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT)
INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
ISC_GDB = $(FIREBIRD)/security.fdb
ISC_GBAK = $(BIN)/security.gbak
GDS_REBUILD = $(BIN)/gds_rebuild$(EXEC_EXT)
GDS_RELAY = $(BIN)/gds_relay$(EXEC_EXT)
GDS_INSTALL = $(BIN)/gds_install$(EXEC_EXT)
GDS_INSTALL = $(BIN)/gds_install_service$(EXEC_EXT)
FBGUARD = $(BIN)/fbguard$(EXEC_EXT)
IBGUARD = $(BIN)/ibguard$(EXEC_EXT)
FBMGR_BIN = $(BIN)/fbmgr.bin$(EXEC_EXT)
INSTREG = $(BIN)/instreg$(EXEC_EXT)
INSTSVC = $(BIN)/instsvc$(EXEC_EXT)
ISC_GDB = $(FIREBIRD)/security.fdb
ISC_GBAK = $(BIN)/security.gbak
# From qli
QLI = $(BIN)/qli$(EXEC_EXT)