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 05a3110a2ffea9f1b048c822ca220d0e41a52b71..6b4cab0a7b95a60aee78e38a20226b0206efe517 100644 (file)
--- 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 9da1880f65420076792529e616e69b0dd60d280a..428e293ccdf0b601d1a350098cac130a49e68659 100644 (file)
--- 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 05a8ce4ea09ad4f5beeccd41b012c95e1dd71990..8f32bb62f4b7d9f24ad8522de08e387defd0b161 100644 (file)
--- 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 d90452fea5c9b428187e19245e8ec9709448ebaa..6f4f680639e71cff69a2f0a72c151804c8cacc9e 100644 (file)
--- 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 4dcb7e3b19934e96076f589ab390804a9b4737b1..a27ed55a8bac4b21fc89f35a2f33ee54b87ee75c 100644 (file)
--- 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: