changeset 3111:380d5841b346 libavcodec

Separate library install into static and shared installation.
author diego
date Sat, 11 Feb 2006 18:50:45 +0000
parents b090207c3d18
children 31d15c4d86a0
files Makefile libpostproc/Makefile
diffstat 2 files changed, 6 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- 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 $@
--- 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: