From f61e6393290b94f5f4404ca4dc28fc62adbe186f Mon Sep 17 00:00:00 2001
From: Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi>
Date: Thu, 10 Feb 2011 13:37:53 +0200
Subject: Silenced compilation warnings related to internals of TNTNET library.

---
 javascript/Makefile | 30 ++++++++++++++++++++++++------
 1 file changed, 24 insertions(+), 6 deletions(-)

(limited to 'javascript')

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" $<
-- 
cgit v1.2.3