[FFmpeg-cvslog] build: Move setting of SRC_DIR to the only place it is used

Diego Biurrun git at videolan.org
Thu Mar 28 12:17:45 CET 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Fri Mar  1 19:52:32 2013 +0100| [7c22d0489fa4bf0e74ae45725007dcba5028cb04] | committer: Diego Biurrun

build: Move setting of SRC_DIR to the only place it is used

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c22d0489fa4bf0e74ae45725007dcba5028cb04
---

 common.mak  |    1 +
 library.mak |    2 --
 2 files changed, 1 insertion(+), 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)



More information about the ffmpeg-cvslog mailing list