aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile3
-rwxr-xr-xconfigure4
2 files changed, 0 insertions, 7 deletions
diff --git a/Makefile b/Makefile
index 3e56867140..66af579c71 100644
--- a/Makefile
+++ b/Makefile
@@ -166,9 +166,6 @@ install-libs:
$(MAKE) -C libavdevice install-libs
$(MAKE-$(CONFIG_PP)) -C libpostproc install-libs
$(MAKE-$(CONFIG_SWSCALER)) -C libswscale install-libs
-ifeq ($(BUILD_SHARED),yes)
- -$(LDCONFIG)
-endif
install-headers:
$(MAKE) -C libavutil install-headers
diff --git a/configure b/configure
index b8f564878f..be091dfa5c 100755
--- a/configure
+++ b/configure
@@ -924,7 +924,6 @@ SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)'
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
FFSERVERLDFLAGS=-Wl,-E
-LDCONFIG="ldconfig"
LIBPREF="lib"
LIBSUF=".a"
FULLNAME='$(NAME)$(BUILDSUF)'
@@ -1160,7 +1159,6 @@ case $targetos in
add_cflags "-fno-expensive-optimizations"
;;
esac
- LDCONFIG="echo ignoring ldconfig"
SHFLAGS=-nostart
# enable BeOS things
enable audio_beos
@@ -1185,7 +1183,6 @@ case $targetos in
openbsd)
disable need_memalign
LIBOBJFLAGS='$(PIC)'
- LDCONFIG='ldconfig -m $(SHLIBDIR)'
SHFLAGS='-shared'
SLIBNAME='$(SLIBPREF)$(FULLNAME)$(SLIBSUF).$(LIBVERSION)'
SLIBNAME_WITH_VERSION='$(SLIBNAME)'
@@ -1963,7 +1960,6 @@ echo "MAKE=$make" >> config.mak
echo "CC=$cc" >> config.mak
echo "AR=$ar" >> config.mak
echo "RANLIB=$ranlib" >> config.mak
-echo "LDCONFIG=$LDCONFIG" >> config.mak
echo "LN_S=$ln_s" >> config.mak
enabled dostrip &&
echo "STRIP=$strip" >> config.mak ||