Mercurial > hg > vampy-host
changeset 107:56d0e5cd4ac8
Rearrange Makefile so as not to run tests by default ("make all" still does though), so as to avoid problems with nose naming/versions
| author | Chris Cannam |
|---|---|
| date | Wed, 17 Jun 2015 09:14:51 +0100 |
| parents | 03b32c2df679 |
| children | 3ee9e7387529 |
| files | Makefile.inc Makefile.osx |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.inc Mon Jun 15 17:22:56 2015 +0100 +++ b/Makefile.inc Wed Jun 17 09:14:51 2015 +0100 @@ -19,14 +19,19 @@ OBJECTS := $(SOURCES:.cpp=.o) OBJECTS := $(OBJECTS:.c=.o) +default: $(LIBRARY) + all: $(LIBRARY) .tests -$(LIBRARY): $(OBJECTS) - $(CXX) -o $@ $^ $(LDFLAGS) - .tests: $(LIBRARY) $(PY) $(TESTPLUG) $(TESTS) VAMP_PATH=$(TESTPLUG_DIR) $(NOSE) @touch $@ + +test: $(LIBRARY) $(PY) $(TESTPLUG) $(TESTS) + VAMP_PATH=$(TESTPLUG_DIR) $(NOSE) + +$(LIBRARY): $(OBJECTS) + $(CXX) -o $@ $^ $(LDFLAGS) $(TESTPLUG): $(MAKE) -C $(TESTPLUG_DIR) -f Makefile$(MAKEFILE_EXT) VAMPSDK_DIR=../../../vamp-plugin-sdk
--- a/Makefile.osx Mon Jun 15 17:22:56 2015 +0100 +++ b/Makefile.osx Wed Jun 17 09:14:51 2015 +0100 @@ -2,7 +2,7 @@ PY_INCLUDE_PATH := /anaconda/include/python2.7 NUMPY_INCLUDE_PATH := /anaconda/pkgs/numpy-1.9.2-py27_0/lib/python2.7/site-packages/numpy/core/include PY_LIB := python2.7 -PY_TEST := nosetests2 +PY_TEST := nosetests #PY_INCLUDE_PATH := /usr/include/python3.4m #NUMPY_INCLUDE_PATH := /usr/lib/python3.4m/site-packages/numpy/core/include