aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-09-08 18:17:50 +0000
committerDiego Biurrun <diego@biurrun.de>2006-09-08 18:17:50 +0000
commitf381af7b7fa9f8e7c97cf0367f6920b692fc7d7f (patch)
treea2d3c42f36b13d81379cdcd421379276611fded4 /Makefile
parenta9550eb670642f7cdee8871b8f33fc69e05fe1db (diff)
downloadffmpeg-f381af7b7fa9f8e7c97cf0367f6920b692fc7d7f.tar.gz
Remove pointless variable indirection.
Originally committed as revision 6202 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index b244e6cc2d..4a361ef511 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ ifeq ($(CONFIG_FFPLAY),yes)
MANPAGES+=doc/ffplay.1
PROGS_G+=ffplay_g$(EXESUF)
PROGS+=ffplay$(EXESUF)
-FFPLAY_O=ffplay.o
endif
BASENAMES=ffmpeg ffplay ffserver
@@ -57,7 +56,7 @@ ifeq ($(BUILD_DOC),yes)
DOC=documentation
endif
-OBJS = ffmpeg.o ffserver.o cmdutils.o $(FFPLAY_O)
+OBJS = ffmpeg.o ffserver.o cmdutils.o ffplay.o
SRCS = $(OBJS:.o=.c) $(ASM_OBJS:.o=.s)
LDFLAGS += -L./libavformat -L./libavcodec -L./libavutil
FFLIBS = -lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF)