aboutsummaryrefslogtreecommitdiff
path: root/externals/grill/vasp
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2003-09-24 02:40:50 +0000
committerThomas Grill <xovo@users.sourceforge.net>2003-09-24 02:40:50 +0000
commitb1ab45bd09c01f9ec61e0017ebe42af1a8bf0f6d (patch)
tree352867c77c959f4d0e85b559dee84708e9ab29a6 /externals/grill/vasp
parent8c5eb1bcbbf8156dc3211cb1c33974b6bb0df1ec (diff)
""
svn path=/trunk/; revision=1022
Diffstat (limited to 'externals/grill/vasp')
-rw-r--r--externals/grill/vasp/config-pd-linux.txt4
-rw-r--r--externals/grill/vasp/makefile.pd-linux22
2 files changed, 13 insertions, 13 deletions
diff --git a/externals/grill/vasp/config-pd-linux.txt b/externals/grill/vasp/config-pd-linux.txt
index 32fdb9fc..eec673ee 100644
--- a/externals/grill/vasp/config-pd-linux.txt
+++ b/externals/grill/vasp/config-pd-linux.txt
@@ -10,7 +10,7 @@ PD=/usr/local/lib/pd
# where are the PD header files?
# leave it blank if it is a system directory (like /usr/local/include),
-# since gcc 3.2 complains about it
+# since gcc >= 3.2 complains about it
PDINC=
# where do the flext libraries reside?
@@ -32,7 +32,7 @@ HELPDIR=${PD}/doc/5.reference
# additional compiler flags
# (check if they fit to your system!)
# UFLAGS=-mcpu=pentium3 -msse -mfpmath=sse -fprefetch-loop-arrays
-UFLAGS=-mcpu=pentiumpro
+# UFLAGS=-mcpu=pentiumpro
# define to link against shared flext library (flext version >= 0.5.0)
#FLEXT_SHARED=1
diff --git a/externals/grill/vasp/makefile.pd-linux b/externals/grill/vasp/makefile.pd-linux
index 04d971ef..eb5c4d30 100644
--- a/externals/grill/vasp/makefile.pd-linux
+++ b/externals/grill/vasp/makefile.pd-linux
@@ -13,24 +13,24 @@ CONFIG=config-pd-linux.txt
include ${CONFIG}
-FLEXTLIB=$(FLEXTPATH)/flext_t.a
# compiler stuff
INCLUDES=$(PDINC)
-FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS -fno-exceptions
-CFLAGS=-O6 ${UFLAGS} -fmove-all-movables -frerun-loop-opt
-#CFLAGS+=-funroll-loops -fmove-all-movables -freduce-all-givs -fschedule-insns2 -foptimize-register-move
+FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
+CFLAGS=-O2 ${UFLAGS}
LDFLAGS=-Wl,-s
-
-LIBS=m
+LIBS=flext
ifdef FLEXT_SHARED
-CFLAGS+=-DFLEXT_SHARED
-LDFLAGS+=-Bdynamic
-LINKFLEXT=-lflext
+CFLAGS+=-shared -DFLEXT_SHARED
+
+ifeq ($(CXX),icc)
+LDFLAGS+=-i_dynamic
else
-LINKFLEXT=$(FLEXTLIB)
+LDFLAGS+=-Wl,-Bdynamic
+endif
+
endif
@@ -59,7 +59,7 @@ $(TARGDIR)/%.o : $(SRCDIR)/%.cpp
$(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
- $(CXX) $(LDFLAGS) -shared $^ $(patsubst %,-l%,$(LIBS)) -L$(FLEXTPATH) $(LINKFLEXT) -o $@
+ $(CXX) $(LDFLAGS) -shared -o$@ $^ -L$(FLEXTPATH) $(patsubst %,-l%,$(LIBS))
strip --strip-unneeded $@
chmod 755 $@