diff options
| author | Diego Biurrun <diego@biurrun.de> | 2006-02-11 18:50:45 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2006-02-11 18:50:45 +0000 |
| commit | b12f8273fa62978511ebe7b86d68269459c5921d (patch) | |
| tree | 3780f186aa71a612550ea07f3e35f891b6a6b088 | |
| parent | e60b4ced1fe43a270ef425ed4966cb1a77162322 (diff) | |
| download | ffmpeg-b12f8273fa62978511ebe7b86d68269459c5921d.tar.gz | |
Separate library install into static and shared installation.
Originally committed as revision 4983 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | Makefile | 22 | ||||
| -rwxr-xr-x | configure | 1 | ||||
| -rw-r--r-- | libavcodec/Makefile | 11 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 9 | ||||
| -rw-r--r-- | libavformat/Makefile | 11 | ||||
| -rw-r--r-- | libavutil/Makefile | 10 |
6 files changed, 26 insertions, 38 deletions
@@ -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 @@ -1415,6 +1415,7 @@ echo "LDCONFIG=$LDCONFIG" >> config.mak echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak echo "SHFLAGS=$SHFLAGS" >> config.mak echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak +echo "BUILD_STATIC=$lstatic" >> config.mak echo "BUILDSUF=$BUILDSUF" >> config.mak echo "LIBPREF=$LIBPREF" >> config.mak echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 428e293ccd..777d94c86d 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -502,28 +502,23 @@ motion-test: motion_test.o $(LIB) fft-test: fft-test.o $(LIB) $(CC) -o $@ $^ $(LIBAVUTIL) -lm -ifeq ($(BUILD_SHARED),yes) -install: all + +install-lib-shared: $(SLIBNAME) ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else - install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ $(libdir)/$(SLIBNAME_WITH_VERSION) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME_WITH_MAJOR) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME) - $(LDCONFIG) || true endif ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc $@ endif -else -install: -endif -installlib: all +install-lib-static: $(LIB) install -m 644 $(LIB) "$(libdir)" ifeq ($(CONFIG_PP),yes) $(MAKE) -C libpostproc $@ diff --git a/libavcodec/libpostproc/Makefile b/libavcodec/libpostproc/Makefile index 8f32bb62f4..2f7ec1a0c0 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libavcodec/libpostproc/Makefile @@ -48,23 +48,20 @@ $(LIB): $(OBJS) $(AR) rc $@ $(OBJS) $(RANLIB) $@ -install: all -ifeq ($(BUILD_SHARED),yes) + +install-lib-shared: $(SLIBNAME) ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else - install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ $(libdir)/$(SLIBNAME_WITH_VERSION) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME_WITH_MAJOR) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME) - $(LDCONFIG) || true -endif endif -installlib: all +install-lib-static: $(LIB) install -m 644 $(LIB) "$(libdir)" install-headers: diff --git a/libavformat/Makefile b/libavformat/Makefile index 6f4f680639..a33143d103 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -124,25 +124,20 @@ endif depend: $(SRCS) $(CC) -MM $(CFLAGS) $^ 1>.depend -ifeq ($(BUILD_SHARED),yes) -install: all + +install-lib-shared: $(SLIBNAME) ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else - install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ $(libdir)/$(SLIBNAME_WITH_VERSION) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME_WITH_MAJOR) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME) - $(LDCONFIG) || true -endif -else -install: endif -installlib: all +install-lib-static: $(LIB) install -m 644 $(LIB) "$(libdir)" install-headers: diff --git a/libavutil/Makefile b/libavutil/Makefile index a27ed55a8b..2a75cb3a4e 100644 --- a/libavutil/Makefile +++ b/libavutil/Makefile @@ -60,25 +60,19 @@ distclean: clean rm -f .depend -ifeq ($(BUILD_SHARED),yes) -install: all +install-lib-shared: $(SLIBNAME) ifeq ($(CONFIG_WIN32),yes) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) "$(prefix)" else - install -d $(libdir) install $(INSTALLSTRIP) -m 755 $(SLIBNAME) \ $(libdir)/$(SLIBNAME_WITH_VERSION) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME_WITH_MAJOR) ln -sf $(SLIBNAME_WITH_VERSION) \ $(libdir)/$(SLIBNAME) - $(LDCONFIG) || true -endif -else -install: endif -installlib: all +install-lib-static: $(LIB) install -m 644 $(LIB) "$(libdir)" install-headers: |