Silenced compilation warnings related to internals of TNTNET library.

4 files changed, 82 insertions, 32 deletions

diff --git a/Makefile b/Makefile
index 0e5e0de..a6602db 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,7 @@ VERSION = $(shell grep '\#define LIVEVERSION ' setup.h | awk '{ print $$3 }' | s
 ### The C++ compiler and options:
 
 CXX	 ?= g++
+ECPPC	 ?= ecppc
 
 ### This variable is overriden in pages/Makefile because we don't want the
 ### extra warnings in the tntnet generated files. So if you change here
@@ -24,11 +25,6 @@ CXX	 ?= g++
 CXXFLAGS ?= -fPIC -O2 -Wall
 LDFLAGS	 ?= -fPIC -g
 
-ECPPC	 ?= ecppc
-CXXFLAGS += `tntnet-config --cxxflags`
-
-LIBS	 += $(shell tntnet-config --libs)
-
 ### The directory environment:
 
 VDRDIR	 ?= ../../..
@@ -39,7 +35,6 @@ TMPDIR	 ?= /tmp
 
 -include $(VDRDIR)/Make.global
 
-
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
@@ -51,6 +46,9 @@ I18NTARG   = $(shell if [ `echo $(APIVERSION) | tr [.] [0]` -ge "10507" ]; then
 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 }')
 TNTVERS7   = $(shell ver=$(TNTVERSION); if [ $$ver -ge "1606" ]; then echo "yes"; fi)
 
+CXXFLAGS  += $(shell tntnet-config --cxxflags)
+LIBS      += $(shell tntnet-config --libs)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
@@ -65,7 +63,6 @@ ifneq ($(TNTVERS7),yes)
 endif
 
 DEFINES	 += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' -DTNTVERSION=$(TNTVERSION)
-export DEFINES
 
 SUBDIRS	  = pages css javascript
 ifneq ($(TNTVERS7),yes)
@@ -91,9 +88,8 @@ all: libvdr-$(PLUGIN).so $(I18NTARG)
 
 ### Implicit rules:
 
-### all source compiled here shall warn about overloaded virtuals
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
@@ -143,10 +139,10 @@ generate-i18n: i18n-template.h $(I18Npot) $(I18Npo) buildutil/pot2i18n.pl
 subdirs: $(SUBDIRS)
 
 $(SUBDIRS):
-	$(MAKE) -C $@ CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" VDRDIR="../$(VDRDIR)" $(MAKECMDGOALS)
+	$(MAKE) -C $@ $(MAKECMDGOALS)
 
 PAGES:
-	$(MAKE) -C pages CXX="$(CXX)" CXXFLAGS="$(CXXFLAGS)" VDRDIR="../$(VDRDIR)" .dependencies
+	$(MAKE) -C pages .dependencies
 
 $(VERSIONSUFFIX): FORCE
 	./buildutil/version-util $(VERSIONSUFFIX) || ./buildutil/version-util -F $(VERSIONSUFFIX)
diff --git a/css/Makefile b/css/Makefile
index d201ab9..a138774 100644
--- a/css/Makefile
+++ b/css/Makefile
@@ -1,17 +1,36 @@
+# 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
-
-CXXFLAGS += `tntnet-config --cxxflags`
-LDFLAGS  += `tntnet-config --libs`
-
-INCLUDES += -I..
+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
@@ -25,7 +44,7 @@ all: libcss.a
 ### Implicit rules:
 
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 %.cpp: %.css
 	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CSS) -b -m "text/css" $<
diff --git a/javascript/Makefile b/javascript/Makefile
index c86afe2..44ef3c0 100644
--- a/javascript/Makefile
+++ b/javascript/Makefile
@@ -1,18 +1,36 @@
+# 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
-
-CXXFLAGS += `tntnet-config --cxxflags`
-LDFLAGS  += `tntnet-config --libs`
-
-INCLUDES += -I.. -I$(VDRDIR)/include
+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	= treeview.o
@@ -26,7 +44,7 @@ all: libjavascript.a
 ### Implicit rules:
 
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 %.cpp: %.js
 	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_JS) -b -m "text/javascript" $<
diff --git a/pages/Makefile b/pages/Makefile
index f4f1583..8ce12db 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -1,16 +1,36 @@
-CXX      ?= g++ -v
+# The official name of this plugin.
+
+PLUGIN = live
+
+### Additional options to silence TNTNET warnings
+TNTFLAGS   ?= -Wno-overloaded-virtual -Wno-unused-variable
+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
 
--include $(VDRDIR)/Make.global
--include $(VDRDIR)/Make.config
-
-INCLUDES += -I.. -I$(VDRDIR)/include 
+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	= menu.o recordings.o schedule.o multischedule.o screenshot.o   \
@@ -30,11 +50,8 @@ all: libpages.a
 
 ### Implicit rules:
 
-### tntnet produces some compiler warnings,
-### so we add -Wno-unused-variable -Wno-non-virtual-dtor for nice output ;)
-#	$(CXX) $(CXXFLAGS) -Wno-unused-variable -Wno-non-virtual-dtor -c $(DEFINES) $(INCLUDES) $<
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -Wno-unused-variable -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) $(TNTFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
 %.cpp: %.ecpp
 	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<