diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2002-09-21 08:46:01 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2002-09-21 08:46:01 +0200 |
commit | f6640a25b8a0e1c4611a94f248bf9398154310db (patch) | |
tree | eb9bb7c1f0234ee07b789d028c6ddf4a46fc6952 /PLUGINS | |
parent | 3858cc9e65b1685f5aed9fd9d7b157418f19e0ff (diff) | |
download | vdr-f6640a25b8a0e1c4611a94f248bf9398154310db.tar.gz vdr-f6640a25b8a0e1c4611a94f248bf9398154310db.tar.bz2 |
Fixed Makefile for NEWSTRUCT driver
Diffstat (limited to 'PLUGINS')
-rw-r--r-- | PLUGINS/src/hello/HISTORY | 4 | ||||
-rw-r--r-- | PLUGINS/src/hello/Makefile | 9 | ||||
-rw-r--r-- | PLUGINS/src/hello/hello.c | 4 | ||||
-rw-r--r-- | PLUGINS/src/status/HISTORY | 4 | ||||
-rw-r--r-- | PLUGINS/src/status/Makefile | 11 | ||||
-rw-r--r-- | PLUGINS/src/status/status.c | 4 |
6 files changed, 27 insertions, 9 deletions
diff --git a/PLUGINS/src/hello/HISTORY b/PLUGINS/src/hello/HISTORY index 9778a81f..3507baf7 100644 --- a/PLUGINS/src/hello/HISTORY +++ b/PLUGINS/src/hello/HISTORY @@ -22,3 +22,7 @@ VDR Plugin 'hello' Revision History 2002-08-04: Version 0.0.5 - Added a missing #include. + +2002-09-21: Version 0.0.6 + +- Fixed Makefile for NEWSTRUCT driver. diff --git a/PLUGINS/src/hello/Makefile b/PLUGINS/src/hello/Makefile index b9d911ab..445cff5e 100644 --- a/PLUGINS/src/hello/Makefile +++ b/PLUGINS/src/hello/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.4 2002/06/10 16:24:06 kls Exp $ +# $Id: Makefile 1.5 2002/09/21 08:38:39 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -15,7 +15,12 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The directory environment: +ifdef NEWSTRUCT +DVBDIR = ../../../../DVB/include +DEFINES += -DNEWSTRUCT +else DVBDIR = ../../../../DVB/ost/include +endif VDRDIR = ../../.. VDRINC = $(VDRDIR)/include LIBDIR = ../../lib @@ -34,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES = -I$(VDRINC) -I$(DVBDIR) -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): diff --git a/PLUGINS/src/hello/hello.c b/PLUGINS/src/hello/hello.c index 26a9b9b4..3d1b22fd 100644 --- a/PLUGINS/src/hello/hello.c +++ b/PLUGINS/src/hello/hello.c @@ -3,7 +3,7 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: hello.c 1.6 2002/07/28 13:00:00 kls Exp $ + * $Id: hello.c 1.7 2002/09/21 08:44:56 kls Exp $ */ #include <getopt.h> @@ -12,7 +12,7 @@ #include <vdr/plugin.h> #include "i18n.h" -static const char *VERSION = "0.0.5"; +static const char *VERSION = "0.0.6"; static const char *DESCRIPTION = "A friendly greeting"; static const char *MAINMENUENTRY = "Hello"; diff --git a/PLUGINS/src/status/HISTORY b/PLUGINS/src/status/HISTORY index f0c208f1..f8e52970 100644 --- a/PLUGINS/src/status/HISTORY +++ b/PLUGINS/src/status/HISTORY @@ -8,3 +8,7 @@ VDR Plugin 'status' Revision History 2002-07-13: Version 0.0.2 - Changed the interface of cStatus::Replaying(). + +2002-09-21: Version 0.0.3 + +- Fixed Makefile for NEWSTRUCT driver. diff --git a/PLUGINS/src/status/Makefile b/PLUGINS/src/status/Makefile index 8cdb9fca..f08f22cc 100644 --- a/PLUGINS/src/status/Makefile +++ b/PLUGINS/src/status/Makefile @@ -1,7 +1,7 @@ # # Makefile for a Video Disk Recorder plugin # -# $Id: Makefile 1.2 2002/08/28 19:30:35 kls Exp $ +# $Id: Makefile 1.3 2002/09/21 08:38:39 kls Exp $ # The official name of this plugin. # This name will be used in the '-P...' option of VDR to load the plugin. @@ -15,7 +15,12 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri ### The directory environment: +ifdef NEWSTRUCT +DVBDIR = ../../../../DVB/include +DEFINES += -DNEWSTRUCT +else DVBDIR = ../../../../DVB/ost/include +endif VDRDIR = ../../.. VDRINC = $(VDRDIR)/include LIBDIR = ../../lib @@ -34,7 +39,7 @@ PACKAGE = vdr-$(ARCHIVE) INCLUDES = -I$(VDRINC) -I$(DVBDIR) -DEFINES = -DPLUGIN_NAME_I18N='"$(PLUGIN)"' +DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"' ### The object files (add further files here): @@ -43,7 +48,7 @@ OBJS = $(PLUGIN).o ### The C++ compiler and options: CXX = g++ -CXXFLAGS = -g -O2 -Wall -Woverloaded-virtual +CXXFLAGS = -O2 -Wall -Woverloaded-virtual ### Implicit rules: diff --git a/PLUGINS/src/status/status.c b/PLUGINS/src/status/status.c index dc274e81..56249367 100644 --- a/PLUGINS/src/status/status.c +++ b/PLUGINS/src/status/status.c @@ -3,13 +3,13 @@ * * See the README file for copyright information and how to reach the author. * - * $Id: status.c 1.2 2002/07/13 10:55:55 kls Exp $ + * $Id: status.c 1.3 2002/09/21 08:46:01 kls Exp $ */ #include <vdr/plugin.h> #include <vdr/status.h> -static const char *VERSION = "0.0.2"; +static const char *VERSION = "0.0.3"; static const char *DESCRIPTION = "Status monitor test"; static const char *MAINMENUENTRY = NULL; |