diff options
| -rw-r--r-- | build/make/Makefile | 12 | ||||
| -rwxr-xr-x | configure | 8 |
2 files changed, 19 insertions, 1 deletions
diff --git a/build/make/Makefile b/build/make/Makefile index 6894d6dde..dd7fb4a21 100644 --- a/build/make/Makefile +++ b/build/make/Makefile @@ -94,6 +94,16 @@ clean:: rm -f $(OBJS-yes) $(OBJS-yes:.o=.d) $(OBJS-yes:.asm.s.o=.asm.s) rm -f $(CLEAN-OBJS) +.PHONY: clean +distclean: clean + if [ -z "$(target)" ]; then \ + rm -f Makefile; \ + rm -f config.log config.mk; \ + rm -f vpx_config.[hc] vpx_config.asm; \ + else \ + rm -f $(target)-$(TOOLCHAIN).mk; \ + fi + .PHONY: dist dist: .PHONY: install @@ -307,7 +317,7 @@ endef ifneq ($(target),) include $(SRC_PATH_BARE)/$(target:-$(TOOLCHAIN)=).mk endif -ifeq ($(filter clean,$(MAKECMDGOALS)),) +ifeq ($(filter %clean,$(MAKECMDGOALS)),) # Older versions of make don't like -include directives with no arguments ifneq ($(filter %.d,$(OBJS-yes:.o=.d)),) -include $(filter %.d,$(OBJS-yes:.o=.d)) @@ -166,6 +166,14 @@ for util in make perl; do fi done + +if [ "`cd ${source_path} && pwd`" != "`pwd`" ]; then + # test to see if source_path already configured + if [ -f ${source_path}/vpx_config.h ]; then + die "source directory already configured; run 'make distclean' there first" + fi +fi + # check installed doxygen version doxy_version=$(doxygen --version 2>/dev/null) doxy_major=${doxy_version%%.*} |