Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Simplify header installation.

Browse Source 
Originally committed as revision 4986 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Diego Biurrun 19 years ago
parent 1d67a1d46f
commit dc2a1ce5c0
5 changed files with 11 additions and 28 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      Makefile
  2. 9
      libavcodec/Makefile
  3. 6
      libavcodec/libpostproc/Makefile
  4. 9
      libavformat/Makefile
  5. 13
      libavutil/Makefile

2
Makefile
Unescape View File

@ -149,6 +149,8 @@ ifeq ($(BUILD_STATIC),yes)
endif endif
install-headers: install-headers:
install -d "$(incdir)"
install -d "$(libdir)/pkgconfig"
$(MAKE) -C libavutil install-headers $(MAKE) -C libavutil install-headers
$(MAKE) -C libavcodec install-headers $(MAKE) -C libavcodec install-headers
$(MAKE) -C libavformat install-headers $(MAKE) -C libavformat install-headers

9
libavcodec/Makefile
Unescape View File

@ -525,13 +525,8 @@ ifeq ($(CONFIG_PP),yes)
endif endif
install-headers: install-headers:
mkdir -p "$(prefix)/include/ffmpeg" install -m 644 avcodec.h dsputil.h "$(incdir)"
install -m 644 $(SRC_PATH)/libavcodec/avcodec.h \ install -m 644 $(SRC_PATH)/libavcodec.pc "$(libdir)/pkgconfig"
"$(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"
ifeq ($(CONFIG_PP),yes) ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libpostproc $@ $(MAKE) -C libpostproc $@
endif endif

6
libavcodec/libpostproc/Makefile
Unescape View File

@ -65,10 +65,8 @@ install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
mkdir -p $(prefix)/include/postproc install -m 644 $postprocess.h $(prefix)/include/postproc/postprocess.h
install -m 644 $(SRC_PATH)/libavcodec/libpostproc/postprocess.h $(prefix)/include/postproc/postprocess.h install -m 644 $(SRC_PATH)/libpostproc.pc $(libdir)/pkgconfig
install -d $(libdir)/pkgconfig
install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig
# #

9
libavformat/Makefile
Unescape View File

@ -141,13 +141,8 @@ install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
mkdir -p "$(prefix)/include/ffmpeg" install -m 644 avformat.h avio.h rtp.h rtsp.h rtspcodes.h "$(prefix)/include/ffmpeg"
install -m 644 $(SRC_PATH)/libavformat/avformat.h $(SRC_PATH)/libavformat/avio.h \ install -m 644 $(SRC_PATH)/libavformat.pc "$(libdir)/pkgconfig"
$(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"
%.o: %.c %.o: %.c
$(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $< $(CC) $(CFLAGS) $(LIBOBJFLAGS) -c -o $@ $<

13
libavutil/Makefile
Unescape View File

@ -76,16 +76,9 @@ install-lib-static: $(LIB)
install -m 644 $(LIB) "$(libdir)" install -m 644 $(LIB) "$(libdir)"
install-headers: install-headers:
mkdir -p "$(prefix)/include/ffmpeg" install -m 644 avutil.h common.h mathematics.h integer.h \
install -m 644 $(SRC_PATH)/libavutil/avutil.h \ rational.h intfloat_readwrite.h "$(incdir)"
$(SRC_PATH)/libavutil/common.h \ install -m 644 $(SRC_PATH)/libavutil.pc "$(libdir)/pkgconfig"
$(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"
# #
# include dependency files if they exist # include dependency files if they exist

Write Preview
Loading…
Cancel
Save