From: Diego Biurrun <diego@biurrun.de>
Date: Sat, 11 Feb 2006 17:44:06 +0000 (+0000)
Subject: Separate header file installation from the general install target.
X-Git-Tag: v0.5~13165
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f29f3b5d9ff5cc3b70dac295c9589577ce1a41c7;p=platform%2Fupstream%2Flibav.git

Separate header file installation from the general install target.

Originally committed as revision 4981 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/Makefile b/Makefile
index 05a3110a2..6b4cab0a7 100644
--- a/Makefile
+++ b/Makefile
@@ -108,7 +108,7 @@ documentation:
 
 .PHONY: install
 
-install: all install-progs install-man $(INSTALLVHOOK)
+install: all install-progs install-headers install-man $(INSTALLVHOOK)
 	$(MAKE) -C libavutil install
 	$(MAKE) -C libavcodec install
 	$(MAKE) -C libavformat install
@@ -138,6 +138,11 @@ installlib:
 	$(MAKE) -C libavcodec installlib
 	$(MAKE) -C libavformat installlib
 
+install-headers:
+	$(MAKE) -C libavutil   install-headers
+	$(MAKE) -C libavcodec  install-headers
+	$(MAKE) -C libavformat install-headers
+
 dep:	depend
 
 depend: .depend
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 9da1880f6..428e293cc 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -503,7 +503,7 @@ fft-test: fft-test.o $(LIB)
 	$(CC) -o $@ $^ $(LIBAVUTIL) -lm
 
 ifeq ($(BUILD_SHARED),yes)
-install: all install-headers
+install: all
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
@@ -523,7 +523,7 @@ else
 install:
 endif
 
-installlib: all install-headers
+installlib: all
 	install -m 644 $(LIB) "$(libdir)"
 ifeq ($(CONFIG_PP),yes)
 	$(MAKE) -C libpostproc $@
diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile
index 05a8ce4ea..8f32bb62f 100644
--- a/libavcodec/libpostproc/Makefile
+++ b/libavcodec/libpostproc/Makefile
@@ -48,7 +48,7 @@ $(LIB): $(OBJS)
 	$(AR) rc $@ $(OBJS)
 	$(RANLIB) $@
 
-install: all install-headers
+install: all
 ifeq ($(BUILD_SHARED),yes)
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
@@ -64,7 +64,7 @@ else
 endif
 endif
 
-installlib: all install-headers
+installlib: all
 	install -m 644 $(LIB) "$(libdir)"
 
 install-headers:
diff --git a/libavformat/Makefile b/libavformat/Makefile
index d90452fea..6f4f68063 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -125,7 +125,7 @@ depend: $(SRCS)
 	$(CC) -MM $(CFLAGS) $^ 1>.depend
 
 ifeq ($(BUILD_SHARED),yes)
-install: all install-headers
+install: all
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
@@ -142,7 +142,7 @@ else
 install:
 endif
 
-installlib: all install-headers
+installlib: all
 	install -m 644 $(LIB) "$(libdir)"
 
 install-headers:
diff --git a/libavutil/Makefile b/libavutil/Makefile
index 4dcb7e3b1..a27ed55a8 100644
--- a/libavutil/Makefile
+++ b/libavutil/Makefile
@@ -61,7 +61,7 @@ distclean: clean
 
 
 ifeq ($(BUILD_SHARED),yes)
-install: all install-headers
+install: all
 ifeq ($(CONFIG_WIN32),yes)
 	install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)"
 else
@@ -78,7 +78,7 @@ else
 install:
 endif
 
-installlib: all install-headers
+installlib: all
 	install -m 644 $(LIB) "$(libdir)"
 
 install-headers: