summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorPhilip Gladstone <philipjsg@users.sourceforge.net>2002-11-26 05:01:36 +0000
committerPhilip Gladstone <philipjsg@users.sourceforge.net>2002-11-26 05:01:36 +0000
commit9c938e77e825b69346137a37f06a4859ab561e41 (patch)
tree42cbfaadd01e345a2430e9ffa97283f594fcac05 /Makefile
parent35fedfc349b04e53e77044a3c0ac3027401f4863 (diff)
More fixes to compile and build on more platforms.
Originally committed as revision 1280 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 95fa31d0a7..db78217cc1 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@ ffmpeg$(EXE): ffmpeg_g$(EXE)
ffserver$(EXE): ffserver.o $(DEP_LIBS)
$(CC) $(LDFLAGS) $(FFSLDFLAGS) \
-o $@ ffserver.o -L./libavcodec -L./libavformat \
- -lavformat -lavcodec -ldl $(EXTRALIBS)
+ -lavformat -lavcodec $(EXTRALIBS)
ffplay: ffmpeg$(EXE)
ln -sf $< $@
@@ -120,7 +120,7 @@ TAGS:
# regression tests
libavtest test mpeg4 mpeg: ffmpeg$(EXE)
- make -C tests $@
+ $(MAKE) -C tests $@
ifneq ($(wildcard .depend),)
include .depend