updated make system

svn path=/trunk/; revision=2414

17 files changed, 27 insertions, 72 deletions

diff --git a/externals/grill/py/build-lnx-pd-gcc.sh b/externals/grill/py/build-lnx-pd-gcc.sh
deleted file mode 100644
index e76f5ed1..00000000
--- a/externals/grill/py/build-lnx-pd-gcc.sh
+++ /dev/null
@@ -1 +0,0 @@
-make -f ../flext/build/gnumake.mak PLATFORM=lnx RTSYS=pd COMPILER=gcc $*
diff --git a/externals/grill/py/build-mac-pd-gcc.sh b/externals/grill/py/build-mac-pd-gcc.sh
deleted file mode 100644
index a88a3dbb..00000000
--- a/externals/grill/py/build-mac-pd-gcc.sh
+++ /dev/null
@@ -1 +0,0 @@
-make -f ../flext/build/gnumake.mak PLATFORM=mac RTSYS=pd COMPILER=gcc $*
diff --git a/externals/grill/py/build-win-max-msvc.bat b/externals/grill/py/build-win-max-msvc.bat
deleted file mode 100644
index fcbccf23..00000000
--- a/externals/grill/py/build-win-max-msvc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo --- Building with MS Visual C++ ---

-

-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/py/build-win-pd-msvc.bat b/externals/grill/py/build-win-pd-msvc.bat
deleted file mode 100644
index 5a3958b9..00000000
--- a/externals/grill/py/build-win-pd-msvc.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-@echo --- Building with MS Visual C++ ---
-
-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/py/build/config-lnx.def b/externals/grill/py/build/config-lnx.def
new file mode 100644
index 00000000..a93932e0
--- /dev/null
+++ b/externals/grill/py/build/config-lnx.def
@@ -0,0 +1,5 @@
+# what is the base prefix of the Python installation?

+PYTHONPREFIX=/usr

+

+# which Python version do you want to compile against?

+PYTHONVERSION=2.3

diff --git a/externals/grill/py/build/config-mac.def b/externals/grill/py/build/config-mac.def
new file mode 100644
index 00000000..be94b713
--- /dev/null
+++ b/externals/grill/py/build/config-mac.def
@@ -0,0 +1 @@
+# nothing to adjust!
\ No newline at end of file
diff --git a/externals/grill/py/build/config-win.def b/externals/grill/py/build/config-win.def
new file mode 100644
index 00000000..0a3a3f47
--- /dev/null
+++ b/externals/grill/py/build/config-win.def
@@ -0,0 +1,2 @@
+# where is the Python installation?

+PYTHONPATH=c:\programme\prog\python24

diff --git a/externals/grill/py/build/makefile-lnx-gcc.inc b/externals/grill/py/build/makefile-lnx-gcc.inc
new file mode 100644
index 00000000..f49715fd
--- /dev/null
+++ b/externals/grill/py/build/makefile-lnx-gcc.inc
@@ -0,0 +1,2 @@
+INCPATH += -I$(PYTHONPREFIX)/include/python$(PYTHONVERSION)

+LIBS += -lpython$(PYTHONVERSION)

diff --git a/externals/grill/py/build/makefile-mac-gcc.inc b/externals/grill/py/build/makefile-mac-gcc.inc
new file mode 100644
index 00000000..0e510dec
--- /dev/null
+++ b/externals/grill/py/build/makefile-mac-gcc.inc
@@ -0,0 +1,4 @@
+#
+
+LIBS += -framework Python

+
diff --git a/externals/grill/py/build/makefile-win-msvc.inc b/externals/grill/py/build/makefile-win-msvc.inc
new file mode 100644
index 00000000..33ec5f8e
--- /dev/null
+++ b/externals/grill/py/build/makefile-win-msvc.inc
@@ -0,0 +1,2 @@
+INCPATH=/I$(PYTHONPATH)\include

+LIBPATH=/LIBPATH:$(PYTHONPATH)\libs

diff --git a/externals/grill/py/make-files.txt b/externals/grill/py/build/package.txt
index f4ddcdb9..459b8708 100644
--- a/externals/grill/py/make-files.txt
+++ b/externals/grill/py/build/package.txt
@@ -1,8 +1,11 @@
-NAME=py
-
-# all the source files from the package
-SRCDIR=source
-
-SRCS= main.cpp py.cpp pyext.cpp modmeth.cpp clmeth.cpp register.cpp pyargs.cpp bound.cpp
-
-HDRS= main.h pyext.h
+NAME=py

+

+THREADED=1

+HAVECONFIG=1

+HAVEMAKE=1

+

+SRCDIR=source

+

+SRCS= main.cpp py.cpp pyext.cpp modmeth.cpp clmeth.cpp register.cpp pyargs.cpp bound.cpp

+

+HDRS= main.h pyext.h

diff --git a/externals/grill/py/config-lnx-gcc.txt b/externals/grill/py/config-lnx-gcc.txt
deleted file mode 100644
index 737a5947..00000000
--- a/externals/grill/py/config-lnx-gcc.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# 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.

-

-# what is the base prefix of the Python

-PYTHONPREFIX=/usr

-

-# which Python version do you want to compile against

-PYTHONVERSION=2.3

diff --git a/externals/grill/py/config-mac-gcc.txt b/externals/grill/py/config-mac-gcc.txt
deleted file mode 100644
index 5fdc44fb..00000000
--- a/externals/grill/py/config-mac-gcc.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-# 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/py/config-win-msvc.txt b/externals/grill/py/config-win-msvc.txt
deleted file mode 100644
index 9c2a195a..00000000
--- a/externals/grill/py/config-win-msvc.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# Your settings are defined in the files

-# ..\flext\build\config-win-pd-msvc.txt

-# and

-# ..\flext\build\config-win-max-msvc.txt

-#

-# You can override them here.

-

-# where is the Python installation?

-PYTHONPATH=c:\programme\prog\python24

diff --git a/externals/grill/py/makefile-lnx-gcc.txt b/externals/grill/py/makefile-lnx-gcc.txt
deleted file mode 100644
index a536803d..00000000
--- a/externals/grill/py/makefile-lnx-gcc.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-# usage:

-# to build run "sh build-mac-max-gcc.sh" or "sh build-mac-pd-gcc.sh"

-#

-

-INCPATH += -I$(PYTHONPREFIX)/include/python$(PYTHONVERSION)

-LIBS += -lpython$(PYTHONVERSION)

-

-# multi-threaded build

-THREADED=1

diff --git a/externals/grill/py/makefile-mac-gcc.txt b/externals/grill/py/makefile-mac-gcc.txt
deleted file mode 100644
index c1ed50cb..00000000
--- a/externals/grill/py/makefile-mac-gcc.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-# usage:

-# to build run "sh build-mac-max-gcc.sh" or "sh build-mac-pd-gcc.sh"

-#
-
-LIBS += -framework Python

-
-# multithreaded build

-THREADED=1

diff --git a/externals/grill/py/makefile-win-msvc.txt b/externals/grill/py/makefile-win-msvc.txt
deleted file mode 100644
index 0dea185b..00000000
--- a/externals/grill/py/makefile-win-msvc.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Makefile for MSVC++ 6 and 7

-#

-# usage:

-# to build run "build-max-msvc.bat" or "build-pd-msvc.bat"

-#

-

-# includes

-INCPATH=/I$(PYTHONPATH)\include

-LIBPATH=/LIBPATH:$(PYTHONPATH)\libs

-

-# multithreaded build

-THREADED=1