Commit dac1d92c authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '472391b9'

* commit '472391b9':
  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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 2b6185ca 472391b9
...@@ -101,6 +101,7 @@ HEADERS += $(HEADERS-yes) ...@@ -101,6 +101,7 @@ HEADERS += $(HEADERS-yes)
DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) 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)) ALLHEADERS := $(subst $(SRC_DIR)/,$(SUBDIR),$(wildcard $(SRC_DIR)/*.h $(SRC_DIR)/$(ARCH)/*.h))
SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-) SKIPHEADERS += $(ARCH_HEADERS:%=$(ARCH)/%) $(SKIPHEADERS-)
SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%) SKIPHEADERS := $(SKIPHEADERS:%=$(SUBDIR)%)
......
SRC_DIR := $(SRC_PATH)/lib$(NAME)
include $(SRC_PATH)/common.mak include $(SRC_PATH)/common.mak
LIBVERSION := $(lib$(NAME)_VERSION) LIBVERSION := $(lib$(NAME)_VERSION)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment