From aa310a9fc734344b1187282f12d63e1eaefaa88c Mon Sep 17 00:00:00 2001 From: =?utf8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Tue, 19 Jan 2010 04:40:13 +0000 Subject: [PATCH] Add rules to install generated headers Originally committed as revision 21320 to svn://svn.ffmpeg.org/ffmpeg/trunk --- Makefile | 2 +- subdir.mak | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 01c2f0fc9..319740af2 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 e0ac6810b..8bcf13425 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 -- 2.11.0