Originally committed as revision 9972 to svn://svn.ffmpeg.org/ffmpeg/trunk
Ramiro Polla authored on 2007/08/07 09:57:48... | ... |
@@ -1234,6 +1234,10 @@ EOF |
1234 | 1234 |
exit 1; |
1235 | 1235 |
fi |
1236 | 1236 |
|
1237 |
+if disabled static; then |
|
1238 |
+ LIB="" |
|
1239 |
+fi |
|
1240 |
+ |
|
1237 | 1241 |
if ! enabled libogg; then |
1238 | 1242 |
enabled libtheora && die "libogg must be enabled to enable libtheora." |
1239 | 1243 |
enabled libvorbis && die "libogg must be enabled to enable libvorbis." |
... | ... |
@@ -1896,11 +1900,7 @@ echo "BUILD_STATIC=$static" >> config.mak |
1896 | 1896 |
echo "BUILDSUF=$BUILDSUF" >> config.mak |
1897 | 1897 |
echo "LIBPREF=$LIBPREF" >> config.mak |
1898 | 1898 |
echo "LIBSUF=\${BUILDSUF}$LIBSUF" >> config.mak |
1899 |
-if enabled static; then |
|
1900 | 1899 |
echo "LIB=$LIB" >> config.mak |
1901 |
-else # Some Make complain if this variable does not exist. |
|
1902 |
- echo "LIB=" >> config.mak |
|
1903 |
-fi |
|
1904 | 1900 |
echo "SLIBPREF=$SLIBPREF" >> config.mak |
1905 | 1901 |
echo "SLIBSUF=\${BUILDSUF}$SLIBSUF" >> config.mak |
1906 | 1902 |
echo "EXESUF=\${BUILDSUF}$EXESUF" >> config.mak |