From b963b558d86f3d4f65e5224cce6170f63bec3522 Mon Sep 17 00:00:00 2001 From: LarsAC Date: Sun, 1 Feb 2004 18:22:52 +0000 Subject: Initial revision git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@3 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 91 insertions(+) create mode 100644 Makefile (limited to 'Makefile') diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..8728cc3 --- /dev/null +++ b/Makefile @@ -0,0 +1,91 @@ +# +# Makefile for a Video Disk Recorder plugin +# +# $Id: Makefile,v 1.1 2004/02/01 18:22:53 LarsAC Exp $ + +# The official name of this plugin. +# This name will be used in the '-P...' option of VDR to load the plugin. +# By default the main source file also carries this name. +# +PLUGIN = muggle + +### The version number of this plugin (taken from the main source file): + +VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') + +### The C++ compiler and options: + +CXX ?= g++-3.3 +CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g + +### The directory environment: + +DVBDIR = ../../../../DVB +VDRDIR = ../../.. +LIBDIR = ../../lib +TMPDIR = /tmp + +### Allow user defined options to overwrite defaults: + +-include $(VDRDIR)/Make.config + +### The version number of VDR (taken from VDR's "config.h"): + +VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') + +### The name of the distribution archive: + +ARCHIVE = $(PLUGIN)-$(VERSION) +PACKAGE = vdr-$(ARCHIVE) + +### Includes and Defines (add further entries here): + +INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/ + +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' + +### The object files (add further files here): + +OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o sh_dummy_content.o gd_content_interface.o mg_tools.o mg_media.o + +BINOBJS = sh_shell_osd_plugin.o sh_shell_osd.o sh_shell_osd_menuitems.o muggle.o vdr_menu.o content_interface.o dummy_content.o gd_contentinterface.o muggle_tools.o mgmedia.o + +### Implicit rules: + +%.o: %.c + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< + +# Dependencies: + +MAKEDEP = g++ -MM -MG +DEPFILE = .dependencies +$(DEPFILE): Makefile + @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ + +-include $(DEPFILE) + +### Targets: + +all: libvdr-$(PLUGIN).so + +libvdr-$(PLUGIN).so: $(OBJS) + $(CXX) $(CXXFLAGS) -shared $(OBJS) -lmysqlclient -o $@ + @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + +sh_muggle : sh_muggle.c $(BINOBJS) + $(CXX) $(CXXFLAGS) $(BINOBJS) sh_muggle.c -lmysqlclient -o $@ + +sh_muggle2 : sh_muggle2.c $(BINOBJS) + $(CXX) $(CXXFLAGS) sh_muggle2.c $(BINOBJS) -lmysqlclient -o $@ + +dist: clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) + @mkdir $(TMPDIR)/$(ARCHIVE) + @cp -a * $(TMPDIR)/$(ARCHIVE) + @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) + @-rm -rf $(TMPDIR)/$(ARCHIVE) + @echo Distribution package created as $(PACKAGE).tgz + +clean: + @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ + @-rm -f sh_muggle sh_muggle2 -- cgit v1.2.3 From 89b813bb617c34c24a22bc05442331cbbe71f061 Mon Sep 17 00:00:00 2001 From: RaK Date: Sun, 1 Feb 2004 22:12:56 +0000 Subject: Added new View Genre -> Year -> Track git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@11 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 8728cc3..609c3dc 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.1 2004/02/01 18:22:53 LarsAC Exp $ +# $Id: Makefile,v 1.2 2004/02/01 22:12:56 RaK Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -48,7 +48,8 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o sh_dummy_content.o gd_content_interface.o mg_tools.o mg_media.o -BINOBJS = sh_shell_osd_plugin.o sh_shell_osd.o sh_shell_osd_menuitems.o muggle.o vdr_menu.o content_interface.o dummy_content.o gd_contentinterface.o muggle_tools.o mgmedia.o +#BINOBJS = sh_shell_osd_plugin.o sh_shell_osd.o sh_shell_osd_menuitems.o muggle.o vdr_menu.o content_interface.o dummy_content.o gd_contentinterface.o muggle_tools.o mgmedia.o +BINOBJS = muggle.o vdr_menu.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o ### Implicit rules: @@ -89,3 +90,4 @@ dist: clean clean: @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ @-rm -f sh_muggle sh_muggle2 + -- cgit v1.2.3 From 71c1f01d3921445579feea0015f550be2f9e98e0 Mon Sep 17 00:00:00 2001 From: RaK Date: Sun, 1 Feb 2004 22:35:23 +0000 Subject: Added View Artist -> Tracks git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@12 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 609c3dc..ad5a8df 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.2 2004/02/01 22:12:56 RaK Exp $ +# $Id: Makefile,v 1.3 2004/02/01 22:35:22 RaK Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -48,8 +48,7 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o sh_dummy_content.o gd_content_interface.o mg_tools.o mg_media.o -#BINOBJS = sh_shell_osd_plugin.o sh_shell_osd.o sh_shell_osd_menuitems.o muggle.o vdr_menu.o content_interface.o dummy_content.o gd_contentinterface.o muggle_tools.o mgmedia.o -BINOBJS = muggle.o vdr_menu.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o +BINOBJS = sh_shell_osd_plugin.o sh_shell_osd.o sh_shell_osd_menuitems.o muggle.o vdr_menu.o content_interface.o dummy_content.o gd_content_interface.o muggle_tools.o mgmedia.o ### Implicit rules: -- cgit v1.2.3 From 45eec7862d12b533c7fe8c828802adaf770ae312 Mon Sep 17 00:00:00 2001 From: LarsAC Date: Tue, 3 Feb 2004 00:13:24 +0000 Subject: Improved OSD handling of collapse/back git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@23 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index ad5a8df..fcad314 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.3 2004/02/01 22:35:22 RaK Exp $ +# $Id: Makefile,v 1.4 2004/02/03 00:13:24 LarsAC Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -40,7 +40,7 @@ PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/ +INCLUDES += -I$(VDRDIR) -I$(DVBDIR)/include -I/usr/include/mysql/ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -- cgit v1.2.3 From 5ad0ef849611a4df07d001fe633fa7207a66fc5d Mon Sep 17 00:00:00 2001 From: MountainMan Date: Mon, 9 Feb 2004 19:27:52 +0000 Subject: filter set implemented git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@31 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index fcad314..d913ff7 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.4 2004/02/03 00:13:24 LarsAC Exp $ +# $Id: Makefile,v 1.5 2004/02/09 19:27:52 MountainMan Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -46,9 +46,10 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): -OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o sh_dummy_content.o gd_content_interface.o mg_tools.o mg_media.o +OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o -BINOBJS = sh_shell_osd_plugin.o sh_shell_osd.o sh_shell_osd_menuitems.o muggle.o vdr_menu.o content_interface.o dummy_content.o gd_content_interface.o muggle_tools.o mgmedia.o +BINOBJS = mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o +#BINOBJS = sh_console_osd.o muggle.o vdr_menu.o content_interface.o gd_content_interface.o muggle_tools.o mgmedia.o ### Implicit rules: -- cgit v1.2.3 From d64986da204cb06511f362fed1c3fdc5d1d6949c Mon Sep 17 00:00:00 2001 From: RaK Date: Mon, 9 Feb 2004 22:07:44 +0000 Subject: secound filter set (album search incl. special view #101 git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@32 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d913ff7..af19f23 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.5 2004/02/09 19:27:52 MountainMan Exp $ +# $Id: Makefile,v 1.6 2004/02/09 22:07:44 RaK Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -51,10 +51,9 @@ OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_in BINOBJS = mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o #BINOBJS = sh_console_osd.o muggle.o vdr_menu.o content_interface.o gd_content_interface.o muggle_tools.o mgmedia.o -### Implicit rules: +### Targets: -%.o: %.c - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< +all: libvdr-$(PLUGIN).so # Dependencies: @@ -65,9 +64,10 @@ $(DEPFILE): Makefile -include $(DEPFILE) -### Targets: +### Implicit rules: -all: libvdr-$(PLUGIN).so +%.o: %.c %.h + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -lmysqlclient -o $@ -- cgit v1.2.3 From 368bacb21c6d0c57c0066ae67c88810b6a79b58d Mon Sep 17 00:00:00 2001 From: LarsAC Date: Thu, 12 Feb 2004 09:15:07 +0000 Subject: Moved filter classes into separate files git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@40 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index af19f23..68d0ac8 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.6 2004/02/09 22:07:44 RaK Exp $ +# $Id: Makefile,v 1.7 2004/02/12 09:15:07 LarsAC Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -46,10 +46,8 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): -OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o - -BINOBJS = mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o -#BINOBJS = sh_console_osd.o muggle.o vdr_menu.o content_interface.o gd_content_interface.o muggle_tools.o mgmedia.o +OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o +BINOBJS = mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o ### Targets: @@ -73,12 +71,6 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) -lmysqlclient -o $@ @cp $@ $(LIBDIR)/$@.$(VDRVERSION) -sh_muggle : sh_muggle.c $(BINOBJS) - $(CXX) $(CXXFLAGS) $(BINOBJS) sh_muggle.c -lmysqlclient -o $@ - -sh_muggle2 : sh_muggle2.c $(BINOBJS) - $(CXX) $(CXXFLAGS) sh_muggle2.c $(BINOBJS) -lmysqlclient -o $@ - dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) -- cgit v1.2.3 From da41cc77e5600aad1f37c8409cb112dbe071de67 Mon Sep 17 00:00:00 2001 From: RaK Date: Mon, 23 Feb 2004 15:17:50 +0000 Subject: - first i18n attempt git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@42 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 68d0ac8..de4a3f2 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.7 2004/02/12 09:15:07 LarsAC Exp $ +# $Id: Makefile,v 1.8 2004/02/23 15:41:21 RaK Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -40,13 +40,13 @@ PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR) -I$(DVBDIR)/include -I/usr/include/mysql/ +INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): -OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o +OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o i18n.o BINOBJS = mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o ### Targets: -- cgit v1.2.3 From 616adfc77dc1d08f3bfcd79991a78c6350e4e2f6 Mon Sep 17 00:00:00 2001 From: lvw Date: Fri, 28 May 2004 15:29:19 +0000 Subject: Merged player branch back on HEAD branch. git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@98 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index de4a3f2..46bac1e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.8 2004/02/23 15:41:21 RaK Exp $ +# $Id: Makefile,v 1.9 2004/05/28 15:29:18 lvw Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -46,8 +46,9 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): -OBJS = $(PLUGIN).o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o i18n.o -BINOBJS = mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o +OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o + +LIBS = -lmad -lmysqlclient ### Targets: @@ -68,7 +69,7 @@ $(DEPFILE): Makefile $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< libvdr-$(PLUGIN).so: $(OBJS) - $(CXX) $(CXXFLAGS) -shared $(OBJS) -lmysqlclient -o $@ + $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ @cp $@ $(LIBDIR)/$@.$(VDRVERSION) dist: clean -- cgit v1.2.3 From 068ea169c5d357d192b35c3544f4f9e90be96b29 Mon Sep 17 00:00:00 2001 From: lvw Date: Sun, 29 Aug 2004 14:39:33 +0000 Subject: Import running in basic version git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@127 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 46bac1e..870bd6e 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.9 2004/05/28 15:29:18 lvw Exp $ +# $Id: Makefile,v 1.10 2004/08/29 14:39:33 lvw Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -44,6 +44,7 @@ INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/m DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +MIFLAGS += -I/usr/include/taglib -ltag -lmysqlclient ### The object files (add further files here): OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o @@ -72,6 +73,9 @@ libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ @cp $@ $(LIBDIR)/$@.$(VDRVERSION) +mugglei: mg_tools.o mugglei.o + $(CXX) $(CXXFLAGS) $(MIFLAGS) -o $^ + dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) @@ -82,5 +86,3 @@ dist: clean clean: @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ - @-rm -f sh_muggle sh_muggle2 - -- cgit v1.2.3 From 653ca204d10b3481670a80769baa3d768bb5f64a Mon Sep 17 00:00:00 2001 From: lvw Date: Tue, 7 Sep 2004 17:40:47 +0000 Subject: Merged ogg vorbis player to trunk git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@148 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 870bd6e..d9bf48c 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile,v 1.10 2004/08/29 14:39:33 lvw Exp $ +# $Id$ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -21,7 +21,7 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g ### The directory environment: DVBDIR = ../../../../DVB -VDRDIR = ../../.. +VDRDIR = /usr/local/src/VDR LIBDIR = ../../lib TMPDIR = /tmp @@ -42,14 +42,14 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/ -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE MIFLAGS += -I/usr/include/taglib -ltag -lmysqlclient ### The object files (add further files here): -OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o +OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o vdr_decoder_ogg.o -LIBS = -lmad -lmysqlclient +LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis ### Targets: -- cgit v1.2.3 From b3b973a1309feb725802ecaa4cb77c9cd03fb2a5 Mon Sep 17 00:00:00 2001 From: lvw Date: Sun, 12 Sep 2004 22:36:05 +0000 Subject: Integrated patch from eloy for building mugglei git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@162 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d9bf48c..df90d7e 100644 --- a/Makefile +++ b/Makefile @@ -40,11 +40,12 @@ PACKAGE = vdr-$(ARCHIVE) ### Includes and Defines (add further entries here): -INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include -I/usr/include/mysql/ +INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ + -I/usr/include/mysql/ -I/usr/include/taglib DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -MIFLAGS += -I/usr/include/taglib -ltag -lmysqlclient +MIFLAGS += -I/usr/include/taglib -lmysqlclient ### The object files (add further files here): OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o vdr_decoder_ogg.o @@ -53,7 +54,7 @@ LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis ### Targets: -all: libvdr-$(PLUGIN).so +all: libvdr-$(PLUGIN).so mugglei # Dependencies: @@ -67,14 +68,14 @@ $(DEPFILE): Makefile ### Implicit rules: %.o: %.c %.h - $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< + $(CXX) $(CXXFLAGS) $(DEFINES) $(INCLUDES) -c $< libvdr-$(PLUGIN).so: $(OBJS) $(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@ @cp $@ $(LIBDIR)/$@.$(VDRVERSION) mugglei: mg_tools.o mugglei.o - $(CXX) $(CXXFLAGS) $(MIFLAGS) -o $^ + $(CXX) $(CXXFLAGS) $(LIBS) -ltag -o $@ $^ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @@ -86,3 +87,4 @@ dist: clean clean: @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ + -- cgit v1.2.3 From 3e28731e7cbaeb8c368c245cfc38c1724a4450b9 Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 13 Sep 2004 18:06:07 +0000 Subject: Minor changes in build process and i18n git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@163 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index df90d7e..97783b0 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,8 @@ CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g ### The directory environment: DVBDIR = ../../../../DVB -VDRDIR = /usr/local/src/VDR +VDRDIR = ../../../ +# /usr/local/src/VDR LIBDIR = ../../lib TMPDIR = /tmp @@ -54,7 +55,8 @@ LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis ### Targets: -all: libvdr-$(PLUGIN).so mugglei +all: libvdr-$(PLUGIN).so +# mugglei # Dependencies: -- cgit v1.2.3 From ba85624940c295af07e558e3bff16d0a8657ed1e Mon Sep 17 00:00:00 2001 From: rak Date: Mon, 13 Sep 2004 20:30:01 +0000 Subject: Added URLs for required packages git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@165 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 97783b0..7e5d7af 100644 --- a/Makefile +++ b/Makefile @@ -44,7 +44,8 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE +#DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' MIFLAGS += -I/usr/include/taglib -lmysqlclient ### The object files (add further files here): -- cgit v1.2.3 From 50075887187e1801f3d3425f20a6b6127ffd7ff8 Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 4 Oct 2004 07:30:45 +0000 Subject: Added patch for using sockets and improved menu translations git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@199 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7e5d7af..a8fd95b 100644 --- a/Makefile +++ b/Makefile @@ -56,8 +56,7 @@ LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis ### Targets: -all: libvdr-$(PLUGIN).so -# mugglei +all: libvdr-$(PLUGIN).so mugglei # Dependencies: @@ -78,7 +77,7 @@ libvdr-$(PLUGIN).so: $(OBJS) @cp $@ $(LIBDIR)/$@.$(VDRVERSION) mugglei: mg_tools.o mugglei.o - $(CXX) $(CXXFLAGS) $(LIBS) -ltag -o $@ $^ + $(CXX) $(CXXFLAGS) $^ $(LIBS) -ltag -o $@ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) -- cgit v1.2.3 From 44cd4c0319c75d4315fe0554d701effe77680776 Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 4 Oct 2004 20:47:58 +0000 Subject: Added a patch to correct minor errors. Further, remove using namespace directives in order to remain compatible with g++ 2.95.4 git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@200 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a8fd95b..14de5fd 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,7 @@ INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ #DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -D_GNU_SOURCE MIFLAGS += -I/usr/include/taglib -lmysqlclient ### The object files (add further files here): @@ -60,7 +61,7 @@ all: libvdr-$(PLUGIN).so mugglei # Dependencies: -MAKEDEP = g++ -MM -MG +MAKEDEP = $(CXX) -MM -MG DEPFILE = .dependencies $(DEPFILE): Makefile @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ @@ -88,5 +89,5 @@ dist: clean @echo Distribution package created as $(PACKAGE).tgz clean: - @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ + @-rm -f $(OBJS) $(BINOBJS) $(DEPFILE) *.so *.tgz core* *~ mugglei.o mugglei -- cgit v1.2.3 From 6cce75232cf142808e21352381e31fe688d2396c Mon Sep 17 00:00:00 2001 From: lvw Date: Sat, 9 Oct 2004 08:03:08 +0000 Subject: Import now avoids duplicate tracks git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@213 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 14de5fd..94df06f 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ MIFLAGS += -I/usr/include/taglib -lmysqlclient OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o vdr_decoder_ogg.o LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis +MILIBS = -lmysqlclient -ltag ### Targets: @@ -78,7 +79,7 @@ libvdr-$(PLUGIN).so: $(OBJS) @cp $@ $(LIBDIR)/$@.$(VDRVERSION) mugglei: mg_tools.o mugglei.o - $(CXX) $(CXXFLAGS) $^ $(LIBS) -ltag -o $@ + $(CXX) $(CXXFLAGS) $^ $(MILIBS) -o $@ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) -- cgit v1.2.3 From a02be44fbf9748d635782fb75ba2cef18ba37e44 Mon Sep 17 00:00:00 2001 From: lvw Date: Sun, 10 Oct 2004 14:07:32 +0000 Subject: Include i18n.h for 1.2.6 compatibility git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@222 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 94df06f..f9e61ef 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,8 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -#DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE +#DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' DEFINES += -D_GNU_SOURCE MIFLAGS += -I/usr/include/taglib -lmysqlclient -- cgit v1.2.3 From 2890ec56dc3724551aa60de0ddf3510836a090f8 Mon Sep 17 00:00:00 2001 From: lvw Date: Sun, 10 Oct 2004 14:08:56 +0000 Subject: Removed vorbis option from Makefile for release git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@223 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index f9e61ef..bb397d0 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,8 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -#DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +# DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' DEFINES += -D_GNU_SOURCE MIFLAGS += -I/usr/include/taglib -lmysqlclient -- cgit v1.2.3 From fd8a88d9287e2c0ded3e0601665a785ce0ae5c55 Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 18 Oct 2004 14:31:07 +0000 Subject: Added flag to generate position independent code git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@230 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index bb397d0..80334c6 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The C++ compiler and options: CXX ?= g++-3.3 -CXXFLAGS ?= -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g +CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g ### The directory environment: -- cgit v1.2.3 From d1f40a700e44fc856bbb83f533bc225b642b26cd Mon Sep 17 00:00:00 2001 From: lvw Date: Mon, 25 Oct 2004 00:25:15 +0000 Subject: Added SuSe packaging to Makefile (thanks to Patrice Staudt) git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@236 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 80334c6..12145c5 100644 --- a/Makefile +++ b/Makefile @@ -44,8 +44,8 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -# DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE +# DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' DEFINES += -D_GNU_SOURCE MIFLAGS += -I/usr/include/taglib -lmysqlclient @@ -81,6 +81,11 @@ libvdr-$(PLUGIN).so: $(OBJS) mugglei: mg_tools.o mugglei.o $(CXX) $(CXXFLAGS) $^ $(MILIBS) -o $@ +install: + @cp ../../lib/libvdr-muggle*.so.* /usr/lib/vdr/ + @cp mugglei /usr/local/bin/ + @install -m 755 mugglei /usr/local/bin/ + dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) -- cgit v1.2.3 From 0756ae40d68d403082c86adef042a4c0daba219f Mon Sep 17 00:00:00 2001 From: LarsAC Date: Fri, 7 Jan 2005 18:43:03 +0000 Subject: Merged branch osd_extensions back to main trunk git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@324 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 12145c5..c5c8187 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The C++ compiler and options: CXX ?= g++-3.3 -CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g +CXXFLAGS ?= -fPIC -O0 -Wall -Woverloaded-virtual -Wno-deprecated -g ### The directory environment: @@ -51,14 +51,16 @@ DEFINES += -D_GNU_SOURCE MIFLAGS += -I/usr/include/taglib -lmysqlclient ### The object files (add further files here): -OBJS = $(PLUGIN).o i18n.o vdr_menu.o mg_database.o mg_content_interface.o gd_content_interface.o mg_tools.o mg_media.o mg_filters.o mg_playlist.o vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o vdr_setup.o vdr_decoder_ogg.o +OBJS = $(PLUGIN).o i18n.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \ + vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \ + vdr_setup.o vdr_decoder_ogg.o LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis MILIBS = -lmysqlclient -ltag ### Targets: -all: libvdr-$(PLUGIN).so mugglei +all: libvdr-$(PLUGIN).so # Dependencies: @@ -80,11 +82,10 @@ libvdr-$(PLUGIN).so: $(OBJS) mugglei: mg_tools.o mugglei.o $(CXX) $(CXXFLAGS) $^ $(MILIBS) -o $@ - install: @cp ../../lib/libvdr-muggle*.so.* /usr/lib/vdr/ @cp mugglei /usr/local/bin/ - @install -m 755 mugglei /usr/local/bin/ +# @install -m 755 mugglei /usr/local/bin/ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) -- cgit v1.2.3 From 48fe8751a65c78ee7979e3936352ecc107fd32de Mon Sep 17 00:00:00 2001 From: wr61 Date: Sat, 8 Jan 2005 12:31:55 +0000 Subject: also compile mugglei, and optimize git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@330 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index c5c8187..931c6ef 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The C++ compiler and options: CXX ?= g++-3.3 -CXXFLAGS ?= -fPIC -O0 -Wall -Woverloaded-virtual -Wno-deprecated -g +CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g ### The directory environment: @@ -60,7 +60,7 @@ MILIBS = -lmysqlclient -ltag ### Targets: -all: libvdr-$(PLUGIN).so +all: libvdr-$(PLUGIN).so mugglei # Dependencies: -- cgit v1.2.3 From 05801055e91bef231bb6aa48a96034e69bd7f250 Mon Sep 17 00:00:00 2001 From: LarsAC Date: Sun, 23 Jan 2005 13:03:34 +0000 Subject: Merged branches osd_extensions and flac_player for new release, yet untested git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@386 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 931c6ef..9213ab8 100644 --- a/Makefile +++ b/Makefile @@ -44,18 +44,16 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -# DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DEFINES += -D_GNU_SOURCE +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -DHAVE_FLAC MIFLAGS += -I/usr/include/taglib -lmysqlclient ### The object files (add further files here): -OBJS = $(PLUGIN).o i18n.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \ +OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \ vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \ - vdr_setup.o vdr_decoder_ogg.o + vdr_setup.o vdr_decoder_ogg.o vdr_decoder_flac.o -LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis +LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis -lFLAC++ MILIBS = -lmysqlclient -ltag ### Targets: -- cgit v1.2.3 From d4537b770d7bd6d64ba2ffe1cbe020789fdefbfa Mon Sep 17 00:00:00 2001 From: LarsAC Date: Sun, 23 Jan 2005 19:51:57 +0000 Subject: Minor bugfixes git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@394 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 9213ab8..3e962b6 100644 --- a/Makefile +++ b/Makefile @@ -44,16 +44,17 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DHAVE_VORBISFILE -DHAVE_FLAC +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' # -DHAVE_VORBISFILE -DHAVE_FLAC MIFLAGS += -I/usr/include/taglib -lmysqlclient + ### The object files (add further files here): OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \ vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \ vdr_setup.o vdr_decoder_ogg.o vdr_decoder_flac.o -LIBS = -lmad -lmysqlclient -lvorbisfile -lvorbis -lFLAC++ +LIBS = -lmad -lmysqlclient # -lvorbisfile -lvorbis -lFLAC++ MILIBS = -lmysqlclient -ltag ### Targets: @@ -80,6 +81,7 @@ libvdr-$(PLUGIN).so: $(OBJS) mugglei: mg_tools.o mugglei.o $(CXX) $(CXXFLAGS) $^ $(MILIBS) -o $@ + install: @cp ../../lib/libvdr-muggle*.so.* /usr/lib/vdr/ @cp mugglei /usr/local/bin/ -- cgit v1.2.3 From 14f5032e141da131f3d1f72979cf415d6105d819 Mon Sep 17 00:00:00 2001 From: LarsAC Date: Mon, 7 Feb 2005 09:17:20 +0000 Subject: Merged most recent stuff from osd_extensions trunk for next release (0.1.2) git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@447 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3e962b6..1dd8773 100644 --- a/Makefile +++ b/Makefile @@ -9,6 +9,15 @@ # PLUGIN = muggle +#if you want ogg / flac support, remove the trailing x in those two +#definitions: +define have_vorbisfile +1 +endef +define have_flac +1 +endef + ### The version number of this plugin (taken from the main source file): VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') @@ -16,7 +25,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The C++ compiler and options: CXX ?= g++-3.3 -CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -Wno-deprecated -g +CXXFLAGS ?= -fPIC -O0 -Wall -Woverloaded-virtual -Wno-deprecated -g ### The directory environment: @@ -44,7 +53,7 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' # -DHAVE_VORBISFILE -DHAVE_FLAC +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' MIFLAGS += -I/usr/include/taglib -lmysqlclient @@ -52,11 +61,22 @@ MIFLAGS += -I/usr/include/taglib -lmysqlclient OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \ vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \ - vdr_setup.o vdr_decoder_ogg.o vdr_decoder_flac.o + vdr_setup.o -LIBS = -lmad -lmysqlclient # -lvorbisfile -lvorbis -lFLAC++ +LIBS = -lmad -lmysqlclient MILIBS = -lmysqlclient -ltag +ifdef have_vorbisfile +DEFINES += -DHAVE_VORBISFILE +OBJS += vdr_decoder_ogg.o +LIBS += -lvorbisfile -lvorbis +endif +ifdef have_flac +DEFINES += -DHAVE_FLAC +OBJS += vdr_decoder_flac.o +LIBS += -lFLAC++ +endif + ### Targets: all: libvdr-$(PLUGIN).so mugglei -- cgit v1.2.3 From ec539d44593f97bc543a2b1df900075d226f8a73 Mon Sep 17 00:00:00 2001 From: LarsAC Date: Mon, 7 Feb 2005 10:31:25 +0000 Subject: Remerge changes regarding end of playlist and better dist archive creation git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@451 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 1dd8773..7b8ba41 100644 --- a/Makefile +++ b/Makefile @@ -111,7 +111,7 @@ dist: clean @-rm -rf $(TMPDIR)/$(ARCHIVE) @mkdir $(TMPDIR)/$(ARCHIVE) @cp -a * $(TMPDIR)/$(ARCHIVE) - @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) + @tar czf $(PACKAGE).tgz --exclude=.svn/* -C $(TMPDIR) $(ARCHIVE) @-rm -rf $(TMPDIR)/$(ARCHIVE) @echo Distribution package created as $(PACKAGE).tgz -- cgit v1.2.3 From 4e66317bdef5451a50a3bf4bc1b564338bc52788 Mon Sep 17 00:00:00 2001 From: wr61 Date: Tue, 8 Feb 2005 22:51:17 +0000 Subject: make it compilable with 2.95 git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@464 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7b8ba41..19b9c80 100644 --- a/Makefile +++ b/Makefile @@ -53,7 +53,7 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES += -I$(VDRDIR) -I$(VDRDIR)/include -I$(DVBDIR)/include \ -I/usr/include/mysql/ -I/usr/include/taglib -DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' MIFLAGS += -I/usr/include/taglib -lmysqlclient -- cgit v1.2.3 From 7b0db96df1380ea1eea851a7beda8c4de90a2db2 Mon Sep 17 00:00:00 2001 From: wr61 Date: Tue, 8 Feb 2005 23:02:47 +0000 Subject: HAVE_FLAC and HAVE_VORBISFILE from Make.config git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@467 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 19b9c80..d2439e5 100644 --- a/Makefile +++ b/Makefile @@ -9,14 +9,10 @@ # PLUGIN = muggle -#if you want ogg / flac support, remove the trailing x in those two -#definitions: -define have_vorbisfile -1 -endef -define have_flac -1 -endef +#if you want ogg / flac support, define HAVE_VORBISFILE and/or HAVE_FLAC +#in $VDRDIR/Make.config like this: +# HAVE_VORBISFILE=1 +# HAVE_FLAC=1 ### The version number of this plugin (taken from the main source file): @@ -66,12 +62,12 @@ OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o LIBS = -lmad -lmysqlclient MILIBS = -lmysqlclient -ltag -ifdef have_vorbisfile +ifdef HAVE_VORBISFILE DEFINES += -DHAVE_VORBISFILE OBJS += vdr_decoder_ogg.o LIBS += -lvorbisfile -lvorbis endif -ifdef have_flac +ifdef HAVE_FLAC DEFINES += -DHAVE_FLAC OBJS += vdr_decoder_flac.o LIBS += -lFLAC++ -- cgit v1.2.3 From dd1334ae324e6ac56909266ba150cd11aea0d6ea Mon Sep 17 00:00:00 2001 From: LarsAC Date: Thu, 10 Feb 2005 16:44:02 +0000 Subject: Enhanced to cover mySQL embedded library git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@473 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') diff --git a/Makefile b/Makefile index d2439e5..48d42e7 100644 --- a/Makefile +++ b/Makefile @@ -61,6 +61,7 @@ OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o LIBS = -lmad -lmysqlclient MILIBS = -lmysqlclient -ltag +# MILIBS = -lmysqld -lpthread -lz -lcrypt -lnsl -lm -lpthread -lrt -lwrap -ltag ifdef HAVE_VORBISFILE DEFINES += -DHAVE_VORBISFILE -- cgit v1.2.3 From 825586656f62847a44329e39d0ba2684f86bdbbe Mon Sep 17 00:00:00 2001 From: wr61 Date: Sun, 20 Feb 2005 12:15:09 +0000 Subject: sort by folder, show track counts, use shuttle/loop from setup, separate mg_setup from vdr_setup, better error reporting in mugglei, escape cddbid in mugglei git-svn-id: https://vdr-muggle.svn.sourceforge.net/svnroot/vdr-muggle/trunk/muggle-plugin@494 e10066b5-e1e2-0310-b819-94efdf66514b --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 48d42e7..2f5ac30 100644 --- a/Makefile +++ b/Makefile @@ -57,7 +57,7 @@ MIFLAGS += -I/usr/include/taglib -lmysqlclient OBJS = $(PLUGIN).o i18n.o mg_valmap.o mg_order.o mg_db.o mg_actions.o vdr_menu.o mg_tools.o \ vdr_decoder_mp3.o vdr_stream.o vdr_decoder.o vdr_player.o \ - vdr_setup.o + vdr_setup.o mg_setup.o LIBS = -lmad -lmysqlclient MILIBS = -lmysqlclient -ltag -- cgit v1.2.3