summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-02-11 18:50:45 +0000
committerDiego Biurrun <diego@biurrun.de>2006-02-11 18:50:45 +0000
commitb12f8273fa62978511ebe7b86d68269459c5921d (patch)
tree3780f186aa71a612550ea07f3e35f891b6a6b088 /Makefile
parente60b4ced1fe43a270ef425ed4966cb1a77162322 (diff)
downloadffmpeg-b12f8273fa62978511ebe7b86d68269459c5921d.tar.gz
Separate library install into static and shared installation.
Originally committed as revision 4983 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile22
1 files changed, 14 insertions, 8 deletions
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