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

Solve the examples failure in Linux build

Browse Source
This commit is contained in:
brodsom 2003-08-03 23:18:57 +00:00
parent fc7ab448d4
commit d5d94c145d
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
builds/posix/Makefile.in.examples
View File

@ -27,15 +27,15 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.examples,v 1.1 2003-07-17 02:15:46 brodsom Exp $ # $Id: Makefile.in.examples,v 1.2 2003-08-03 23:18:57 brodsom Exp $
# #
ROOT=.. ROOT=../..
ObjModuleName=examples ObjModuleName=examples
# Add the install include directory to the search path since the # Add the install include directory to the search path since the
# examples need to build using those headers values. # examples need to build using those headers values.
CFLAGS := $(CFLAGS) -I firebird/include CFLAGS := $(CFLAGS) -I$(ROOT)/gen/firebird/include
include $(ROOT)/gen/make.defaults include $(ROOT)/gen/make.defaults
@ -51,8 +51,8 @@ export PATH
GPRE_FLAGS= -r -m -z -n GPRE_FLAGS= -r -m -z -n
EXAMPLES_DEST= $(GEN_ROOT)/ EXAMPLES_DEST= $(GEN_ROOT)/examples
EXAMPLES_SRC= $(ROOT)/examples/ EXAMPLES_SRC= $(ROOT)/examples
EMPBLD_Objects= $(EXAMPLES_DEST)/empbuild.o EMPBLD_Objects= $(EXAMPLES_DEST)/empbuild.o
@ -74,7 +74,8 @@ INTLEMP_DB= $(EXAMPLES_DEST)/intlemp.fdb
all: examples all: examples
examples: $(EMPLOYEE_DB) $(INTLEMP_DB) $(FIREBIRD)/examples/README # examples: $(EMPLOYEE_DB) $(INTLEMP_DB) $(FIREBIRD)/examples/README
examples: $(EMPLOYEE_DB) $(FIREBIRD)/examples/README
$(FIREBIRD)/examples/README: $(FIREBIRD)/examples/README:
$(CP) $(ROOT)/examples/readme $(FIREBIRD)/examples/README $(CP) $(ROOT)/examples/readme $(FIREBIRD)/examples/README
@ -87,8 +88,8 @@ $(FIREBIRD)/examples/README:
$(CP) $(ROOT)/examples/include/*.* $(FIREBIRD)/examples/include/ $(CP) $(ROOT)/examples/include/*.* $(FIREBIRD)/examples/include/
$(CP) $(ROOT)/examples/stat/*.* $(FIREBIRD)/examples/stat/ $(CP) $(ROOT)/examples/stat/*.* $(FIREBIRD)/examples/stat/
$(CP) $(ROOT)/examples/udf/*.* $(FIREBIRD)/examples/udf/ $(CP) $(ROOT)/examples/udf/*.* $(FIREBIRD)/examples/udf/
$(CP) EMPLOYEE.FDB $(FIREBIRD)/examples/empbuild/ $(CP) employee.fdb $(FIREBIRD)/examples/empbuild/
$(CP) INTLEMP.FDB $(FIREBIRD)/examples/empbuild/ # $(CP) intlemp.fdb $(FIREBIRD)/examples/empbuild/
$(CP) $(ROOT)/examples/empbuild/employe2.sql $(FIREBIRD)/examples/empbuild/ $(CP) $(ROOT)/examples/empbuild/employe2.sql $(FIREBIRD)/examples/empbuild/
$(EXAMPLES_DEST)% : $(EXAMPLES_SRC)% $(EXAMPLES_DEST)% : $(EXAMPLES_SRC)%
@ -124,7 +125,7 @@ $(EXAMPLES_DEST)/empbuild.c: $(EXAMPLES_DEST)/empbuild.fdb $(EXAMPLES_DEST)/empb
$(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) $(EXAMPLES_DEST)/empbuild.fdb : $(EXAMPLES_DEST)/empddl.sql $(EXAMPLES_DEST)/empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
-$(RM) $(EXAMPLES_DEST)/empbuild.fdb -$(RM) $(EXAMPLES_DEST)/empbuild.fdb
./isql$(EXEC_EXT) -i empbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i empbld.sql
# The chain for intlemp.fdb is the same a script file to create an empty database # The chain for intlemp.fdb is the same a script file to create an empty database
# to allow a .e program to be compiled, to then create and populate with data # to allow a .e program to be compiled, to then create and populate with data
@ -142,7 +143,7 @@ $(EXAMPLES_DEST)/intlbld.c: $(EXAMPLES_DEST)/intlbuild.fdb $(EXAMPLES_DEST)/intl
$(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql $(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) $(EXAMPLES_DEST)/intlbuild.fdb : $(EXAMPLES_DEST)/intlddl.sql $(EXAMPLES_DEST)/intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT)
-$(RM) intlbuild.fdb -$(RM) intlbuild.fdb
./isql$(EXEC_EXT) -i intlbld.sql $(EXAMPLES_DEST)/isql$(EXEC_EXT) -i intlbld.sql
$(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql $(EXAMPLES_DEST)/%.sql: $(EXAMPLES_SRC)/empbuild/%.sql

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

@ -27,7 +27,7 @@
# Contributor(s): # Contributor(s):
# #
# #
# $Id: Makefile.in.firebird,v 1.42 2003-07-17 02:15:46 brodsom Exp $ # $Id: Makefile.in.firebird,v 1.43 2003-08-03 23:18:57 brodsom Exp $
# #
ROOT=.. ROOT=..
@ -325,7 +325,7 @@ includes: include_generic
# examples still need a good makefile to ship with them # examples still need a good makefile to ship with them
examples_cp: examples_cp:
$(MAKE) -f $(GEN_ROOT)/Makefile.examples $(MAKE) -f Makefile.examples -C $(GEN_ROOT)/examples/
otherfiles: misc_files script_files otherfiles: misc_files script_files

4
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.150 2003-07-17 02:15:00 brodsom Exp $ dnl $Id: configure.in,v 1.151 2003-08-03 23:17:48 brodsom Exp $
dnl ############################# INITIALISATION ############################### dnl ############################# INITIALISATION ###############################
@ -742,7 +742,7 @@ gen/Makefile.client.util:${MAKE_SRC_DIR}/Makefile.in.client.util
gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl gen/Makefile.intl:${MAKE_SRC_DIR}/Makefile.in.intl
gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs gen/Makefile.msgs:${MAKE_SRC_DIR}/Makefile.in.msgs
gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib gen/Makefile.extlib:${MAKE_SRC_DIR}/Makefile.in.extlib
gen/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples gen/examples/Makefile.examples:${MAKE_SRC_DIR}/Makefile.in.examples
gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed gen/Makefile.libfbembed:${MAKE_SRC_DIR}/Makefile.in.libfbembed
gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server gen/Makefile.inet_server:${MAKE_SRC_DIR}/Makefile.in.inet_server
gen/Makefile.embed.lockmgr:${MAKE_SRC_DIR}/Makefile.in.embed.lockmgr gen/Makefile.embed.lockmgr:${MAKE_SRC_DIR}/Makefile.in.embed.lockmgr