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

Ironing POSIX build

This commit is contained in:
aafemt 2003-03-27 11:21:47 +00:00
parent 1cf49bb4ba
commit a831b7838e
40 changed files with 133 additions and 134 deletions

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.gbak,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.client.gbak,v 1.5 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.gbak ObjModuleName=client.gbak
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.gdef,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.client.gdef,v 1.5 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.gdef ObjModuleName=client.gdef
CFLAGS := -DSUPERCLIENT CFLAGS := -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.gfix,v 1.5 2003-03-05 15:57:25 brodsom Exp $ # $Id: Makefile.in.client.gfix,v 1.6 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.gfix ObjModuleName=client.gfix
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.gpre,v 1.7 2003-03-05 15:57:25 brodsom Exp $ # $Id: Makefile.in.client.gpre,v 1.8 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.gpre ObjModuleName=client.gpre
CFLAGS:= -DSUPERCLIENT CFLAGS:= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.isql,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.client.isql,v 1.5 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.isql ObjModuleName=client.isql
CFLAGS:=-DSUPERCLIENT CFLAGS:=-DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.client.util,v 1.7 2003-03-21 11:53:48 aafemt Exp $ # $Id: Makefile.in.client.util,v 1.8 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=client.util ObjModuleName=client.util
CFLAGS:= -DSUPERCLIENT CFLAGS:= -DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -29,14 +29,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.codes,v 1.4 2003-03-17 12:05:44 eku Exp $ # $Id: Makefile.in.codes,v 1.5 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=codes ObjModuleName=codes
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.gbak,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.embed.gbak,v 1.5 2003-03-27 11:21:43 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.gbak ObjModuleName=embed.gbak
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.gdef,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.embed.gdef,v 1.5 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.gdef ObjModuleName=embed.gdef
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.gfix,v 1.5 2003-03-05 15:57:25 brodsom Exp $ # $Id: Makefile.in.embed.gfix,v 1.6 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.gfix ObjModuleName=embed.gfix
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.gpre,v 1.7 2003-03-05 15:57:24 brodsom Exp $ # $Id: Makefile.in.embed.gpre,v 1.8 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.gpre ObjModuleName=embed.gpre
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.isql,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.embed.isql,v 1.5 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.isql ObjModuleName=embed.isql
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.lockmgr,v 1.4 2002-12-09 01:38:13 nmcc Exp $ # $Id: Makefile.in.embed.lockmgr,v 1.5 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.lockmgr ObjModuleName=embed.lockmgr
CFLAGS := -DBOOT_BUILD CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.qli,v 1.6 2003-03-17 12:05:45 eku Exp $ # $Id: Makefile.in.embed.qli,v 1.7 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.qli ObjModuleName=embed.qli
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.embed.util,v 1.6 2003-03-05 16:13:07 brodsom Exp $ # $Id: Makefile.in.embed.util,v 1.7 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=embed.util ObjModuleName=embed.util
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -26,14 +26,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.example5,v 1.4 2003-03-17 12:05:47 eku Exp $ # $Id: Makefile.in.example5,v 1.5 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=../.. ROOT=../..
include $(ROOT)/src/make.defaults
include $(ROOT)/src/make.platform include $(ROOT)/src/make.platform
include $(ROOT)/src/make.rules include $(ROOT)/src/make.rules
include $(ROOT)/src/make.defaults
include $(ROOT)/src/make.shared.variables include $(ROOT)/src/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.extern.editline,v 1.1 2003-03-12 12:39:56 eku Exp $ # $Id: Makefile.in.extern.editline,v 1.2 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=editline ObjModuleName=editline
@ -39,9 +39,9 @@ ObjModuleName=editline
## -DDO_SIGTSTP Send SIGTSTP on "suspend" key ## -DDO_SIGTSTP Send SIGTSTP on "suspend" key
CFLAGS:= -DANSI_ARROWS -DHIDE -DHIST_SIZE=100 -DUNIQUE_HISTORY -DSYS_UNIX CFLAGS:= -DANSI_ARROWS -DHIDE -DHIST_SIZE=100 -DUNIQUE_HISTORY -DSYS_UNIX
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.extlib,v 1.8 2003-03-05 16:19:08 brodsom Exp $ # $Id: Makefile.in.extlib,v 1.9 2003-03-27 11:21:44 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=extlib ObjModuleName=extlib
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.fbserver,v 1.7 2003-03-25 11:07:58 aafemt Exp $ # $Id: Makefile.in.fbserver,v 1.8 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=fbserver ObjModuleName=fbserver
CFLAGS:=-DSUPERSERVER CFLAGS:=-DSUPERSERVER
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,13 +27,13 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.fbutil,v 1.5 2003-03-05 16:14:09 brodsom Exp $ # $Id: Makefile.in.fbutil,v 1.6 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=../.. ROOT=../..
include $(ROOT)/src/make.defaults
include $(ROOT)/src/make.platform include $(ROOT)/src/make.platform
include $(ROOT)/src/make.rules include $(ROOT)/src/make.rules
include $(ROOT)/src/make.defaults
include $(ROOT)/src/make.shared.variables include $(ROOT)/src/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.firebird,v 1.32 2003-03-20 11:11:49 aafemt Exp $ # $Id: Makefile.in.firebird,v 1.33 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -29,13 +29,13 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.gpre,v 1.6 2003-03-05 15:57:23 brodsom Exp $ # $Id: Makefile.in.gpre,v 1.7 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=../.. ROOT=../..
include $(ROOT)/src/make.defaults
include $(ROOT)/src/make.platform include $(ROOT)/src/make.platform
include $(ROOT)/src/make.rules include $(ROOT)/src/make.rules
include $(ROOT)/src/make.defaults
include $(ROOT)/src/make.shared.variables include $(ROOT)/src/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.inet_server,v 1.9 2003-03-25 11:07:58 aafemt Exp $ # $Id: Makefile.in.inet_server,v 1.10 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=inet_server ObjModuleName=inet_server
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.intl,v 1.10 2003-03-05 15:57:23 brodsom Exp $ # $Id: Makefile.in.intl,v 1.11 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=intl ObjModuleName=intl
CFLAGS:=-DSUPERCLIENT CFLAGS:=-DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.libfbclient,v 1.12 2003-03-25 11:07:59 aafemt Exp $ # $Id: Makefile.in.libfbclient,v 1.13 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=libfbclient ObjModuleName=libfbclient
CFLAGS:=-DSUPERCLIENT CFLAGS:=-DSUPERCLIENT
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@
@ -107,7 +107,7 @@ libfbclient : $(LIBFBCLIENT_SONAME)
$(LIBFBCLIENT_SO): $(FBCLIENT_Objects) $(LIBFBCLIENT_SO): $(FBCLIENT_Objects)
# $(LIB_LINK) -Wl,-soname,libfbclient.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^ # $(LIB_LINK) -Wl,-soname,libfbclient.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(LINK_LIBS) $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(SO_LINK_LIBS)
$(LIBFBCLIENT_SOBASENAME): $(LIBFBCLIENT_SO) $(LIBFBCLIENT_SOBASENAME): $(LIBFBCLIENT_SO)
(cd $(LIB) && $(LN) -f $(ClientLibraryNameFull) $(ClientLibraryNameMajor) ) (cd $(LIB) && $(LN) -f $(ClientLibraryNameFull) $(ClientLibraryNameMajor) )

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.libfbcommon,v 1.5 2003-01-16 17:47:00 skidder Exp $ # $Id: Makefile.in.libfbcommon,v 1.6 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=libfbcommon ObjModuleName=libfbcommon
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.libfbembed,v 1.9 2003-03-25 11:07:59 aafemt Exp $ # $Id: Makefile.in.libfbembed,v 1.10 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=libfbembed ObjModuleName=libfbembed
ArchType=classic ArchType=classic
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@
@ -59,7 +59,7 @@ libfbembed : $(LIBFBEMBED_SONAME)
$(LIBFBEMBED_SO): $(LIBFBEMBED_Objects) $(LIBFBEMBED_SO): $(LIBFBEMBED_Objects)
# $(LIB_LINK) -Wl,-soname,libfbembed.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^ # $(LIB_LINK) -Wl,-soname,libfbembed.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(LINK_LIBS) $(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(SharedLibrarySoName) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(SO_LINK_LIBS)
$(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO) $(LIBFBEMBED_SOBASENAME): $(LIBFBEMBED_SO)
(cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) ) (cd $(LIB) && $(LN) -f $(SharedLibraryName) $(SharedLibrarySoName) )

View File

@ -27,16 +27,16 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.libfbserver,v 1.4 2003-02-10 12:26:26 dimitr Exp $ # $Id: Makefile.in.libfbserver,v 1.5 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=libfbserver ObjModuleName=libfbserver
CFLAGS:= -DSUPERSERVER CFLAGS:= -DSUPERSERVER
ArchType=super ArchType=super
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.libfbstatic,v 1.4 2002-10-07 01:29:09 skywalker Exp $ # $Id: Makefile.in.libfbstatic,v 1.5 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=libfbstatic ObjModuleName=libfbstatic
CFLAGS:=-DBOOT_BUILD CFLAGS:=-DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,14 +27,14 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.msgs,v 1.7 2003-03-17 12:05:49 eku Exp $ # $Id: Makefile.in.msgs,v 1.8 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=msgs ObjModuleName=msgs
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.refDatabases,v 1.13 2003-03-17 12:05:50 eku Exp $ # $Id: Makefile.in.refDatabases,v 1.14 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=refDatabases ObjModuleName=refDatabases
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.static.gbak,v 1.4 2003-03-26 11:08:18 brodsom Exp $ # $Id: Makefile.in.static.gbak,v 1.5 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=static.gbak ObjModuleName=static.gbak
CFLAGS := -DBOOT_BUILD CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.static.gpre,v 1.9 2003-02-11 05:13:36 aafemt Exp $ # $Id: Makefile.in.static.gpre,v 1.10 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=static.gpre ObjModuleName=static.gpre
CFLAGS := -DBOOT_BUILD CFLAGS := -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.static.isql,v 1.5 2003-03-26 11:08:17 brodsom Exp $ # $Id: Makefile.in.static.isql,v 1.6 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=.. ROOT=..
ObjModuleName=static.isql ObjModuleName=static.isql
CFLAGS:= -DBOOT_BUILD CFLAGS:= -DBOOT_BUILD
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@

View File

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.v5_examples,v 1.6 2003-03-26 11:08:17 brodsom Exp $ # $Id: Makefile.in.v5_examples,v 1.7 2003-03-27 11:21:45 aafemt Exp $
# #
ROOT=../.. ROOT=../..
ObjModuleName=v5_examples ObjModuleName=v5_examples
@ -38,9 +38,9 @@ ObjModuleName=v5_examples
CFLAGS := $(CFLAGS) -I../firebird/include CFLAGS := $(CFLAGS) -I../firebird/include
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.platform include $(ROOT)/gen/make.platform
include $(ROOT)/gen/make.rules include $(ROOT)/gen/make.rules
include $(ROOT)/gen/make.defaults
include $(ROOT)/gen/make.shared.variables include $(ROOT)/gen/make.shared.variables
@SET_MAKE@ @SET_MAKE@
@ -147,7 +147,7 @@ nt_examples:
# MOD 28-July-2002 # MOD 28-July-2002
employee.fdb: empbuild$(EXEC_EXT) $(INPUT_FILES) isql employee.fdb: empbuild$(EXEC_EXT) $(INPUT_FILES) isql$(EXEC_EXT)
-$(RM) employee.fdb -$(RM) employee.fdb
./empbuild employee.fdb ./empbuild employee.fdb
-$(CHMOD_6) employee.fdb -$(CHMOD_6) employee.fdb
@ -155,19 +155,15 @@ employee.fdb: empbuild$(EXEC_EXT) $(INPUT_FILES) isql
# To get past the fact isql is called from the programs, we create a local link # To get past the fact isql is called from the programs, we create a local link
# to the static one in this directory # to the static one in this directory
isql: isql$(EXEC_EXT):
-$(LN) $(ISQL_STATIC) isql -$(LN) $(ISQL_STATIC) isql$(EXEC_EXT)
empbuild: $(EMPBLD_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A) empbuild$(EXEC_EXT): $(EMPBLD_Objects) $(LIBFBCOMMON_A) $(LIBFBSTATIC_A)
$(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS) $(EXE_LINK) $(LINK_OPTS) $(EMPBLD_Objects) -o $@ -L$(LIB) -lfbstatic -lfbcommon $(LINK_LIBS)
empbuild.exe: $(EMPBLD_OBJ)
-$(RM) empbuild.exe
$(CC) $(O_EXE_SWITCH)empbuild $(LINK_OPTS) empbuild.o $(GDS_LINK)
empbuild.c: empbuild.fdb empbuild.e empbuild.c: empbuild.fdb empbuild.e
empbuild.fdb : $(EXAMPLES_SRC)/empddl.sql $(EXAMPLES_SRC)/empbld.sql empbuild.fdb : $(EXAMPLES_SRC)empddl.sql $(EXAMPLES_SRC)empbld.sql
-$(CP) $^ . -$(CP) $^ .
-$(RM) $@ -$(RM) $@
$(ISQL_STATIC) -i empbld.sql $(ISQL_STATIC) -i empbld.sql

View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: make.defaults,v 1.20 2003-03-21 11:53:48 aafemt Exp $ # $Id: make.defaults,v 1.21 2003-03-27 11:21:45 aafemt Exp $
# #
@ -39,10 +39,44 @@
# prefix.xxx where xxx is the platform name using the form SH := bash # prefix.xxx where xxx is the platform name using the form SH := bash
# see the readme file with the Makefile.in files for more details. # see the readme file with the Makefile.in files for more details.
-include $(ROOT)/gen/Make.Version
#_____________________________________________________________________________ #_____________________________________________________________________________
GEN_ROOT=$(ROOT)/gen
SRC_ROOT=$(ROOT)/src
MAKE_ROOT=$(GEN_ROOT)
FIREBIRD=$(GEN_ROOT)/firebird
INTERBASE=$(FIREBIRD)
export INTERBASE
export FIREBIRD
LIB=$(FIREBIRD)/lib
BIN=$(FIREBIRD)/bin
# This picks up the current directory and maps it to the equivalent module
# in the src and gen area.
RealSrcRootPath = $(shell cd $(SRC_ROOT); pwd)
#ModuleName:=$(notdir $(CURDIR))
ModuleName:=$(subst $(RealSrcRootPath)/,,$(CURDIR))
SRC=$(SRC_ROOT)
#SRC=$(SRC_ROOT)/$(ModuleName)
OBJ=$(GEN_ROOT)/$(ObjModuleName)
DEP=$(OBJ)
GEN_SRC=$(OBJ)
# This one is not so widely used at the momement.
# but I would like it to become so.
# I would like to remove this one.
SOURCE=$(ROOT)/src
#RealFirebirdPath = $(shell cd $(FIREBIRD); pwd) #RealFirebirdPath = $(shell cd $(FIREBIRD); pwd)
RealFirebirdPath = @NEW_FIREBIRD_DIR@ RealFirebirdPath = @NEW_FIREBIRD_DIR@
@ -88,6 +122,11 @@ ARCH_EXT= .a
EXEC_EXT= @EXEEXT@ EXEC_EXT= @EXEEXT@
SHRLIB_EXT=@SHRLIB_EXT@ SHRLIB_EXT=@SHRLIB_EXT@
#_____________________________________________________________________________
# Include file with version variable definitions
-include $(ROOT)/gen/Make.Version
#_____________________________________________________________________________ #_____________________________________________________________________________
@ -98,7 +137,6 @@ JRD_BOOT= $(LIB)/jrd_boot.a
BLRTABLE = $(BIN)/blrtable$(EXEC_EXT) BLRTABLE = $(BIN)/blrtable$(EXEC_EXT)
# The shared library name for the embedded (or classic) library # The shared library name for the embedded (or classic) library
# SD: This name is also hard-coded in src/install/.../linux/classic scripts. # SD: This name is also hard-coded in src/install/.../linux/classic scripts.
# Scold me, but I don't want library names to be in configure.in # Scold me, but I don't want library names to be in configure.in

View File

@ -26,7 +26,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: make.rules,v 1.13 2003-03-05 15:51:44 brodsom Exp $ # $Id: make.rules,v 1.14 2003-03-27 11:21:45 aafemt Exp $
# #
#____________________________________________________________________________ #____________________________________________________________________________
@ -51,43 +51,6 @@ IsProdTypeBuild = @PROD_BUILD_FLG@
#____________________________________________________________________________ #____________________________________________________________________________
GEN_ROOT=$(ROOT)/gen
SRC_ROOT=$(ROOT)/src
LIB=$(GEN_ROOT)/firebird/lib
BIN=$(GEN_ROOT)/firebird/bin
MAKE_ROOT=$(GEN_ROOT)
# This picks up the current directory and maps it to the equivalent module
# in the src and gen area.
RealSrcRootPath = $(shell cd $(SRC_ROOT); pwd)
#ModuleName:=$(notdir $(CURDIR))
ModuleName:=$(subst $(RealSrcRootPath)/,,$(CURDIR))
SRC=$(SRC_ROOT)
#SRC=$(SRC_ROOT)/$(ModuleName)
OBJ=$(GEN_ROOT)/$(ObjModuleName)
DEP=$(OBJ)
GEN_SRC=$(OBJ)
# This one is not so widely used at the momement.
# but I would like it to become so.
FIREBIRD=$(GEN_ROOT)/firebird
INTERBASE=$(FIREBIRD)
export INTERBASE
export FIREBIRD
# I would like to remove this one.
SOURCE=$(ROOT)/src
# Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002 # Please don't use compiler/platform specific flags here - nmcc 02-Nov-2002
CFLAGS:= $(CFLAGS) -I$(ROOT)/src -I$(ROOT)/src/include CFLAGS:= $(CFLAGS) -I$(ROOT)/src -I$(ROOT)/src/include

View File

@ -31,6 +31,7 @@ LIB_LINK_OPTIONS:=-shared
LIB_LINK_RPATH:=-Wl,-rpath, LIB_LINK_RPATH:=-Wl,-rpath,
LIB_LINK_SONAME:=-Wl,-soname, LIB_LINK_SONAME:=-Wl,-soname,
LIB_GUI:= -mwindows -lcomctl32 -lgdi32 LIB_GUI:= -mwindows -lcomctl32 -lgdi32
SO_LINK_LIBS=$(LINK_LIBS)
EMBED_UTIL_TARGETS:=gstat gsec EMBED_UTIL_TARGETS:=gstat gsec
CLIENT_UTIL_TARGETS:=gstat gsec ibguard instsvc instreg CLIENT_UTIL_TARGETS:=gstat gsec ibguard instsvc instreg
WIN_IPSERVER_Files:=ipserver.cpp alli.cpp WIN_IPSERVER_Files:=ipserver.cpp alli.cpp

View File

@ -59,9 +59,10 @@ $(SRC)/dsql/parse.cpp: $(SRC)/dsql/parse.y $(SRC)/dsql/parse.sed<br>
$(YACC) -l -d -b $(SRC)/dsql/dsql $&lt;<br> $(YACC) -l -d -b $(SRC)/dsql/dsql $&lt;<br>
sed -f $(SRC)/dsql/parse2.sed &lt;$(SRC)/dsql/dsql.tab.c &gt; $@<br><br> sed -f $(SRC)/dsql/parse2.sed &lt;$(SRC)/dsql/dsql.tab.c &gt; $@<br><br>
</code> </code>
If you are looking for simple way, issue 'touch src/dsql/parse.cpp' from MSYS environment.
</li> </li>
<li>The example target in Make.in.firebird is not valid remove it.</li> <li>The lib_fb_udf target in Make.in.extlib cannot be built yet. Remove it from
<li>The fb_util target in Make.in.extlib is not valid remove it.</li> dependencies list for 'all'.</li>
</ul> </ul>
<h3>4.- BUILD PROCESS</h3> <h3>4.- BUILD PROCESS</h3>

View File

@ -51,9 +51,9 @@ STRUCTURE OF MAKEFILE.IN.XXX
Each Makefile.in.xxx has the following somewhere near the top: Each Makefile.in.xxx has the following somewhere near the top:
include make.rules
include make.defaults include make.defaults
include make.platform include make.platform
include make.rules
include make.shared.variables include make.shared.variables
... ...
@ -62,12 +62,6 @@ include make.shared.variables
These are: These are:
make.rules
This contains the default rules for compiling the system components. Such as
directory macros CXX etc.
make.defaults make.defaults
This contains default values for macros that it is likely that the user may This contains default values for macros that it is likely that the user may
@ -78,8 +72,14 @@ make.platform
This file is created from the prefix.xxx where xxx=linux/darwin/freebsd etc. This file is created from the prefix.xxx where xxx=linux/darwin/freebsd etc.
It provides a spot for the user to override or repalce macros that have been It provides a spot for the user to override or repalce macros that have been
defined in make.rules and make.defaults. In addition extra dependancies can defined in make.defaults. In addition extra dependancies can be added to
be added to build extra targets. build extra targets.
make.rules
This contains the default rules for compiling the system components. Such as
directory macros CXX etc.
make.shared.variables make.shared.variables