diff -Nurp vcd-0.7/Makefile vcd-0.7-fix/Makefile --- vcd-0.7/Makefile 2005-01-26 23:23:47.000000000 +0200 +++ vcd-0.7-fix/Makefile 2006-01-19 19:01:39.000000000 +0200 @@ -13,6 +13,11 @@ PLUGIN = vcd VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g') +### The C++ compiler and options: + +CXX = g++ +CXXFLAGS = -O2 -Wall -Woverloaded-virtual + ### The directory environment: DVBDIR = ../../../../DVB/include @@ -21,6 +26,10 @@ VDRINC = $(VDRDIR)/include 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') @@ -48,11 +57,6 @@ DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN OBJS = $(PLUGIN).o functions.o i18n.o menu.o player.o viewer.o setup.o menucontrol.o psd.o psdcontrol.o -### The C++ compiler and options: - -CXX = g++ -CXXFLAGS = -O2 -Wall -Woverloaded-virtual - ### Implicit rules: %.o: %.c