From 0b917d2c8dc2a6a3f64e9157f196fc0367419194 Mon Sep 17 00:00:00 2001
From: Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>
Date: Sun, 20 Apr 2008 20:01:50 +0200
Subject: Changed CXXFLAGS to ommit well known but anoying warnings when
 compiling sources generated through the tntnet ecppc precompiler.

---
 Makefile       | 11 +++++++----
 pages/Makefile |  9 +++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile b/Makefile
index 1731de2..baa086a 100644
--- a/Makefile
+++ b/Makefile
@@ -18,14 +18,16 @@ VERSION = $(shell grep '\#define LIVEVERSION ' setup.h | awk '{ print $$3 }' | s
 
 CXX	 ?= g++
 
-### tntnet produces some compiler warnings, so we add -Wno-unused-variable -Wno-non-virtual-dtor for nice output ;)
-CXXFLAGS ?= -fPIC -O2 -Wall -Woverloaded-virtual -Wno-unused-variable -Wno-non-virtual-dtor
+### 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
+### something be sure to check pages/Makefile too.
+CXXFLAGS ?= -fPIC -O2 -Wall
 LDFLAGS	 ?= -fPIC -g
 
 ECPPC	 ?= ecppc
 CXXFLAGS += `tntnet-config --cxxflags`
 
-LIBS  += $(shell tntnet-config --libs)
+LIBS	 += $(shell tntnet-config --libs)
 
 ### The directory environment:
 
@@ -85,8 +87,9 @@ all: libvdr-$(PLUGIN).so $(I18NTARG)
 
 ### Implicit rules:
 
+### all source compiled here shall warn about overloaded virtuals
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -Woverloaded-virtual -c $(DEFINES) $(INCLUDES) $<
 
 # Dependencies:
 
diff --git a/pages/Makefile b/pages/Makefile
index 2a8b8be..1750056 100644
--- a/pages/Makefile
+++ b/pages/Makefile
@@ -2,11 +2,6 @@ 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
 
 ### The directory environment:
@@ -31,8 +26,10 @@ all: libpages.a
 
 ### Implicit rules:
 
+### tntnet produces some compiler warnings,
+### so we add -Wno-unused-variable -Wno-non-virtual-dtor for nice output ;)
 %.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -Wno-unused-variable -Wno-non-virtual-dtor -c $(DEFINES) $(INCLUDES) $<
 
 %.cpp: %.ecpp
 	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
-- 
cgit v1.2.3