diff options
| author | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 06:44:24 +0400 |
|---|---|---|
| committer | Kester Maddock <Christopher.Maddock.1@uni.massey.ac.nz> | 2004-07-17 06:44:24 +0400 |
| commit | a57cd82e9fd7676de9711838c3181f0e59babf5a (patch) | |
| tree | 5e295a39b849e741ed28437d52a0fbb4999de254 /extern/Makefile | |
| parent | d5585a35896c0693bf0b443ab8a210a71e6d5efc (diff) | |
Remove all the autoconf stuff for QHull & SOLID and use the Makefiles.
This should make building Solid & Qhull much more reliable.
Diffstat (limited to 'extern/Makefile')
| -rw-r--r-- | extern/Makefile | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/extern/Makefile b/extern/Makefile index d3b5cfc900b..aa52317b98e 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -34,47 +34,26 @@ include nan_definitions.mk SOURCEDIR = extern DIR = $(OCGDIR)/extern -DIRS = ode +DIRS = qhull/src solid/src ode TARGET = ifneq ($(OS),irix) TARGET=solid endif -include nan_subdirs.mk +# include nan_subdirs.mk -.PHONY: qhull solid solid_with_qhull +# .PHONY: qhull solid solid_with_qhull -# we're not quite ready with the 'all' target just yet: -install all:: $(TARGET) +all:: @for i in $(DIRS); do \ - echo "====> $(MAKE) install in $(SOURCEDIR)/$$i" ;\ + echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\ $(MAKE) -C $$i install || exit 1; \ done - -clean:: - cd qhull/src && $(MAKE) -f Makefile.txt clean - cd solid && ( [ ! -f Makefile ] || $(MAKE) clean ) - -# challenge: fix the example linking problems with this (until then -# we must use solid without qhull, which is the next target). -solid_with_qhull: - cd solid \ - && ./configure --with-pic --prefix=$(NAN_SOLID) --enable-doubles=yes \ - CPPFLAGS="-I$(NAN_QHULL)/include" \ - LDFLAGS="-Wl,--rpath -Wl,$(NAN_QHULL)/lib" \ - && $(MAKE) all install - -solid: qhull - cd solid \ - && ./configure --with-pic --prefix=$(NAN_SOLID) --enable-doubles=yes --with-qhull=$(NAN_QHULL) --enable-shared=false \ - && $(MAKE) all install -qhull: - cd qhull/src && $(MAKE) -f Makefile.txt all - @[ -d $(NAN_QHULL) ] || mkdir $(NAN_QHULL) - @[ -d $(NAN_QHULL)/include ] || mkdir $(NAN_QHULL)/include - @[ -d $(NAN_QHULL)/lib ] || mkdir $(NAN_QHULL)/lib - @[ -L $(NAN_QHULL)/include/qhull ] || ln -s . $(NAN_QHULL)/include/qhull - @../intern/tools/cpifdiff.sh qhull/src/*.h $(NAN_QHULL)/include/ - @../intern/tools/cpifdiff.sh qhull/src/libqhull.a $(NAN_QHULL)/lib/ + +clean test debug:: + @for i in $(DIRS); do \ + echo "====> $(MAKE) $@ in $(SOURCEDIR)/$$i" ;\ + $(MAKE) -C $$i $@ || exit 1; \ + done |