[Ffmpeg-cvslog] CVS: ffmpeg configure, 1.245, 1.246 Makefile, 1.92, 1.93

[Diego Biurrun CVS]

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

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


Index: configure
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/configure,v
retrieving revision 1.245
retrieving revision 1.246
diff -u -d -r1.245 -r1.246
--- configure	8 Feb 2006 15:55:41 -0000	1.245
+++ configure	11 Feb 2006 18:50:44 -0000	1.246
@@ -1415,6 +1415,7 @@
 echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak
 echo "SHFLAGS=$SHFLAGS" >> config.mak
 echo "LIBOBJFLAGS=$LIBOBJFLAGS" >> config.mak
+echo "BUILD_STATIC=$lstatic" >> config.mak
 echo "BUILDSUF=$BUILDSUF" >> config.mak
 echo "LIBPREF=$LIBPREF" >> config.mak
 echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak

Index: Makefile
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/Makefile,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- Makefile	11 Feb 2006 17:44:05 -0000	1.92
+++ Makefile	11 Feb 2006 18:50:44 -0000	1.93
@@ -108,10 +108,7 @@
 
 .PHONY: install
 
-install: all install-progs install-headers install-man $(INSTALLVHOOK)
-	$(MAKE) -C libavutil install
-	$(MAKE) -C libavcodec install
-	$(MAKE) -C libavformat install
+install: install-progs install-libs install-headers install-man $(INSTALLVHOOK)
 
 install-progs: $(PROG)
 	install -d "$(bindir)"
@@ -133,10 +130,19 @@
 install-vhook:
 	$(MAKE) -C vhook install
 
-installlib:
-	$(MAKE) -C libavutil installlib
-	$(MAKE) -C libavcodec installlib
-	$(MAKE) -C libavformat installlib
+install-libs:
+	install -d $(libdir)
+ifeq ($(BUILD_SHARED),yes)
+	$(MAKE) -C libavutil   install-lib-shared
+	$(MAKE) -C libavcodec  install-lib-shared
+	$(MAKE) -C libavformat install-lib-shared
+	$(LDCONFIG) || true
+endif
+ifeq ($(BUILD_STATIC),yes)
+	$(MAKE) -C libavutil   install-lib-static
+	$(MAKE) -C libavcodec  install-lib-static
+	$(MAKE) -C libavformat install-lib-static
+endif
 
 install-headers:
 	$(MAKE) -C libavutil   install-headers