[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec Makefile,1.235,1.236

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


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

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


Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/Makefile,v
retrieving revision 1.235
retrieving revision 1.236
diff -u -d -r1.235 -r1.236
--- Makefile	11 Feb 2006 17:44:05 -0000	1.235
+++ Makefile	11 Feb 2006 18:50:45 -0000	1.236
@@ -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 $@





More information about the ffmpeg-cvslog mailing list