From caac44c4e8b9294f8327ab844434577b814fae50 Mon Sep 17 00:00:00 2001 From: kkuznetsov Date: Fri, 1 Nov 2002 13:22:35 +0000 Subject: [PATCH] *** empty log message *** --- builds/posix/Makefile.in.boot.gpre | 5 +++-- builds/posix/prefix.solx86 | 8 +++++++- configure.in | 18 +++++++++++++++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/builds/posix/Makefile.in.boot.gpre b/builds/posix/Makefile.in.boot.gpre index 23ac5198f1..24e3c22b76 100644 --- a/builds/posix/Makefile.in.boot.gpre +++ b/builds/posix/Makefile.in.boot.gpre @@ -27,7 +27,7 @@ # Contributor(s): # # -# $Id: Makefile.in.boot.gpre,v 1.5 2002-10-07 01:29:09 skywalker Exp $ +# $Id: Makefile.in.boot.gpre,v 1.6 2002-11-01 13:21:54 kkuznetsov Exp $ # ROOT=.. ObjModuleName=boot.gpre @@ -40,12 +40,13 @@ include $(ROOT)/gen/make.shared.variables @SET_MAKE@ + JRDBOOT_Files = dsc.cpp gds.cpp isc_ipc.cpp isc.cpp dls.cpp JRDBOOT_Sources = $(addprefix jrd/, $(JRDBOOT_Files)) JRDBOOT_Objects = $(addprefix $(OBJ)/, $(addsuffix .o, $(basename $(JRDBOOT_Sources)))) -GPRECOMMON_Files = cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp \ +GPRECOMMON_Files += cmd.cpp cme.cpp cmp.cpp c_cxx.cpp exp.cpp \ gpre.cpp hsh.cpp int.cpp int_cxx.cpp jrdmet.cpp movg.cpp \ msc.cpp par.cpp pat.cpp sqe.cpp sql.cpp cob.cpp \ noform.cpp diff --git a/builds/posix/prefix.solx86 b/builds/posix/prefix.solx86 index 550c2a037e..1916c9f3b3 100644 --- a/builds/posix/prefix.solx86 +++ b/builds/posix/prefix.solx86 @@ -18,11 +18,13 @@ # # Use SOLX86 to identify x86 version of Solaris. Neil McCalden # -# $Id: prefix.solx86,v 1.6 2002-10-04 21:57:21 skidder Exp $ +# $Id: prefix.solx86,v 1.7 2002-11-01 13:21:54 kkuznetsov Exp $ # # Start of file prefix.solaris X 86 : $(VERSION) $(PLATFORM) # 2 Oct 2002, Nickolay Samofatov - Major Cleanup + + WARNINGS=-Wall -W -Wno-unused -Wno-parentheses -Wno-switch COMM_SOLX_FLAGS:= -DSOLARIS -DSOLARIS26 -DSOLARIS_MT -DSOLX86 -DBSD_COMP -DEXACT_NUMERICS -fwritable-strings @@ -42,3 +44,7 @@ COMM_SOLX_FLAGS:= $(COMM_SOLX_FLAGS) -I$(STLPort) PROD_FLAGS=-DNDEBUG -w $(COMM_SOLX_FLAGS) -O2 -m486 DEV_FLAGS=$(COMM_SOLX_FLAGS) -ggdb $(WARNINGS) + +#still ugly hack - becouse can not move it to configure.in +GPRECOMMON_Files= ../jrd/thd.cpp ../jrd/isc_sync.cpp + diff --git a/configure.in b/configure.in index d34cd50608..9b31a1b7d4 100644 --- a/configure.in +++ b/configure.in @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.56 2002-10-30 14:49:18 kkuznetsov Exp $ +dnl $Id: configure.in,v 1.57 2002-11-01 13:22:35 kkuznetsov Exp $ dnl ############################# INITIALISATION ############################### @@ -269,6 +269,22 @@ dnl all others ((n + b - 1) & ~(b - 1)) -> multiple of b dnl dnl volunters are welcome! + + + case $PLATFORM in + solx86) + # this still not worked. Why knows why? + AC_DEFINE(GPRECOMMON_Files) + AC_SUBST(GPRECOMMON_Files, " thd.cpp ") + + ;; + *) + + + ;; + esac + + dnl ##################### DO NOT ADD ANY TESTS BELOW ########################### dnl The following file defines the version number strings