aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Grill <xovo@users.sourceforge.net>2004-12-18 05:02:44 +0000
committerThomas Grill <xovo@users.sourceforge.net>2004-12-18 05:02:44 +0000
commite9f8fa66c202381780bccc5e5082e8c2487a9433 (patch)
treeefafe9de97f610b65402b5931a24eb53116f1543
parente741586389de21efe0dd7fa1b0057c970e4c1a17 (diff)
updated make system for BCC
use flext build system avoid malicious file name characters using flext build system updated build system svn path=/trunk/; revision=2406
-rw-r--r--externals/grill/vasp/build-lnx-pd-gcc.sh1
-rw-r--r--externals/grill/vasp/build-mac-pd-gcc.sh1
-rw-r--r--externals/grill/vasp/build-pd-cygwin.sh15
-rwxr-xr-xexternals/grill/vasp/build-pd-darwin.sh17
-rw-r--r--externals/grill/vasp/build-pd-linux.sh17
-rw-r--r--externals/grill/vasp/build-win-max-msvc.bat5
-rw-r--r--externals/grill/vasp/build-win-pd-bcc.bat1
-rw-r--r--externals/grill/vasp/build-win-pd-cygwin.sh1
-rw-r--r--externals/grill/vasp/build-win-pd-msvc.bat5
-rw-r--r--externals/grill/vasp/config-lnx-gcc.txt6
-rw-r--r--externals/grill/vasp/config-mac-gcc.txt6
-rw-r--r--externals/grill/vasp/config-pd-cygwin.txt35
-rwxr-xr-xexternals/grill/vasp/config-pd-darwin.txt41
-rw-r--r--externals/grill/vasp/config-pd-linux.txt38
-rw-r--r--externals/grill/vasp/config-win-bcc.txt6
-rw-r--r--externals/grill/vasp/config-win-cygwin.txt6
-rw-r--r--externals/grill/vasp/config-win-max-msvc.txt7
-rw-r--r--externals/grill/vasp/config-win-msvc.txt6
-rw-r--r--externals/grill/vasp/config-win-pd-msvc.txt7
-rw-r--r--externals/grill/vasp/makefile-lnx-gcc.txt6
-rw-r--r--externals/grill/vasp/makefile-mac-gcc.txt6
-rw-r--r--externals/grill/vasp/makefile-win-bcc.txt8
-rw-r--r--externals/grill/vasp/makefile-win-cygwin.txt6
-rw-r--r--externals/grill/vasp/makefile-win-msvc.txt6
-rw-r--r--externals/grill/vasp/makefile.pd-cygwin82
-rwxr-xr-xexternals/grill/vasp/makefile.pd-darwin91
-rw-r--r--externals/grill/vasp/makefile.pd-linux96
27 files changed, 66 insertions, 456 deletions
diff --git a/externals/grill/vasp/build-lnx-pd-gcc.sh b/externals/grill/vasp/build-lnx-pd-gcc.sh
new file mode 100644
index 00000000..e76f5ed1
--- /dev/null
+++ b/externals/grill/vasp/build-lnx-pd-gcc.sh
@@ -0,0 +1 @@
+make -f ../flext/build/gnumake.mak PLATFORM=lnx RTSYS=pd COMPILER=gcc $*
diff --git a/externals/grill/vasp/build-mac-pd-gcc.sh b/externals/grill/vasp/build-mac-pd-gcc.sh
new file mode 100644
index 00000000..a88a3dbb
--- /dev/null
+++ b/externals/grill/vasp/build-mac-pd-gcc.sh
@@ -0,0 +1 @@
+make -f ../flext/build/gnumake.mak PLATFORM=mac RTSYS=pd COMPILER=gcc $*
diff --git a/externals/grill/vasp/build-pd-cygwin.sh b/externals/grill/vasp/build-pd-cygwin.sh
deleted file mode 100644
index 94778444..00000000
--- a/externals/grill/vasp/build-pd-cygwin.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-SYS=pd-cygwin
-
-. config-${SYS}.txt
-
-make -f makefile.${SYS} &&
-{
- if [ $INSTDIR != "" ]; then
- make -f makefile.${SYS} install
- fi
- if [ $HELPDIR != "" ]; then
- make -f makefile.${SYS} install-help
- fi
-}
diff --git a/externals/grill/vasp/build-pd-darwin.sh b/externals/grill/vasp/build-pd-darwin.sh
deleted file mode 100755
index 38814a9a..00000000
--- a/externals/grill/vasp/build-pd-darwin.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-SYS=pd-darwin
-
-. config-${SYS}.txt
-
-make -f makefile.${SYS} &&
-{
- if [ $INSTDIR != "" ]; then
- echo Now install as root
- sudo make -f makefile.${SYS} install
- fi
- if [ $HELPDIR != "" ]; then
- echo Now install help as root
- sudo make -f makefile.${SYS} install-help
- fi
-}
diff --git a/externals/grill/vasp/build-pd-linux.sh b/externals/grill/vasp/build-pd-linux.sh
deleted file mode 100644
index 77c6e3ff..00000000
--- a/externals/grill/vasp/build-pd-linux.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-SYS=pd-linux
-
-. config-${SYS}.txt
-
-make -f makefile.${SYS} &&
-{
- if [ $INSTDIR != "" ]; then
- echo Now install as root
- su -c "make -f makefile.${SYS} install"
- fi
- if [ $HELPDIR != "" ]; then
- echo Now install help as root
- su -c "make -f makefile.${SYS} install-help"
- fi
-}
diff --git a/externals/grill/vasp/build-win-max-msvc.bat b/externals/grill/vasp/build-win-max-msvc.bat
index 436f6a8e..b7b78d26 100644
--- a/externals/grill/vasp/build-win-max-msvc.bat
+++ b/externals/grill/vasp/build-win-max-msvc.bat
@@ -1,4 +1,3 @@
-@echo --- Building with MS Visual C++ ---
+@rem building with flext build system
-nmake -f ..\flext\build\make-win-max-msvc.txt clean
-nmake -f ..\flext\build\make-win-max-msvc.txt
+nmake -f ..\flext\build\nmake.mak PLATFORM=win RTSYS=max COMPILER=msvc %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/externals/grill/vasp/build-win-pd-bcc.bat b/externals/grill/vasp/build-win-pd-bcc.bat
new file mode 100644
index 00000000..437c3501
--- /dev/null
+++ b/externals/grill/vasp/build-win-pd-bcc.bat
@@ -0,0 +1 @@
+make -f ..\flext\build\bmake.mak PLATFORM=win RTSYS=pd COMPILER=bcc %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/externals/grill/vasp/build-win-pd-cygwin.sh b/externals/grill/vasp/build-win-pd-cygwin.sh
new file mode 100644
index 00000000..5ba756b8
--- /dev/null
+++ b/externals/grill/vasp/build-win-pd-cygwin.sh
@@ -0,0 +1 @@
+make -f ../flext/build/gnumake.mak PLATFORM=win RTSYS=pd COMPILER=cygwin $*
diff --git a/externals/grill/vasp/build-win-pd-msvc.bat b/externals/grill/vasp/build-win-pd-msvc.bat
index 942ee174..31c45f06 100644
--- a/externals/grill/vasp/build-win-pd-msvc.bat
+++ b/externals/grill/vasp/build-win-pd-msvc.bat
@@ -1,4 +1,3 @@
-@echo --- Building with MS Visual C++ ---
+@rem building with flext build system
-nmake -f ..\flext\build\make-win-pd-msvc.txt clean
-nmake -f ..\flext\build\make-win-pd-msvc.txt
+nmake -f ..\flext\build\nmake.mak PLATFORM=win RTSYS=pd COMPILER=msvc %1 %2 %3 %4 %5 %6 %7 %8 %9
diff --git a/externals/grill/vasp/config-lnx-gcc.txt b/externals/grill/vasp/config-lnx-gcc.txt
new file mode 100644
index 00000000..93669034
--- /dev/null
+++ b/externals/grill/vasp/config-lnx-gcc.txt
@@ -0,0 +1,6 @@
+# Your settings are defined in the files
+# ../flext/build/config-mac-pd-gcc.txt
+# and
+# ../flext/build/config-mac-max-gcc.txt
+#
+# You can override them here.
diff --git a/externals/grill/vasp/config-mac-gcc.txt b/externals/grill/vasp/config-mac-gcc.txt
new file mode 100644
index 00000000..5fdc44fb
--- /dev/null
+++ b/externals/grill/vasp/config-mac-gcc.txt
@@ -0,0 +1,6 @@
+# Your settings are defined in the files
+# ../flext/build/config-mac-pd-gcc.txt
+# and
+# ../flext/build/config-mac-max-gcc.txt
+#
+# You can override them here.
diff --git a/externals/grill/vasp/config-pd-cygwin.txt b/externals/grill/vasp/config-pd-cygwin.txt
deleted file mode 100644
index 06dd61aa..00000000
--- a/externals/grill/vasp/config-pd-cygwin.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# VASP - vector assembling vector processor
-# Copyright(c) 2002-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++
-
-# where does the PD installation reside?
-PD=/cygdrive/c/programme/audio/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
-PDINC=${PD}/src
-
-# where do the flext libraries reside?
-FLEXTPATH=${PD}/flext
-
-# where should VASP be built?
-TARGDIR=./pd-cygwin
-
-# where should VASP be installed?
-# (leave blank to omit installation)
-# a subfolder "vasp" will be created for the files
-INSTDIR=${PD}/extra
-
-# where should the VASP help be installed?
-# (leave blank to omit installation)
-# a subfolder "vasp" will be created for the files
-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
diff --git a/externals/grill/vasp/config-pd-darwin.txt b/externals/grill/vasp/config-pd-darwin.txt
deleted file mode 100755
index acf6dfcf..00000000
--- a/externals/grill/vasp/config-pd-darwin.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-# VASP - vector assembling vector processor
-# Copyright(c) 2002-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-#CXX=g++-3.3
-
-# where does the PD installation reside?
-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
-#PDINC=${PD}/src
-
-# where is the PD executable?
-PDBIN=/usr/local/bin/pd
-
-# where do the flext libraries reside?
-FLEXTPATH=${PD}/flext
-
-# where should flext libraries be built?
-TARGDIR=./pd-darwin
-
-# where should VASP be installed?
-# (leave blank to omit installation)
-# a subfolder "vasp" will be created for the files
-INSTDIR=${PD}/extra
-
-# where should the VASP help be installed?
-# (leave blank to omit installation)
-# a subfolder "vasp" will be created for the files
-HELPDIR=${PD}/doc/5.reference
-
-# additional compiler flags
-# (check if they fit to your system!)
-UFLAGS=-malign-power -faltivec -maltivec
-
-# build with flext shared library
-FLEXT_SHARED=1
-
diff --git a/externals/grill/vasp/config-pd-linux.txt b/externals/grill/vasp/config-pd-linux.txt
deleted file mode 100644
index eec673ee..00000000
--- a/externals/grill/vasp/config-pd-linux.txt
+++ /dev/null
@@ -1,38 +0,0 @@
-# VASP - vector assembling vector processor
-# Copyright(c) 2002-2003 Thomas Grill (xovo@gmx.net)
-#
-
-# your c++ compiler (define only if it's different than g++)
-# CXX=g++
-
-# where does the PD installation reside?
-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
-PDINC=
-
-# where do the flext libraries reside?
-FLEXTPATH=${PD}/flext
-
-# where should flext libraries be built?
-TARGDIR=./pd-linux
-
-# where should VASP be installed?
-# (leave blank to omit installation)
-# a subfolder "vasp" will be created for the files
-INSTDIR=${PD}/extra
-
-# where should the VASP help be installed?
-# (leave blank to omit installation)
-# a subfolder "vasp" will be created for the files
-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
-
-# define to link against shared flext library (flext version >= 0.5.0)
-#FLEXT_SHARED=1
diff --git a/externals/grill/vasp/config-win-bcc.txt b/externals/grill/vasp/config-win-bcc.txt
new file mode 100644
index 00000000..e407963c
--- /dev/null
+++ b/externals/grill/vasp/config-win-bcc.txt
@@ -0,0 +1,6 @@
+# Your settings are defined in the files
+# ..\flext\build\config-win-pd-bcc.txt
+# and
+# ..\flext\build\config-win-max-bcc.txt
+#
+# You can override them here.
diff --git a/externals/grill/vasp/config-win-cygwin.txt b/externals/grill/vasp/config-win-cygwin.txt
new file mode 100644
index 00000000..6b6410ec
--- /dev/null
+++ b/externals/grill/vasp/config-win-cygwin.txt
@@ -0,0 +1,6 @@
+# Your settings are defined in the files
+# ../flext/build/config-win-pd-cygwin.txt
+# and
+# ../flext/build/config-win-max-cygwin.txt
+#
+# You can override them here.
diff --git a/externals/grill/vasp/config-win-max-msvc.txt b/externals/grill/vasp/config-win-max-msvc.txt
deleted file mode 100644
index d3ab7178..00000000
--- a/externals/grill/vasp/config-win-max-msvc.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# VASP - vector assembling signal processor
-# Copyright (c) 2002-2004 Thomas Grill (gr@grrrr.org)
-#
-# Your settings are defined in the file
-# ..\flext\build\config-win-max-msvc.txt
-#
-# You can override them here.
diff --git a/externals/grill/vasp/config-win-msvc.txt b/externals/grill/vasp/config-win-msvc.txt
new file mode 100644
index 00000000..0ca7758f
--- /dev/null
+++ b/externals/grill/vasp/config-win-msvc.txt
@@ -0,0 +1,6 @@
+# Your settings are defined in the files
+# ..\flext\build\config-win-pd-msvc.txt
+# or
+# ..\flext\build\config-win-max-msvc.txt
+#
+# You can override them here.
diff --git a/externals/grill/vasp/config-win-pd-msvc.txt b/externals/grill/vasp/config-win-pd-msvc.txt
deleted file mode 100644
index 83c895a7..00000000
--- a/externals/grill/vasp/config-win-pd-msvc.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-# VASP - vector assembling signal processor
-# Copyright (c) 2002-2004 Thomas Grill (gr@grrrr.org)
-#
-# Your settings are defined in the file
-# ..\flext\build\config-win-pd-msvc.txt
-#
-# You can override them here.
diff --git a/externals/grill/vasp/makefile-lnx-gcc.txt b/externals/grill/vasp/makefile-lnx-gcc.txt
new file mode 100644
index 00000000..93008710
--- /dev/null
+++ b/externals/grill/vasp/makefile-lnx-gcc.txt
@@ -0,0 +1,6 @@
+# usage:
+# to build run "sh build-lnx-max-gcc.sh" or "sh build-lnx-pd-gcc.sh"
+#
+
+# multi-threaded build
+THREADED=1
diff --git a/externals/grill/vasp/makefile-mac-gcc.txt b/externals/grill/vasp/makefile-mac-gcc.txt
new file mode 100644
index 00000000..1269fc57
--- /dev/null
+++ b/externals/grill/vasp/makefile-mac-gcc.txt
@@ -0,0 +1,6 @@
+# usage:
+# to build run "sh build-mac-max-gcc.sh" or "sh build-mac-pd-gcc.sh"
+#
+
+# multithreaded build
+THREADED=1
diff --git a/externals/grill/vasp/makefile-win-bcc.txt b/externals/grill/vasp/makefile-win-bcc.txt
new file mode 100644
index 00000000..b4823de7
--- /dev/null
+++ b/externals/grill/vasp/makefile-win-bcc.txt
@@ -0,0 +1,8 @@
+# Makefile for BCC
+#
+# usage:
+# to build run "build-win-max-bcc.bat" or "build-win-pd-bcc.bat"
+#
+
+# multi-threaded build
+THREADED=1 \ No newline at end of file
diff --git a/externals/grill/vasp/makefile-win-cygwin.txt b/externals/grill/vasp/makefile-win-cygwin.txt
new file mode 100644
index 00000000..d4dcd21f
--- /dev/null
+++ b/externals/grill/vasp/makefile-win-cygwin.txt
@@ -0,0 +1,6 @@
+# usage:
+# to build run "sh build-win-max-cygwin.sh" or "sh build-win-pd-cygwin.sh"
+#
+
+# multi-threaded build
+THREADED=1
diff --git a/externals/grill/vasp/makefile-win-msvc.txt b/externals/grill/vasp/makefile-win-msvc.txt
index 17a3bc43..d6a447e7 100644
--- a/externals/grill/vasp/makefile-win-msvc.txt
+++ b/externals/grill/vasp/makefile-win-msvc.txt
@@ -1,10 +1,8 @@
-# VASP - vector assembling signal processor
-# Copyright (C) 2002 Thomas Grill (xovo@gmx.net)
-#
# Makefile for MSVC++ 6 and .NET
#
# usage:
# to build run "build-win-max-msvc.bat" or "build-win-pd-msvc.bat"
#
-FLEXT_THREADED=1
+# multi-threaded build
+THREADED=1
diff --git a/externals/grill/vasp/makefile.pd-cygwin b/externals/grill/vasp/makefile.pd-cygwin
deleted file mode 100644
index 0f408436..00000000
--- a/externals/grill/vasp/makefile.pd-cygwin
+++ /dev/null
@@ -1,82 +0,0 @@
-# VASP - vector assembling vector processor
-# Copyright (c)2002-2003 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ cygwin
-#
-# usage:
-# to build run "make -f makefile.pd-cygwin"
-# to install (as root), do "make -f makefile.pd-cygwin install"
-# to install help, do "make -f makefile.pd-cygwin install-help"
-#
-
-include config-pd-cygwin.txt
-
-FLEXTLIB=$(FLEXTPATH)/flext_t-pdwin.lib
-PDLIBS=$(PD)/bin/pd.dll $(PD)/bin/pthreadVC.dll
-
-# compiler stuff
-INCLUDES=/usr/include $(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
-LDFLAGS=-Wl,-s
-
-LIBS=m
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=vasp
-
-include make-files.txt
-
-MAKEFILE=makefile.pd-cygwin
-TARGET=$(TARGDIR)/$(NAME).dll
-
-
-# default target
-all: $(TARGDIR) $(TARGET)
-
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE)
- touch $(patsubst %,$(SRCDIR)/%,$(SRCS))
-
-$(TARGDIR):
- -mkdir $(TARGDIR)
-
-$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS)) $(FLEXTLIB)
- $(CXX) $(LDFLAGS) -shared $^ ${PDLIBS} $(patsubst %,-l%,$(LIBS)) -o $@
- strip --strip-unneeded $@
- chmod 755 $@
-
-
-$(INSTDIR):
- -mkdir $(INSTDIR)
-
-$(INSTDIR)/vasp: $(INSTDIR)
- -mkdir $(INSTDIR)/vasp
-
-install:: $(INSTDIR)/vasp
-
-install:: $(TARGET) pd
- cp -R $^ $(INSTDIR)/vasp
-# chown -R root.root $(INSTDIR)/vasp
-
-
-$(HELPDIR)/vasp:
- -mkdir $(HELPDIR)/vasp
-
-install-help:: $(HELPDIR)/vasp
-
-install-help:: ./pd-help
- cp $^/*.* $(HELPDIR)/vasp
-# chown -R root.root $(HELPDIR)/vasp
-
-
-.PHONY: clean
-clean:
- rm -f $(TARGDIR)/*.o $(TARGET)
-
diff --git a/externals/grill/vasp/makefile.pd-darwin b/externals/grill/vasp/makefile.pd-darwin
deleted file mode 100755
index a8fdd3c6..00000000
--- a/externals/grill/vasp/makefile.pd-darwin
+++ /dev/null
@@ -1,91 +0,0 @@
-# VASP - vector assembling vector processor
-# Copyright (c)2002-2004 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ OSX (darwin)
-#
-# usage:
-# to build run "make -f makefile.pd-darwin"
-# to install (as root), do "make -f makefile.pd-darwin install"
-# to install help, do "make -f makefile.pd-darwin install-help"
-#
-
-CONFIG=config-pd-darwin.txt
-
-include ${CONFIG}
-
-# compiler stuff
-INCLUDES=$(PDINC)
-FLAGS=-DFLEXT_SYS=2 -Wno-unused -Wno-parentheses -Wno-switch -Wstrict-prototypes -fno-exceptions
-CFLAGS=-O2 ${UFLAGS} -fmove-all-movables -frerun-loop-opt -fprefetch-loop-arrays
-#CFLAGS+=-funroll-loops -freduce-all-givs -fschedule-insns2 -foptimize-register-move
-LIBS=m
-LDFLAGS=-bundle -bundle_loader $(PDBIN)
-FRAMEWORKS=Carbon veclib
-
-ifdef FLEXT_SHARED
-CFLAGS+=-DFLEXT_SHARED
-LDFLAGS+=-L$(FLEXTPATH)
-FLEXTLIB=-lflext
-
-else
-
-CFLAGS+=-DFLEXT_THREADS
-FLEXTLIB=$(FLEXTPATH)/libflext_t.a
-
-endif
-
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-include make-files.txt
-
-MAKEFILE=makefile.pd-darwin
-TARGET=$(TARGDIR)/$(NAME).pd_darwin
-
-
-# default target
-all: $(TARGDIR) $(TARGET)
-
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG)
- touch $(patsubst %,$(SRCDIR)/%,$(SRCS))
-
-$(TARGDIR):
- -mkdir $(TARGDIR)
-
-$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
- $(CXX) $(LDFLAGS) $^ $(patsubst %,-framework %,$(FRAMEWORKS)) $(patsubst %,-L%,$(LIBPATH)) $(patsubst %,-l%,$(LIBS)) $(FLEXTLIB) -o $@
- chmod 755 $@
-
-
-$(INSTDIR):
- -mkdir $(INSTDIR)
-
-$(INSTDIR)/vasp: $(INSTDIR)
- -mkdir $(INSTDIR)/vasp
-
-install:: $(INSTDIR)/vasp
-
-install:: $(TARGET) pd/*
- -cp $^ $(INSTDIR)/vasp
-# chown -R root.root $(INSTDIR)/vasp
-
-
-$(HELPDIR)/vasp:
- -mkdir $(HELPDIR)/vasp
-
-install-help:: $(HELPDIR)/vasp
-
-install-help:: ./pd-help
- cp $^/*.* $(HELPDIR)/vasp
-# chown -R root.root $(HELPDIR)/vasp
-
-
-.PHONY: clean
-clean:
- rm -f $(TARGDIR)/*.o $(TARGET)
-
diff --git a/externals/grill/vasp/makefile.pd-linux b/externals/grill/vasp/makefile.pd-linux
deleted file mode 100644
index 1f8f7c09..00000000
--- a/externals/grill/vasp/makefile.pd-linux
+++ /dev/null
@@ -1,96 +0,0 @@
-# VASP - vector assembling vector processor
-# Copyright (c)2002-2003 Thomas Grill (xovo@gmx.net)
-#
-# Makefile for gcc @ linux
-#
-# usage:
-# to build run "make -f makefile.pd-linux"
-# to install (as root), do "make -f makefile.pd-linux install"
-# to install help, do "make -f makefile.pd-linux install-help"
-#
-
-CONFIG=config-pd-linux.txt
-
-include ${CONFIG}
-
-
-# compiler stuff
-INCLUDES=$(PDINC)
-FLAGS=-DFLEXT_SYS=2 -DFLEXT_THREADS
-CFLAGS=-O2 ${UFLAGS}
-LDFLAGS=-Wl,-s
-
-ifdef FLEXT_SHARED
-CFLAGS+=-shared -DFLEXT_SHARED
-
-ifeq ($(CXX),icc)
-LDFLAGS+=-i_dynamic
-else
-LDFLAGS+=-Wl,-Bdynamic
-endif
-LIBS=flext
-
-else
-
-# take threaded flext lib
-LIBS=flext_t
-endif
-
-
-# ----------------------------------------------
-# the rest can stay untouched
-# ----------------------------------------------
-
-NAME=vasp
-
-include make-files.txt
-
-MAKEFILE=makefile.pd-linux
-TARGET=$(TARGDIR)/$(NAME).pd_linux
-
-
-# default target
-all: $(TARGDIR) $(TARGET)
-
-$(patsubst %,$(SRCDIR)/%,$(SRCS)): $(patsubst %,$(SRCDIR)/%,$(HDRS)) $(MAKEFILE) $(CONFIG)
- touch $(patsubst %,$(SRCDIR)/%,$(SRCS))
-
-$(TARGDIR):
- -mkdir $(TARGDIR)
-
-$(TARGDIR)/%.o : $(SRCDIR)/%.cpp
- $(CXX) -c $(CFLAGS) $(FLAGS) $(patsubst %,-I%,$(INCLUDES) $(FLEXTPATH)) $< -o $@
-
-$(TARGET) : $(patsubst %.cpp,$(TARGDIR)/%.o,$(SRCS))
- $(CXX) $(LDFLAGS) -shared -o$@ $^ -L$(FLEXTPATH) $(patsubst %,-l%,$(LIBS))
- strip --strip-unneeded $@
- chmod 755 $@
-
-
-$(INSTDIR):
- -mkdir $(INSTDIR)
-
-$(INSTDIR)/vasp: $(INSTDIR)
- -mkdir $(INSTDIR)/vasp
-
-install:: $(INSTDIR)/vasp
-
-install:: $(TARGET) pd/*
- -cp $^ $(INSTDIR)/vasp
-# chown -R root.root $(INSTDIR)/vasp
-
-
-$(HELPDIR)/vasp:
- -mkdir $(HELPDIR)/vasp
-
-install-help:: $(HELPDIR)/vasp
-
-install-help:: ./pd-help
- cp $^/* $(HELPDIR)/vasp
-# chown -R root.root $(HELPDIR)/vasp
-
-
-.PHONY: clean
-clean:
- rm -f $(TARGDIR)/*.o $(TARGET)
-