X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=blobdiff_plain;f=Makefile;h=e91763b9efea96191de1a609b37906adc95571ba;hp=6b4cab0a7b95a60aee78e38a20226b0206efe517;hb=b12f8273fa62978511ebe7b86d68269459c5921d;hpb=e60b4ced1fe43a270ef425ed4966cb1a77162322;ds=inline diff --git a/Makefile b/Makefile index 6b4cab0a7b..e91763b9ef 100644 --- a/Makefile +++ b/Makefile @@ -108,10 +108,7 @@ documentation: .PHONY: install -install: all install-progs install-headers install-man $(INSTALLVHOOK) - $(MAKE) -C libavutil install - $(MAKE) -C libavcodec install - $(MAKE) -C libavformat install +install: install-progs install-libs install-headers install-man $(INSTALLVHOOK) install-progs: $(PROG) install -d "$(bindir)" @@ -133,10 +130,19 @@ endif install-vhook: $(MAKE) -C vhook install -installlib: - $(MAKE) -C libavutil installlib - $(MAKE) -C libavcodec installlib - $(MAKE) -C libavformat installlib +install-libs: + install -d $(libdir) +ifeq ($(BUILD_SHARED),yes) + $(MAKE) -C libavutil install-lib-shared + $(MAKE) -C libavcodec install-lib-shared + $(MAKE) -C libavformat install-lib-shared + $(LDCONFIG) || true +endif +ifeq ($(BUILD_STATIC),yes) + $(MAKE) -C libavutil install-lib-static + $(MAKE) -C libavcodec install-lib-static + $(MAKE) -C libavformat install-lib-static +endif install-headers: $(MAKE) -C libavutil install-headers