summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2010-01-19 04:40:13 +0000
committerMåns Rullgård <mans@mansr.com>2010-01-19 04:40:13 +0000
commitaa310a9fc734344b1187282f12d63e1eaefaa88c (patch)
tree83c8d5dce4ab5705524a6785550515d929e25e62
parentdf642790791808bf9aca245bac213b0f97ec6583 (diff)
Add rules to install generated headers
Originally committed as revision 21320 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--Makefile2
-rw-r--r--subdir.mak3
2 files changed, 4 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 01c2f0fc9d..319740af22 100644
--- a/Makefile
+++ b/Makefile
@@ -49,7 +49,7 @@ $(PROGS): %$(EXESUF): %_g$(EXESUF)
SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \
ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \
- HOSTPROGS
+ HOSTPROGS BUILT_HEADERS
define RESET
$(1) :=
diff --git a/subdir.mak b/subdir.mak
index e0ac6810b6..8bcf134258 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -80,6 +80,9 @@ install-headers::
install -d "$(INCINSTDIR)"
install -d "$(LIBDIR)/pkgconfig"
install -m 644 $(addprefix "$(SRC_DIR)"/,$(HEADERS)) "$(INCINSTDIR)"
+ifdef BUILT_HEADERS
+ install -m 644 $(addprefix $(SUBDIR),$(BUILT_HEADERS)) "$(INCINSTDIR)"
+endif
install -m 644 $(BUILD_ROOT)/lib$(NAME)/lib$(NAME).pc "$(LIBDIR)/pkgconfig"
endef