[svn-upgrade] Integrating new upstream version, ncbi-tools6 (6.1.20070822)

3 files changed, 58 insertions, 6 deletions

diff --git a/platform/linux_icc.ncbi.mk b/platform/linux_icc.ncbi.mk
index ab3e615b..5949bb73 100644
--- a/platform/linux_icc.ncbi.mk
+++ b/platform/linux_icc.ncbi.mk
@@ -1,18 +1,18 @@
 #
-# $Id: linux_icc.ncbi.mk,v 1.6 2005/09/02 17:15:07 ucko Exp $
+# $Id: linux_icc.ncbi.mk,v 1.7 2007/05/09 16:00:56 ucko Exp $
 #
-# ICC 9.0 with optimization options for Pentium 4 processor
+# ICC 8.x with optimization options for Pentium 4 processor
 
 NCBI_DEFAULT_LCL = lnx
 NCBI_MAKE_SHELL = /bin/sh
 NCBI_AR=ar
 NCBI_CC = icc -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
 NCBI_CFLAGS1 = -c
-NCBI_LDFLAGS1 = -i-static -O3 -unroll -tpp7
+NCBI_LDFLAGS1 = -static-libcxa -O3 -unroll -tpp7
 NCBI_OPTFLAG = -O3 -unroll -tpp7
 #
 #for Pentium4 you can try:
-#NCBI_LDFLAGS1 = -i-static -O3 -tpp7 -mcpu=pentium4 -xW -march=pentium4
+#NCBI_LDFLAGS1 = -static-libcxa -O3 -tpp7 -mcpu=pentium4 -xW -march=pentium4
 #NCBI_OPTFLAG = -O3 -tpp7 -mcpu=pentium4 -xW -march=pentium4
 #
 NCBI_BIN_MASTER = /home/coremake/ncbi/bin
diff --git a/platform/linux_icc9.ncbi.mk b/platform/linux_icc9.ncbi.mk
new file mode 100644
index 00000000..6abf7d43
--- /dev/null
+++ b/platform/linux_icc9.ncbi.mk
@@ -0,0 +1,52 @@
+#
+# $Id: linux_icc9.ncbi.mk,v 1.7 2007/05/30 14:22:41 ucko Exp $
+#
+# ICC 9.0 with optimization options for Pentium 4 processor
+
+NCBI_DEFAULT_LCL = lnx
+NCBI_MAKE_SHELL = /bin/sh
+NCBI_AR=ar
+NCBI_CC = icc -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE
+NCBI_CFLAGS1 = -c
+NCBI_LDFLAGS1 = -i-static -O3 -unroll -tpp7 -fno-builtin-memcpy -fno-builtin-memset
+NCBI_OPTFLAG = -O3 -unroll -tpp7 -fno-builtin-memcpy -fno-builtin-memset
+#
+#for Pentium4 you can try:
+#NCBI_LDFLAGS1 = -i-static -O3 -tpp7 -mcpu=pentium4 -xW -march=pentium4
+#NCBI_OPTFLAG = -O3 -tpp7 -mcpu=pentium4 -xW -march=pentium4
+#
+NCBI_BIN_MASTER = /home/coremake/ncbi/bin
+NCBI_BIN_COPY = /home/coremake/ncbi/bin
+NCBI_INCDIR = /home/coremake/ncbi/include
+NCBI_LIBDIR = /home/coremake/ncbi/lib
+NCBI_ALTLIB = /home/coremake/ncbi/altlib
+#will work only when you have Motif installed!
+NCBI_VIBFLAG = -I/usr/X11R6/include -L/usr/X11R6/lib -DWIN_MOTIF
+NCBI_VIBLIBS = -lXm -lXmu -lXt -lX11 -lXext
+#warning! If you have only dynamic version of Motif or Lesstif
+#you should delete -Wl,-Bstatic sentence from the next line:
+NCBI_DISTVIBLIBS = -L/usr/X11R6/lib -Wl,-Bstatic -lXm -Wl,-Bdynamic -lXmu -lXt -lX11 -lXext -lXp
+NCBI_OTHERLIBS = -lm
+NCBI_RANLIB = ranlib
+# Used by makedis.csh
+NCBI_MT_OTHERLIBS = -lpthread
+NCBI_OTHERLIBS_MT = $(NCBI_MT_OTHERLIBS) -lm
+NCBI_THREAD_OBJ = ncbithr.o
+NETENTREZVERSION = 2.02c2ASN1SPEC6 
+
+# uncomment OPENGL_TARGETS to build OpenGL apps; do not change
+# OPENGL_NCBI_LIBS! However, may need to set
+# OPENGL_INCLUDE and OPENGL_LIBS to suit local environment
+# OPENGL_TARGETS = Cn3D
+OPENGL_NCBI_LIBS = LIB400=libvibrantOGL.a LIB3000=libncbicn3dOGL.a
+OPENGL_INCLUDE = -I/usr/X11R6/include
+OPENGL_LIBS = -L/usr/X11R6/lib -lGL -lGLU
+NCBI_OGLLIBS = -L/usr/X11R6/lib -lGL -lGLU
+
+# uncomment (and change appropriately) these lines to build PNG
+# output support into Cn3D (OpenGL version only)
+#LIBPNG_DIR = /home/paul/Programs/libpng
+#ZLIB_DIR = /home/paul/Programs/zlib
+
+NCBI_LBSM_SRC = ncbi_lbsmd_stub.c
+NCBI_LBSM_OBJ = ncbi_lbsmd_stub.o
diff --git a/platform/solarisintel.ncbi.mk b/platform/solarisintel.ncbi.mk
index 7aabeb79..e43d6496 100644
--- a/platform/solarisintel.ncbi.mk
+++ b/platform/solarisintel.ncbi.mk
@@ -1,11 +1,11 @@
 #
-# $Id: solarisintel.ncbi.mk,v 1.16 2003/05/07 17:40:12 beloslyu Exp $
+# $Id: solarisintel.ncbi.mk,v 1.17 2007/08/01 14:40:40 coulouri Exp $
 #
 NCBI_DEFAULT_LCL = sin
 NCBI_MAKE_SHELL = /usr/bin/sh
 NCBI_AR=ar
 NCBI_CC = cc
-NCBI_CFLAGS1 = -c
+NCBI_CFLAGS1 = -c -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
 NCBI_LDFLAGS1 = -O
 NCBI_OPTFLAG = -O
 # following 2 lines are temporary; J. Epstein, 8/11/97