[Ffmpeg-cvslog] CVS: ffmpeg/libavformat Makefile,1.118,1.119

Diego Biurrun CVS diego
Sat Feb 11 19:50:48 CET 2006


Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv21652/libavformat

Modified Files:
	Makefile 
Log Message:
Separate library install into static and shared installation.


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/Makefile,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -d -r1.118 -r1.119
--- Makefile	11 Feb 2006 17:44:06 -0000	1.118
+++ Makefile	11 Feb 2006 18:50:45 -0000	1.119
@@ -124,25 +124,20 @@
 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:





More information about the ffmpeg-cvslog mailing list