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 /libavcodec | |
| 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
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 11 | ||||
| -rw-r--r-- | libavcodec/libpostproc/Makefile | 9 |
2 files changed, 6 insertions, 14 deletions
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: |