Mercurial > hg > vampy
changeset 49:0f16923521bb
* Minor Makefile updates
| author | cannam |
|---|---|
| date | Tue, 06 Oct 2009 12:04:33 +0000 |
| parents | cb207d275e8e |
| children | 3868da185d73 |
| files | Makefile.linux Makefile.osol |
| diffstat | 2 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.linux Tue Oct 06 11:48:15 2009 +0000 +++ b/Makefile.linux Tue Oct 06 12:04:33 2009 +0000 @@ -1,5 +1,5 @@ -CXXFLAGS := -DHAVE_NUMPY -O2 -Wall -I/usr/include/python2.6 -I/usr/lib/python2.6/dist-packages/numpy/core/include/numpy -fPIC +CXXFLAGS := -DHAVE_NUMPY -O2 -Wall -I/usr/include/python2.6 -I/usr/lib/python2.6/dist-packages/numpy/core/include -fPIC LDFLAGS := -shared -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic -lpython2.6 -lpthread -Wl,--version-script=vamp-plugin.map default: vampy.so @@ -31,7 +31,7 @@ cleanplug : clean clean: - rm *.o - rm *.a - rm *$(PLUGIN_EXT) + rm -f *.o + rm -f *.a + rm -f *$(PLUGIN_EXT)
--- a/Makefile.osol Tue Oct 06 11:48:15 2009 +0000 +++ b/Makefile.osol Tue Oct 06 12:04:33 2009 +0000 @@ -1,7 +1,8 @@ -CXX := CC -CXXFLAGS := -I/usr/local/include -G -DHAVE_NUMPY -O2 +w -I/usr/include/python2.6 -I/usr/lib/python2.6/site-packages/numpy/core/include/numpy -KPIC -LDFLAGS := -L/usr/local/lib -G -Bstatic -lvamp-sdk -Bdynamic -lpython2.6 -lpthread -Qoption ld -Mvamp-plugin.map + +CXX := CC +CXXFLAGS := -G -DHAVE_NUMPY -O2 -I../vamp-plugin-sdk -I/usr/include/python2.6 -I/usr/lib/python2.6/site-packages/numpy/core/include -KPIC +LDFLAGS := -G -L../vamp-plugin-sdk -Bstatic -lvamp-sdk -Bdynamic -lpython2.6 -lpthread -Qoption ld -Mvamp-plugin.map default: vampy.so all: vampy.so vampymod.so @@ -18,8 +19,8 @@ # Install plugin # -INSTALL_DIR :=/usr/local/lib/vamp -PYEXAMPLE_DIR :='Example VamPy Plugins' +INSTALL_DIR :=$(DESTDIR)/usr/local/lib/vamp +PYEXAMPLE_DIR :='Example VamPy Plugins' PLUGIN_NAME :=vampy PLUGIN_EXT :=.so