# HG changeset patch # User diego # Date 1139683845 0 # Node ID 380d5841b34666e30aced6995c1e5b1accc6d58c # Parent b090207c3d18730c681aefe5ce1e75474bbd22e7 Separate library install into static and shared installation. diff -r b090207c3d18 -r 380d5841b346 Makefile --- a/Makefile Sat Feb 11 17:44:06 2006 +0000 +++ b/Makefile Sat Feb 11 18:50:45 2006 +0000 @@ -502,28 +502,23 @@ 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 -r b090207c3d18 -r 380d5841b346 libpostproc/Makefile --- a/libpostproc/Makefile Sat Feb 11 17:44:06 2006 +0000 +++ b/libpostproc/Makefile Sat Feb 11 18:50:45 2006 +0000 @@ -48,23 +48,20 @@ $(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: