OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b4d24b4
)
build: Move setting of SRC_DIR to the only place it is used
author
Diego Biurrun
<diego@biurrun.de>
Fri, 1 Mar 2013 18:52:32 +0000
(19:52 +0100)
committer
Diego Biurrun
<diego@biurrun.de>
Wed, 27 Mar 2013 13:49:13 +0000
(14:49 +0100)
common.mak
patch
|
blob
|
history
library.mak
patch
|
blob
|
history
diff --git
a/common.mak
b/common.mak
index
b134835
..
d3c6b9f
100644
(file)
--- 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
(file)
--- 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)