Originally committed as revision 4303 to svn://svn.ffmpeg.org/ffmpeg/trunktags/v0.5
@@ -197,6 +197,7 @@ ffserver="yes" | |||||
ffplay="yes" | ffplay="yes" | ||||
LDFLAGS=-Wl,--warn-common | LDFLAGS=-Wl,--warn-common | ||||
FFSLDFLAGS=-Wl,-E | FFSLDFLAGS=-Wl,-E | ||||
LDCONFIG="ldconfig" | |||||
LIBPREF="lib" | LIBPREF="lib" | ||||
LIBSUF=".a" | LIBSUF=".a" | ||||
SLIBPREF="lib" | SLIBPREF="lib" | ||||
@@ -273,6 +274,7 @@ dv1394="no" | |||||
make="gmake" | make="gmake" | ||||
CFLAGS="$CFLAGS \$(PIC)" | CFLAGS="$CFLAGS \$(PIC)" | ||||
LDFLAGS="$LDFLAGS -export-dynamic -pthread" | LDFLAGS="$LDFLAGS -export-dynamic -pthread" | ||||
LDCONFIG="ldconfig -m \$(libdir)" | |||||
extralibs="$extralibs -lossaudio" | extralibs="$extralibs -lossaudio" | ||||
;; | ;; | ||||
FreeBSD) | FreeBSD) | ||||
@@ -1205,6 +1207,7 @@ fi | |||||
echo "OPTFLAGS=$CFLAGS" >> config.mak | echo "OPTFLAGS=$CFLAGS" >> config.mak | ||||
echo "SHCFLAGS=$SHCFLAGS">>config.mak | echo "SHCFLAGS=$SHCFLAGS">>config.mak | ||||
echo "LDFLAGS=$LDFLAGS" >> config.mak | echo "LDFLAGS=$LDFLAGS" >> config.mak | ||||
echo "LDCONFIG=$LDCONFIG" >> config.mak | |||||
echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak | echo "FFSLDFLAGS=$FFSLDFLAGS" >> config.mak | ||||
echo "SHFLAGS=$SHFLAGS" >> config.mak | echo "SHFLAGS=$SHFLAGS" >> config.mak | ||||
echo "BUILDSUF=$BUILDSUF" >> config.mak | echo "BUILDSUF=$BUILDSUF" >> config.mak | ||||
@@ -465,7 +465,7 @@ else | |||||
install -d $(libdir) | install -d $(libdir) | ||||
install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so | install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavcodec-$(VERSION).so | ||||
ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so | ln -sf libavcodec-$(VERSION).so $(libdir)/libavcodec.so | ||||
ldconfig || true | |||||
$(LDCONFIG) || true | |||||
endif | endif | ||||
ifeq ($(CONFIG_PP),yes) | ifeq ($(CONFIG_PP),yes) | ||||
$(MAKE) -C libpostproc $@ | $(MAKE) -C libpostproc $@ | ||||
@@ -61,7 +61,7 @@ else | |||||
ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR) | ln -sf $(SPPLIB).$(SPPVERSION) $(libdir)/$(SPPLIB).$(SPPMAJOR) | ||||
install -d $(libdir)/pkgconfig | install -d $(libdir)/pkgconfig | ||||
install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig | install -m 644 ../../libpostproc.pc $(libdir)/pkgconfig | ||||
ldconfig || true | |||||
$(LDCONFIG) || true | |||||
endif | endif | ||||
endif | endif | ||||
mkdir -p $(prefix)/include/postproc | mkdir -p $(prefix)/include/postproc | ||||
@@ -111,7 +111,7 @@ else | |||||
install -d $(libdir) | install -d $(libdir) | ||||
install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so | install $(INSTALLSTRIP) -m 755 $(SLIB) $(libdir)/libavformat-$(VERSION).so | ||||
ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so | ln -sf libavformat-$(VERSION).so $(libdir)/libavformat.so | ||||
ldconfig || true | |||||
$(LDCONFIG) || true | |||||
endif | endif | ||||
else | else | ||||
install: | install: | ||||