diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2002-01-13 16:57:27 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2002-01-13 16:57:27 +0100 |
| commit | e1ab9c1dacad9f2b3ba3a083b2b8b388289c4b72 (patch) | |
| tree | 23a98a1e57be4496ebeb8b351e6ce3de4601bb59 | |
| parent | 49b2813699f81370315bef38085902f48d601827 (diff) | |
| download | vdr-e1ab9c1dacad9f2b3ba3a083b2b8b388289c4b72.tar.gz vdr-e1ab9c1dacad9f2b3ba3a083b2b8b388289c4b72.tar.bz2 | |
No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and REMOTE=KBD
| -rw-r--r-- | CONTRIBUTORS | 4 | ||||
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | Makefile | 9 |
3 files changed, 13 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5c707c98..7a077b69 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -171,3 +171,7 @@ Thilo Wunderlich <tw@ubcom.net> Stephan Schreiber <stephan@sschreiber.de> for his support in keeping the Premiere World channels up to date in 'channels.conf.cable' + +Lauri Pesonen <lauri.pesonen@firsthop.com> + for avoiding linking in 'libncurses' if compiling without DEBUG_OSD=1 and + REMOTE=KBD @@ -894,3 +894,5 @@ Video Disk Recorder Revision History broadcast the correct timestamps for EPG events between 0:00 and 6:00! - Fixed failing watchdog timer if program hangs in OSD activities (thanks to Carsten Koch). +- No longer requiring 'libncurses' if compiling without DEBUG_OSD=1 and + REMOTE=KBD (thanks to Lauri Pesonen). @@ -4,7 +4,7 @@ # See the main source file 'vdr.c' for copyright information and # how to reach the author. # -# $Id: Makefile 1.28 2001/10/07 15:14:50 kls Exp $ +# $Id: Makefile 1.29 2002/01/13 16:57:27 kls Exp $ .DELETE_ON_ERROR: @@ -37,12 +37,17 @@ ifndef REMOTE REMOTE = KBD endif +ifeq ($(REMOTE), KBD) +NCURSESLIB = -lncurses +endif + DEFINES += -DREMOTE_$(REMOTE) DEFINES += -D_GNU_SOURCE ifdef DEBUG_OSD DEFINES += -DDEBUG_OSD +NCURSESLIB = -lncurses endif ifdef VFAT @@ -71,7 +76,7 @@ include $(DEPFILE) # The main program: vdr: $(OBJS) $(AC3LIB) $(DTVLIB) - g++ -g -O2 $(OBJS) -lncurses -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr + g++ -g -O2 $(OBJS) $(NCURSESLIB) -ljpeg -lpthread $(LIBDIRS) $(DVDLIB) $(AC3LIB) $(DTVLIB) -o vdr # The font files: |