Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975'

* commit '472391b9a7e15e3bff33b016e7b6dbfa6a555975':
  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: Michael Niedermayer <michaelni@gmx.at>
  • Loading branch information...
commit dac1d92cb75733e3eb1431eac4867449e06b6c7a 2 parents 2b6185c + 472391b
@michaelni michaelni authored
Showing with 1 addition and 2 deletions.
  1. +1 −0  common.mak
  2. +0 −2  library.mak
View
1  common.mak
@@ -101,6 +101,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)%)
View
2  library.mak
@@ -1,5 +1,3 @@
-SRC_DIR := $(SRC_PATH)/lib$(NAME)
-
include $(SRC_PATH)/common.mak
LIBVERSION := $(lib$(NAME)_VERSION)
Please sign in to comment.
Something went wrong with that request. Please try again.