diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-02-11 19:30:55 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-02-11 19:30:55 +0000 |
| commit | dc2a1ce5c0753de76c623151fa78db6f407c113b (patch) | |
| tree | 4a53dbc79cae665b5e87e96123ade22ced48c370 | |
| parent | 1d67a1d46f4dc8fa5433b37d131290cc21c6824a (diff) | |
| download | ffmpeg-dc2a1ce5c0753de76c623151fa78db6f407c113b.tar.gz | |
Simplify header installation.
Originally committed as revision 4986 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | libavcodec/Makefile | 9 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 6 | ||||
| -rw-r--r-- | libavformat/Makefile | 9 | ||||
| -rw-r--r-- | libavutil/Makefile | 13 |
5 files changed, 11 insertions, 28 deletions
@@ -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 diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 777d94c86d..fe178f7c87 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -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 diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 2f7ec1a0c0..fe322c6e63 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -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 # diff --git a/libavformat/Makefile b/libavformat/Makefile index a33143d103..d818bfb770 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -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 $@ $< diff --git a/libavutil/Makefile b/libavutil/Makefile index 2a75cb3a4e..6f3ecd9dca 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -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 |