diff options
| author | Rolf Ahrenberg <Rolf.Ahrenberg@sci.fi> | 2011-02-10 13:37:53 +0200 |
|---|---|---|
| committer | Dieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de> | 2011-02-10 22:41:14 +0100 |
| commit | f61e6393290b94f5f4404ca4dc28fc62adbe186f (patch) | |
| tree | 74c48788eb381a146766e2afa73b003c9c03bc1d /Makefile | |
| parent | 9f575869f0415b95f15c7641fd9e362cc77b3e20 (diff) | |
| download | vdr-plugin-live-f61e6393290b94f5f4404ca4dc28fc62adbe186f.tar.gz vdr-plugin-live-f61e6393290b94f5f4404ca4dc28fc62adbe186f.tar.bz2 | |
Silenced compilation warnings related to internals of TNTNET library.
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 18 |
1 files changed, 7 insertions, 11 deletions
@@ -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) |