summaryrefslogtreecommitdiff
authorDiego Biurrun <diego@biurrun.de>2013-03-01 18:52:32 (GMT)
committer Diego Biurrun <diego@biurrun.de>2013-03-27 13:49:13 (GMT)
commit7c22d0489fa4bf0e74ae45725007dcba5028cb04 (patch)
treee126a1ede960443d0f4473d658601555a85efd31
parentb4d24b471bc52f1f78a43ee330199e70483e51c3 (diff)
downloadffmpeg-7c22d0489fa4bf0e74ae45725007dcba5028cb04.zip
ffmpeg-7c22d0489fa4bf0e74ae45725007dcba5028cb04.tar.gz
ffmpeg-7c22d0489fa4bf0e74ae45725007dcba5028cb04.tar.bz2
build: Move setting of SRC_DIR to the only place it is used
Diffstat
-rw-r--r--common.mak1
-rw-r--r--library.mak2
2 files changed, 1 insertions, 2 deletions
diff --git a/common.mak b/common.mak
index b134835..d3c6b9f 100644
--- a/common.mak
+++ b/common.mak
@@ -27,6 +27,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 f3e4427..88d33dc 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)