firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 09:20:39 +01:00
Code Issues

Few improvements for Win32 SS build procedure

Browse Source
This commit is contained in:
aafemt 2003-03-21 11:53:48 +00:00
parent 013e84e5ae
commit 7e9e535a38
6 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.client.util,v 1.6 2003-03-05 16:09:30 brodsom Exp $
# $Id: Makefile.in.client.util,v 1.7 2003-03-21 11:53:48 aafemt Exp $
#
ROOT=..
ObjModuleName=client.util
@ -138,12 +138,12 @@ $(GSEC): $(GSEC_Objects) $(LIBFBCLIENT_SO)
fbguard: $(FBGUARD)
$(FBGUARD): $(FBGUARD_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $(FBGUARD_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
$(LD) $(LINK_OPTS) $(FBGUARD_Objects) -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
ibguard: $(IBGUARD)
$(IBGUARD): $(IBGUARD_A_Objects) $(IBGUARD_B_Objects) $(LIBFBCLIENT_SO)
$(LD) $(LINK_OPTS) $(IBGUARD_A_Objects) $(IBGUARD_B_Objects) -o $@ -L$(LIB) -lfbclient $(LINK_LIBS)
$(LD) $(LINK_OPTS) $(IBGUARD_A_Objects) $(IBGUARD_B_Objects) -o $@ -L$(LIB) -lfbclient $(LIB_GUI) $(LINK_LIBS)
fbmgr_bin: $(FBMGR_BIN)

14
builds/posix/Makefile.in.libfbclient
View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.libfbclient,v 1.10 2003-03-06 23:25:32 brodsom Exp $
# $Id: Makefile.in.libfbclient,v 1.11 2003-03-21 11:53:48 aafemt Exp $
#
ROOT=..
ObjModuleName=libfbclient
@ -103,13 +103,17 @@ FBCLIENT_Objects = $(JRD_ClientObjects) \
.PHONY: libfbclient
libfbclient : $(LIBFBCLIENT_SO)
libfbclient : $(LIBFBCLIENT_SONAME)
$(LIBFBCLIENT_SO): $(FBCLIENT_Objects)
# $(LIB_LINK) -Wl,-soname,libfbclient.$(SHRLIB_EXT).1 -Wl,-rpath,/usr/lib -o $@ $^
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)libfbclient.$(SHRLIB_EXT).1 $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^
-$(LN) $(@F) $(LIBFBCLIENT_SOBASENAME)
-$(LN) $(notdir $(LIBFBCLIENT_SOBASENAME)) $(LIBFBCLIENT_SONAME)
$(LIB_LINK) $(LIB_LINK_OPTIONS) $(LIB_LINK_SONAME)$(ClientLibraryNameMajor) $(LIB_LINK_RPATH)$(FirebirdInstallPrefix)/lib -o $@ $^ $(LINK_LIBS)
$(LIBFBCLIENT_SOBASENAME): $(LIBFBCLIENT_SO)
(cd $(LIB) && $(LN) $(ClientLibraryNameFull) $(ClientLibraryNameMajor) )
$(LIBFBCLIENT_SONAME): $(LIBFBCLIENT_SOBASENAME)
(cd $(LIB) && $(LN) $(ClientLibraryNameMajor) $(ClientLibraryName) )
AllObjects = $(FBCLIENT_Objects)

14
builds/posix/make.defaults
View File

@ -26,7 +26,7 @@
# Contributor(s):
#
#
# $Id: make.defaults,v 1.19 2003-03-20 11:11:49 aafemt Exp $
# $Id: make.defaults,v 1.20 2003-03-21 11:53:48 aafemt Exp $
#
@ -78,7 +78,7 @@ QUIET_ECHO= @echo
CD= cd
CAT= cat
AR= ar crsu
LN= ln -s
LN= @LN_S@
RANLIB= @RANLIB@
YACC= @YACC@
@ -117,10 +117,14 @@ LIBGDS_A = $(LIB)/libgds.a
# Shared library names for client side of fbserver (or super) version
# used to link all the utilities to enable them to connect over the wire
# to the fbserver. MOD 28-July-2002
LIBFBCLIENT_SO = $(LIB)/libfbclient.$(SHRLIB_EXT).1.0.0
LIBFBCLIENT_SOBASENAME=$(LIB)/libfbclient.$(SHRLIB_EXT).1
LIBFBCLIENT_SONAME=$(LIB)/libfbclient.$(SHRLIB_EXT)
ClientLibraryName = libfbclient.$(SHRLIB_EXT)
ClientLibraryNameMajor = $(ClientLibraryName).1
ClientLibraryNameFull = $(ClientLibraryNameMajor).0.0
LIBFBCLIENT_SO = $(LIB)/$(ClientLibraryNameFull)
LIBFBCLIENT_SOBASENAME=$(LIB)/$(ClientLibraryNameMajor)
LIBFBCLIENT_SONAME=$(LIB)/$(ClientLibraryName)
# intl will load dynamically, and having the whole soname set with version
# confuses the dynamic load process. So we only have the .$(SHRLIB_EXT) file

2
builds/posix/prefix.mingw
View File

@ -30,7 +30,7 @@ OS_ServerFiles=srvr_w32 window.cpp chop.cpp property.cpp ibconfig.cpp cntl.cpp
LIB_LINK_OPTIONS:=-shared
LIB_LINK_RPATH:=-Wl,-rpath,
LIB_LINK_SONAME:=-Wl,-soname,
LIB_GUI:= -mwindows
LIB_GUI:= -mwindows -lcomctl32 -lgdi32
EMBED_UTIL_TARGETS:=gstat gsec
CLIENT_UTIL_TARGETS:=gstat gsec ibguard instsvc instreg
WIN_IPSERVER_Files:=ipserver.cpp alli.cpp

10
builds/posix/prefix.mingw.README.html
View File

@ -58,16 +58,6 @@ some in mingw libraries some in the FB sources and some in the building process.
in 'make.shared.targets'</li>
<li>The example target in Make.in.firebird is not valid remove it.</li>
<li>The fb_util target in Make.in.extlib is not valid remove it.</li>
<li>In the Makefile.in.libfbclient three lines should be changed because it don't work as expected in msys<br>
Change <br>
&nbsp;&nbsp;&nbsp; $(LIB_LINK) [......................] -o $@ $^<br>
&nbsp;&nbsp;&nbsp;-$(LN) <font color="red">$(@F)</font> $(LIBFBCLIENT_SOBASENAME)<br>
&nbsp;&nbsp;&nbsp;-$(LN) <font color="red">$(notdir $(LIBFBCLIENT_SOBASENAME))</font> $(LIBFBCLIENT_SONAME)<br>
to<br>
&nbsp;&nbsp;&nbsp; $(LIB_LINK) [......................] -o $@ $^ <font color="red">$(LINK_LIBS)</font><br>
&nbsp;&nbsp;&nbsp;-$(LN) <font color="red">$(LIBFBCLIENT_SO)</font> $(LIBFBCLIENT_SOBASENAME)<br>
&nbsp;&nbsp;&nbsp;-$(LN) <font color="red">$(LIBFBCLIENT_SOBASENAME)</font> $(LIBFBCLIENT_SONAME)<br>
</li>
<li>In the Makefile.in.libfbembed three lines should be changed because it don't work as expected in msys<br>
Change <br>
&nbsp;&nbsp;&nbsp; $(LIB_LINK) [......................] -o $@ $^<br>

4
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.131 2003-03-20 11:11:48 aafemt Exp $
dnl $Id: configure.in,v 1.132 2003-03-21 11:53:39 aafemt Exp $
dnl ############################# INITIALISATION ###############################
@ -486,7 +486,7 @@ case "$PLATFORM" in
[FB_PIPE_NAME=${withval}])
AC_DEFINE_UNQUOTED(FB_PIPE_NAME,"$FB_PIPE_NAME")
AC_SUBST(FB_PIPE_NAME)
XE_PREPEND(-lmpr -lcomctl32 -lversion -lws2_32 -lgdi32,LIBS)
XE_PREPEND(-lmpr -lversion -lws2_32,LIBS)
;;
*)