diff options
| author | Mans Rullgard <mans@mansr.com> | 2011-05-28 13:10:01 +0100 |
|---|---|---|
| committer | Mans Rullgard <mans@mansr.com> | 2011-05-29 12:36:16 +0100 |
| commit | 798b26467877007418d21722d59c769d17ed7233 (patch) | |
| tree | 80ac81093517182021e1c73b8cd0663a7b2ffb6a /common.mak | |
| parent | 42761122779dea2629cfc54a8bbe5d327e729c6e (diff) | |
| download | ffmpeg-798b26467877007418d21722d59c769d17ed7233.tar.gz | |
build: remove BUILD_ROOT variable
This variable is unnecessary as absolute paths are not required.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Diffstat (limited to 'common.mak')
| -rw-r--r-- | common.mak | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/common.mak b/common.mak index 03fae6f805..20876c0951 100644 --- a/common.mak +++ b/common.mak @@ -12,12 +12,6 @@ vpath %.S $(SRC_DIR) vpath %.asm $(SRC_DIR) vpath %.v $(SRC_DIR) -ifeq ($(SRC_DIR),$(SRC_PATH_BARE)) -BUILD_ROOT_REL = . -else -BUILD_ROOT_REL = .. -endif - ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) @@ -33,7 +27,7 @@ endif ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale -IFLAGS := -I$(BUILD_ROOT_REL) -I$(SRC_PATH) +IFLAGS := -I. -I$(SRC_PATH) CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) YASMFLAGS += $(IFLAGS) -Pconfig.asm @@ -85,7 +79,7 @@ FFLIBS := $(FFLIBS-yes) $(FFLIBS) TESTPROGS += $(TESTPROGS-yes) FFEXTRALIBS := $(addprefix -l,$(addsuffix $(BUILDSUF),$(FFLIBS))) $(EXTRALIBS) -FFLDFLAGS := $(addprefix -L$(BUILD_ROOT)/lib,$(ALLFFLIBS)) $(LDFLAGS) +FFLDFLAGS := $(addprefix -Llib,$(ALLFFLIBS)) $(LDFLAGS) EXAMPLES := $(addprefix $(SUBDIR),$(addsuffix -example$(EXESUF),$(EXAMPLES))) OBJS := $(addprefix $(SUBDIR),$(sort $(OBJS))) @@ -94,7 +88,7 @@ TESTPROGS := $(addprefix $(SUBDIR),$(addsuffix -test$(EXESUF),$(TESTPROGS))) HOSTOBJS := $(addprefix $(SUBDIR),$(addsuffix .o,$(HOSTPROGS))) HOSTPROGS := $(addprefix $(SUBDIR),$(addsuffix $(HOSTEXESUF),$(HOSTPROGS))) -DEP_LIBS := $(foreach NAME,$(FFLIBS),$(BUILD_ROOT_REL)/lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) +DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h)) SKIPHEADERS += $(addprefix $(ARCH)/,$(ARCH_HEADERS)) |