From 418f4f3ba61c5b148bf0a591071a563b5de2fc19 Mon Sep 17 00:00:00 2001 From: methodus Date: Mon, 22 Oct 2012 17:01:03 +0200 Subject: Revert "Rearraged makefiles" This reverts commit 1868f2796534c293a302f043448a05a2d3dae5b7. --- plugins/profiler/vdrDVBProfiler/Makefile | 2 +- plugins/provider/recProvider/Makefile | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/profiler/vdrDVBProfiler/Makefile b/plugins/profiler/vdrDVBProfiler/Makefile index d625cb2..879edb2 100644 --- a/plugins/profiler/vdrDVBProfiler/Makefile +++ b/plugins/profiler/vdrDVBProfiler/Makefile @@ -53,7 +53,7 @@ $(DEPFILE): Makefile libupnp-$(PROFILE)-profiler.so: $(OBJS) $(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@ - @cp --remove-destination $@ $(VDRLIBDIR)/$@.$(APIVERSION) + @cp --remove-destination $@ $@.$(APIVERSION) clean: @-rm -f $(OBJS) $(DEPFILE) *.so *.so.$(APIVERSION) core* *~ diff --git a/plugins/provider/recProvider/Makefile b/plugins/provider/recProvider/Makefile index 5de3337..95f8f41 100644 --- a/plugins/provider/recProvider/Makefile +++ b/plugins/provider/recProvider/Makefile @@ -16,9 +16,14 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(SCHEMA)Provider.cpp | ### The C++ compiler and options: +CXX ?= g++ +CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses -fPIC + UPNPDIR ?= ../../.. VDRLIBDIR ?= $(UPNPDIR)/../../lib +APIVERSION = $(shell sed -ne '/define UPNPPLUGIN_VERSION/s/^.*"\(.*\)".*$$/\1/p' $(UPNPDIR)/include/plugin.h) + VDRDIR ?= $(UPNPDIR)/../../.. VDRAPIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h) -- cgit v1.2.3