Change to VDR 2.x compatible Makefiles. This terminates the

compatibility of the LIVE plugin with VDR versions < 1.7.37.
This is based on a patch I received by the vdr-mailing-list user 'macmenot'.

1 files changed, 2 insertions, 31 deletions

diff --git a/css/Makefile b/css/Makefile
index 0ce391c..4a5528f 100644
--- a/css/Makefile
+++ b/css/Makefile
@@ -1,48 +1,20 @@
-# The official name of this plugin.
-
+### The official name of this plugin.
 PLUGIN = live
 
 ### Additional options to silence TNTNET warnings
 TNTFLAGS   ?= -Wno-overloaded-virtual -Wno-unused-function
 TNTVERSION ?= $(shell tntnet-config --version | sed -e's/\.//g' | sed -e's/pre.*//g' | awk '/^..$$/ { print $$1."000"} /^...$$/ { print $$1."00"} /^....$$/ { print $$1."0" } /^.....$$/ { print $$1 }')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-AR       ?= ar
-ECPPC    ?= ecppc
-
-CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
-DEFINES  ?= -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION)
-
-### The directory environment:
-
-VDRDIR   ?= ../../../..
-
-### Make sure that necessary options are included:
-
--include $(VDRDIR)/Make.global
-
-### Allow user defined options to overwrite defaults:
-
--include $(VDRDIR)/Make.config
-
 ### Includes and Defines (add further entries here):
-
 INCLUDES += -I$(VDRDIR)/include -I..
 
 ### The object files (add further files here):
-
 OBJS	= styles.o
 
-### Default rules:
-
-.PHONY: all clean
-
+### The main target:
 all: libcss.a
 
 ### Implicit rules:
-
 %.o: %.cpp
 	$(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(PLUGINFEATURES) $(INCLUDES) $<
 
@@ -50,7 +22,6 @@ all: libcss.a
 	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "text/css" $<
 
 ### Targets:
-
 libcss.a: $(OBJS)
 	$(AR) r $@ $^