diff options
| author | Martin Storsjö <martin@martin.st> | 2012-10-25 17:13:06 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2012-10-25 18:36:11 +0300 |
| commit | 121604b024cfd04644a9aa6012bd0e9a48efbd9f (patch) | |
| tree | 008800c1015f883c07a5c8fc1b8c8f3cdf71fc99 | |
| parent | 254056c4ab6161d687caf8e9b837571db76e60c6 (diff) | |
| download | ffmpeg-121604b024cfd04644a9aa6012bd0e9a48efbd9f.tar.gz | |
build: Include HEADERS-yes in the HEADERS variable
This makes sure the previously always installed public header
lzo.h is installed if the LZO functionality is enabled.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | common.mak | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -102,7 +102,7 @@ config.h: .config @-tput sgr0 2>/dev/null SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ - ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ + HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ ARMV5TE-OBJS ARMV6-OBJS ARMVFP-OBJS NEON-OBJS \ ALTIVEC-OBJS VIS-OBJS \ MMX-OBJS YASM-OBJS \ diff --git a/common.mak b/common.mak index dd9f4cbbc5..c4d299960e 100644 --- a/common.mak +++ b/common.mak @@ -23,6 +23,7 @@ HOSTPROGS := $(HOSTPROGS:%=$(SUBDIR)%$(HOSTEXESUF)) TOOLS += $(TOOLS-yes) TOOLOBJS := $(TOOLS:%=tools/%.o) TOOLS := $(TOOLS:%=tools/%$(EXESUF)) +HEADERS += $(HEADERS-yes) DEP_LIBS := $(foreach NAME,$(FFLIBS),lib$(NAME)/$($(CONFIG_SHARED:yes=S)LIBNAME)) |