Simplify header installation.
authorDiego Biurrun <diego@biurrun.de>
Sat, 11 Feb 2006 19:30:55 +0000 (19:30 +0000)
committerDiego Biurrun <diego@biurrun.de>
Sat, 11 Feb 2006 19:30:55 +0000 (19:30 +0000)
Originally committed as revision 4986 to svn://svn.ffmpeg.org/ffmpeg/trunk

Makefile
libavcodec/Makefile
libavcodec/libpostproc/Makefile
libavformat/Makefile
libavutil/Makefile

index 2c3a7d7..611dc88 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -149,6 +149,8 @@ ifeq ($(BUILD_STATIC),yes)
 endif
 
 install-headers:
+       install -d "$(incdir)"
+       install -d "$(libdir)/pkgconfig"
        $(MAKE) -C libavutil   install-headers
        $(MAKE) -C libavcodec  install-headers
        $(MAKE) -C libavformat install-headers
index 777d94c..fe178f7 100644 (file)
@@ -525,13 +525,8 @@ ifeq ($(CONFIG_PP),yes)
 endif
 
 install-headers:
-       mkdir -p "$(prefix)/include/ffmpeg"
-       install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \
-                "$(prefix)/include/ffmpeg"
-       install -m 644 $(SRC_PATH)/libavcodec/dsputil.h \
-                "$(prefix)/include/ffmpeg"
-       install -d "$(libdir)/pkgconfig"
-       install -m 644 ../libavcodec.pc "$(libdir)/pkgconfig"
+       install -m 644 avcodec.h dsputil.h "$(incdir)"
+       install -m 644 $(SRC_PATH)/libavcodec.pc "$(libdir)/pkgconfig"
 ifeq ($(CONFIG_PP),yes)
        $(MAKE) -C libpostproc $@
 endif
index 2f7ec1a..fe322c6 100644 (file)
@@ -65,10 +65,8 @@ install-lib-static: $(LIB)
        install -m 644 $(LIB) "$(libdir)"
 
 install-headers:
-       mkdir -p $(prefix)/include/postproc
-       install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h
-       install -d $(libdir)/pkgconfig
-       install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
+       install -m 644 $postprocess.h $(prefix)/include/postproc/postprocess.h
+       install -m 644 $(SRC_PATH)/libpostproc.pc $(libdir)/pkgconfig
 
 
 #
index a33143d..d818bfb 100644 (file)
@@ -141,13 +141,8 @@ install-lib-static: $(LIB)
        install -m 644 $(LIB) "$(libdir)"
 
 install-headers:
-       mkdir -p "$(prefix)/include/ffmpeg"
-       install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \
-                $(SRC_PATH)/libavformat/rtp.h $(SRC_PATH)/libavformat/rtsp.h \
-                $(SRC_PATH)/libavformat/rtspcodes.h \
-                "$(prefix)/include/ffmpeg"
-       install -d "$(libdir)/pkgconfig"
-       install -m 644 ../libavformat.pc "$(libdir)/pkgconfig"
+       install -m 644 avformat.h avio.h rtp.h rtsp.h rtspcodes.h "$(prefix)/include/ffmpeg"
+       install -m 644 $(SRC_PATH)/libavformat.pc "$(libdir)/pkgconfig"
 
 %.o: %.c
        $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<
index 2a75cb3..6f3ecd9 100644 (file)
@@ -76,16 +76,9 @@ install-lib-static: $(LIB)
        install -m 644 $(LIB) "$(libdir)"
 
 install-headers:
-       mkdir -p "$(prefix)/include/ffmpeg"
-       install -m 644 $(SRC_PATH)/libavutil/avutil.h \
-                      $(SRC_PATH)/libavutil/common.h \
-                      $(SRC_PATH)/libavutil/mathematics.h \
-                      $(SRC_PATH)/libavutil/integer.h \
-                      $(SRC_PATH)/libavutil/rational.h \
-                      $(SRC_PATH)/libavutil/intfloat_readwrite.h \
-                "$(prefix)/include/ffmpeg"
-       install -d "$(libdir)/pkgconfig"
-       install -m 644 ../libavutil.pc "$(libdir)/pkgconfig"
+       install -m 644 avutil.h common.h mathematics.h integer.h \
+                      rational.h intfloat_readwrite.h "$(incdir)"
+       install -m 644 $(SRC_PATH)/libavutil.pc "$(libdir)/pkgconfig"
 
 #
 # include dependency files if they exist