diff options
author | Måns Rullgård <mans@mansr.com> | 2010-01-19 04:40:13 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-01-19 04:40:13 +0000 |
commit | aa310a9fc734344b1187282f12d63e1eaefaa88c (patch) | |
tree | 83c8d5dce4ab5705524a6785550515d929e25e62 | |
parent | df642790791808bf9aca245bac213b0f97ec6583 (diff) | |
download | ffmpeg-aa310a9fc734344b1187282f12d63e1eaefaa88c.tar.gz |
Add rules to install generated headers
Originally committed as revision 21320 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | subdir.mak | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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 |