Commit e555e7b2 authored by Diego Biurrun's avatar Diego Biurrun

Remove redundant variable declarations.

Originally committed as revision 9853 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 81752d0c
...@@ -820,8 +820,6 @@ mandir='$(PREFIX)/man' ...@@ -820,8 +820,6 @@ mandir='$(PREFIX)/man'
bindir='$(PREFIX)/bin' bindir='$(PREFIX)/bin'
# toolchain # toolchain
cross_prefix=""
cross_compile="no"
cc="gcc" cc="gcc"
ar="ar" ar="ar"
ranlib="ranlib" ranlib="ranlib"
...@@ -852,11 +850,8 @@ dostrip="yes" ...@@ -852,11 +850,8 @@ dostrip="yes"
ffmpeg="yes" ffmpeg="yes"
ffplay="yes" ffplay="yes"
ffserver="yes" ffserver="yes"
gpl="no"
ipv6="yes" ipv6="yes"
shared="no"
static="yes" static="yes"
memalign_hack="no"
mpegaudio_hp="yes" mpegaudio_hp="yes"
network="yes" network="yes"
optimize="yes" optimize="yes"
...@@ -866,8 +861,6 @@ vhook="default" ...@@ -866,8 +861,6 @@ vhook="default"
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$@' SHFLAGS='-shared -Wl,-soname,$@'
VHOOKSHFLAGS='$(SHFLAGS)' VHOOKSHFLAGS='$(SHFLAGS)'
LIBOBJFLAGS=""
FFLDFLAGS=
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil' LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
FFSERVERLDFLAGS=-Wl,-E FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig" LDCONFIG="ldconfig"
...@@ -879,8 +872,6 @@ SLIBSUF=".so" ...@@ -879,8 +872,6 @@ SLIBSUF=".so"
SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)' SLIBNAME='$(SLIBPREF)$(NAME)$(SLIBSUF)'
SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)' SLIBNAME_WITH_VERSION='$(SLIBNAME).$(LIBVERSION)'
SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)' SLIBNAME_WITH_MAJOR='$(SLIBNAME).$(LIBMAJOR)'
EXESUF=""
BUILDSUF=""
LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIB)"' LIB_INSTALL_EXTRA_CMD='$(RANLIB) "$(LIBDIR)/$(LIB)"'
# find source path # find source path
...@@ -1118,7 +1109,6 @@ case $targetos in ...@@ -1118,7 +1109,6 @@ case $targetos in
fi ;; fi ;;
sunos) sunos)
dv1394="no" dv1394="no"
FFLDFLAGS=""
FFSERVERLDFLAGS="" FFSERVERLDFLAGS=""
SHFLAGS="-shared -Wl,-h,\$@" SHFLAGS="-shared -Wl,-h,\$@"
add_extralibs "-lsocket -lnsl" add_extralibs "-lsocket -lnsl"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment