diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:12:31 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-28 12:12:38 +0100 |
| commit | dac1d92cb75733e3eb1431eac4867449e06b6c7a (patch) | |
| tree | 1f0e5cd14013dd31d67ebb0c3d988d072b3bcb60 | |
| parent | 2b6185cac945b73616b55dd6a4a8f9e96486320e (diff) | |
| parent | 472391b9a7e15e3bff33b016e7b6dbfa6a555975 (diff) | |
| download | ffmpeg-dac1d92cb75733e3eb1431eac4867449e06b6c7a.tar.gz | |
Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'
* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
ape: use correct context for the bit table printed in debug
build: Move setting of SRC_DIR to the only place it is used
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | common.mak | 1 | ||||
| -rw-r--r-- | library.mak | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/common.mak b/common.mak index d6cb5f6aec..dc4133a9da 100644 --- a/common.mak +++ b/common.mak @@ -101,6 +101,7 @@ HEADERS += $(HEADERS-yes) DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) +SRC_DIR := $(SRC_PATH)/lib$(NAME) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) diff --git a/library.mak b/library.mak index e849cc2268..78c437edfa 100644 --- a/library.mak +++ b/library.mak @@ -1,5 +1,3 @@ -SRC_DIR := $(SRC_PATH)/lib$(NAME) - include $(SRC_PATH)/common.mak LIBVERSION := $(lib$(NAME)_VERSION) |