aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie Bullock <jamie@jamiebullock.com>2014-11-07 16:12:11 +0000
committerJamie Bullock <jamie@jamiebullock.com>2014-11-07 16:12:11 +0000
commit254bc42e4b1093419754da4a82281653025f52b4 (patch)
treec3e329f2e5aacb386abb03c3ea05f5e6168c2921
parent920219c77cd9d7d34ec1bfceb0511eb33402483b (diff)
downloadLibXtract-254bc42e4b1093419754da4a82281653025f52b4.tar.gz
LibXtract-254bc42e4b1093419754da4a82281653025f52b4.tar.bz2
LibXtract-254bc42e4b1093419754da4a82281653025f52b4.zip
Various improvements
-rw-r--r--Makefile21
-rw-r--r--src/Make.config1
2 files changed, 11 insertions, 11 deletions
diff --git a/Makefile b/Makefile
index 16e7c22..e2f1cbb 100644
--- a/Makefile
+++ b/Makefile
@@ -1,28 +1,27 @@
+LIBRARY ?= static
PREFIX ?= $(PWD)/dist
-HPATH = include/xtract
-static: LIBRARY = static
-shared: LIBRARY = shared
+HPATH = include/xtract
export XTRACT_VERSION PREFIX LIBRARY
-.PHONY: examples clean static shared install doc
+.PHONY: examples clean install doc src
-all: static examples
+all: src examples
-static shared:
- @$(MAKE) -C src
-
-examples:
+src:
@$(MAKE) -C $@
doc:
@$(MAKE) -C $@
+examples:
+ @$(MAKE) -C $@
+
install:
- $(MAKE) -C src install
- $(MAKE) -C examples install
+ @$(MAKE) -C src install
+ @$(MAKE) -C examples install
@mkdir -p $(PREFIX)/$(HPATH)
@cp $(HPATH)/* $(PREFIX)/$(HPATH)
diff --git a/src/Make.config b/src/Make.config
index 202c0ab..75d5abe 100644
--- a/src/Make.config
+++ b/src/Make.config
@@ -1,5 +1,6 @@
NAME := xtract
DIRS := . c-ringbuf ooura dywapitchtrack
+FLAGS := -I../include
ifeq ($(PLATFORM), Darwin)
LDFLAGS = -framework Accelerate