summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-02-13 12:53:25 +0000
committerMåns Rullgård <mans@mansr.com>2006-02-13 12:53:25 +0000
commit8b2121e3deeca35121a7c0c4afb5419ca6ce2ccb (patch)
tree0dbac5c10dce56883c71eea5d47c08c0b28fa38c /Makefile
parentf41b1d3541ac8e30a99e6a4bde3fcd84c11ae6f8 (diff)
move common parts of makefiles into common.mak
Originally committed as revision 5015 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 5 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index d999733692..c737ace3b4 100644
--- a/Makefile
+++ b/Makefile
@@ -139,23 +139,15 @@ install-vhook:
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
+ $(MAKE) -C libavutil install-libs
+ $(MAKE) -C libavcodec install-libs
+ $(MAKE) -C libavformat install-libs
ifeq ($(CONFIG_PP),yes)
- $(MAKE) -C libavcodec/libpostproc install-lib-shared
+ $(MAKE) -C libavcodec/libpostproc install-libs
endif
+ifeq ($(BUILD_SHARED),yes)
$(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
-ifeq ($(CONFIG_PP),yes)
- $(MAKE) -C libavcodec/libpostproc install-lib-static
-endif
-endif
install-headers:
install -d "$(incdir)"