summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorphintuka <phintuka>2008-11-04 12:08:59 +0000
committerphintuka <phintuka>2008-11-04 12:08:59 +0000
commitba6ef67ce6217a0bf4675d31cff829001f69746b (patch)
tree9bb1e51445481f8f70b78c9c8de712abf8d49582 /Makefile
parent3d2265eec5b555a5a40c181a0a37c71c13a82d4b (diff)
downloadxineliboutput-ba6ef67ce6217a0bf4675d31cff829001f69746b.tar.gz
xineliboutput-ba6ef67ce6217a0bf4675d31cff829001f69746b.tar.bz2
Build single vdrdiscovery.o for both client and server
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile8
1 files changed, 3 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4075ffaa..d9af1f33 100644
--- a/Makefile
+++ b/Makefile
@@ -4,7 +4,7 @@
# See the main source file 'xineliboutput.c' for copyright information and
# how to reach the author.
#
-# $Id: Makefile,v 1.50 2008-11-01 12:30:47 phintuka Exp $
+# $Id: Makefile,v 1.51 2008-11-04 12:08:59 phintuka Exp $
#
# The official name of this plugin.
@@ -241,7 +241,7 @@ endif
ifeq ($(XINELIBOUTPUT_X11), yes)
OBJS_SXFE_SO = xine_sxfe_frontend.o xine/post.o
- OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery_standalone.o
+ OBJS_SXFE = xine_sxfe_frontend_standalone.o xine/post.o tools/vdrdiscovery.o
else
OBJS_SXFE_SO =
OBJS_SXFE =
@@ -249,7 +249,7 @@ endif
ifeq ($(XINELIBOUTPUT_FB), yes)
OBJS_FBFE_SO = xine_fbfe_frontend.o xine/post.o
- OBJS_FBFE = xine_fbfe_frontend_standalone.o xine/post.o tools/vdrdiscovery_standalone.o
+ OBJS_FBFE = xine_fbfe_frontend_standalone.o xine/post.o tools/vdrdiscovery.o
else
OBJS_FBFE_SO =
OBJS_FBFE =
@@ -300,8 +300,6 @@ xine/post.o: xine/post.c xine/post.h
$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) xine/post.c -o $@
tools/vdrdiscovery.o: tools/vdrdiscovery.c tools/vdrdiscovery.h
$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) tools/vdrdiscovery.c -o $@
-tools/vdrdiscovery_standalone.o: tools/vdrdiscovery.c tools/vdrdiscovery.h
- $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) tools/vdrdiscovery.c -o $@
xine_post_autocrop.o: xine_post_autocrop.c
$(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) xine_post_autocrop.c
xine_post_swscale.o: xine_post_swscale.c