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

Since PYXIS support has gone some time ago, remove it from the Makefiles as

Browse Source 
well.
This commit is contained in:
eku 2003-02-24 09:52:33 +00:00
parent 0ba6aaaf5a
commit 5ffe65acc2
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builds/posix/Makefile.in.firebird
View File

@ -27,7 +27,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.firebird,v 1.27 2003-02-10 11:54:30 dimitr Exp $
# $Id: Makefile.in.firebird,v 1.28 2003-02-24 09:52:30 eku Exp $
#
ROOT=..
@ -100,9 +100,7 @@ export DYLD_FRAMEWORK_PATH
# used later on in the compilation process to restore build databases.
#
# After gbak_static is built the gds.so library is built. This library is
# still missing the security functionality. Note there is a dependancy
# between gbak_static and gds.so because the shared library contains the
# PYXIS code, which needs the forms.gdb database restored from forms.gbak.
# still missing the security functionality.
#
# Now we are on phase 3, building the actual DB tools. This is as expected.
# We build all tools and link them against the shared library, including

10
builds/posix/Makefile.in.jrd
View File

@ -29,7 +29,7 @@
# Contributor(s):
#
#
# $Id: Makefile.in.jrd,v 1.5 2003-02-17 08:26:10 eku Exp $
# $Id: Makefile.in.jrd,v 1.6 2003-02-24 09:52:33 eku Exp $
#
ROOT=../..
@ -156,7 +156,7 @@ SUPER_OBJECTS= $(DSQL_MISC) $(LOCK_MISC) \
HEAD_OBJECTS= whyp.o utlp.o dls.o enc.o \
$(JRD_MISC) $(JRD_HEAD_MISC) $(DSQL_HEAD_MISC) \
$(PYXIS_MISC_OBJS) $(MERGE_MISC) $(SECURITY_MISC)
$(MERGE_MISC) $(SECURITY_MISC)
HEAD_J_OBJECTS= whyp.j utlp.j \
$(JRD_J_MISC) $(JRD_J_HEAD_MISC) $(DSQL_J_HEAD_MISC) \
@ -225,12 +225,11 @@ bridge.apollo: gdslib
$(CHMOD_7) bridge5
gds.sl $(HP_GDSSHR): $(JRD_P_OBJECTS) flu.bin $(DSQL_P_MISC) $(LOCK_P_MISC) \
$(PYXIS_P_MISC_OBJS) \
$(REMOTE_P_MISC) $(WAL_P_MISC) \
$(SECURITY_P_MISC) functions.bin gds.bind
-$(RM) gds.sl
ld -b $(LD_OPTS) $(JRD_P_OBJECTS) flu.bin $(DSQL_P_MISC) \
$(LOCK_P_MISC) $(PYXIS_P_MISC_OBJS) $(REMOTE_P_MISC) \
$(LOCK_P_MISC) $(REMOTE_P_MISC) \
$(WAL_P_MISC) \
$(SECURITY_P_MISC) functions.bin -o gds.sl
$(CHMOD_7) gds.sl
@ -404,7 +403,7 @@ gds.dylib: $(DO_FORCE) \
$(JRD_P_OBJECTS) flu.bin $(CSI_P_MISC) $(DSQL_P_MISC) \
$(LOCK_P_MISC) $(REMOTE_P_MISC) $(SECURITY_P_MISC) \
$(INTL_P_MISC) $(WAL_P_MISC) \
$(FUNCTIONS) $(PYXIS_P_OBJECTS) $(PYXIS_P_MISC)
$(FUNCTIONS)
-$(RM) gds.dylib
libtool -dynamic -o gds.dylib -current_version $(FW_VERS) \
@ -414,7 +413,6 @@ gds.dylib: $(DO_FORCE) \
$(CSI_P_MISC) $(DSQL_P_MISC) $(LOCK_P_MISC) \
$(REMOTE_P_MISC) $(SECURITY_P_MISC) $(INTL_P_MISC) \
$(WAL_P_MISC) $(FUNCTIONS) $(GDSF_LIB) \
$(PYXIS_P_OBJECTS) $(PYXIS_P_MISC) \
$(LD_LIBS) -framework System -framework CoreFoundation
$(CHMOD_6) gds.dylib
$(MV) gds.dylib $(GDSSHR_DEST)