diff options
| -rw-r--r-- | Makefile | 12 | ||||
| -rw-r--r-- | xine_frontend.c | 9 |
2 files changed, 8 insertions, 13 deletions
@@ -4,7 +4,7 @@ # See the main source file 'xineliboutput.c' for copyright information and # how to reach the author. # -# $Id: Makefile,v 1.58 2008-11-11 19:04:02 rofafor Exp $ +# $Id: Makefile,v 1.59 2008-11-13 23:56:58 phintuka Exp $ # # The official name of this plugin. @@ -230,7 +230,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.o logdefs.o \ - xine_frontend_lirc.o + xine_frontend_main.o xine_frontend_lirc.o else OBJS_SXFE_SO = OBJS_SXFE = @@ -239,7 +239,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.o logdefs.o \ - xine_frontend_lirc.o + xine_frontend_main.o xine_frontend_lirc.o else OBJS_FBFE_SO = OBJS_FBFE = @@ -295,6 +295,8 @@ xine_post_audiochannel.o: xine_post_audiochannel.c logdefs.o: logdefs.c logdefs.h $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) -o $@ $< +xine_frontend_main.o: xine_frontend_main.c xine_frontend.h + $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) -o $@ $< xine_frontend_lirc.o: xine_frontend_lirc.c xine_frontend_lirc.h $(CC) $(CFLAGS) -c $(DEFINES) $(INCLUDES) $(OPTFLAGS) -o $@ $< xine/post.o: xine/post.c xine/post.h @@ -309,12 +311,12 @@ xine_fbfe_frontend.o: xine_fbfe_frontend.c xine_sxfe_frontend_standalone.o: xine_sxfe_frontend.c xine_frontend.c \ xine_frontend.h xine_input_vdr.h xine_osd_command.h \ - xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.h \ + xine/post.h logdefs.h xine_frontend_lirc.h \ xineliboutput.c tools/vdrdiscovery.h $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) xine_sxfe_frontend.c -o $@ xine_fbfe_frontend_standalone.o: xine_fbfe_frontend.c xine_frontend.c \ xine_frontend.h xine_input_vdr.h xine_osd_command.h \ - xine/post.h logdefs.h xine_frontend_main.c xine_frontend_lirc.h \ + xine/post.h logdefs.h xine_frontend_lirc.h \ xineliboutput.c tools/vdrdiscovery.h $(CC) $(CFLAGS) -c $(DEFINES) -DFE_STANDALONE $(INCLUDES) $(OPTFLAGS) xine_fbfe_frontend.c -o $@ diff --git a/xine_frontend.c b/xine_frontend.c index 39aa4874..df172a44 100644 --- a/xine_frontend.c +++ b/xine_frontend.c @@ -4,7 +4,7 @@ * See the main source file 'xineliboutput.c' for copyright information and * how to reach the author. * - * $Id: xine_frontend.c,v 1.83 2008-11-13 23:51:19 phintuka Exp $ + * $Id: xine_frontend.c,v 1.84 2008-11-13 23:56:58 phintuka Exp $ * */ @@ -1731,10 +1731,3 @@ void init_fe(fe_t *fe) fe->fe.send_input_event = fe_send_input_event; } -#ifdef FE_STANDALONE - -/* frontend main() */ - -#include "xine_frontend_main.c" - -#endif /* #ifdef FE_STANDALONE */ |