From 34512bca0e0b987dc3abd5a79f232f7d33194f4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= <mans@mansr.com>
Date: Sat, 6 Mar 2010 17:14:16 +0000
Subject: [PATCH] Split install-headers target and simplify rules

Originally committed as revision 22243 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 subdir.mak | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/subdir.mak b/subdir.mak
index 872793488d..9302722eae 100644
--- a/subdir.mak
+++ b/subdir.mak
@@ -9,6 +9,7 @@ ifdef CONFIG_STATIC
 all: $(SUBDIR)$(LIBNAME)
 
 install-libs: install-lib$(NAME)-static
+install-headers: install-lib$(NAME)-headers install-lib$(NAME)-pkgconfig
 
 $(SUBDIR)$(LIBNAME): $(OBJS)
 	$(RM) $@
@@ -76,14 +77,13 @@ install-lib$(NAME)-static: $(SUBDIR)$(LIBNAME)
 	$$(INSTALL) -m 644 $$< "$(LIBDIR)"
 	$(LIB_INSTALL_EXTRA_CMD)
 
-install-headers::
+install-lib$(NAME)-headers: $(addprefix $(SUBDIR),$(HEADERS) $(BUILT_HEADERS))
 	mkdir -p "$(INCINSTDIR)"
+	$$(INSTALL) -m 644 $$^ "$(INCINSTDIR)"
+
+install-lib$(NAME)-pkgconfig: $(SUBDIR)lib$(NAME).pc
 	mkdir -p "$(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"
+	$$(INSTALL) -m 644 $$^ "$(LIBDIR)/pkgconfig"
 
 uninstall-libs::
 	-$(RM) "$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR)" \