From 418f4f3ba61c5b148bf0a591071a563b5de2fc19 Mon Sep 17 00:00:00 2001
From: methodus <methodus@web.de>
Date: Mon, 22 Oct 2012 17:01:03 +0200
Subject: Revert "Rearraged makefiles"

This reverts commit 1868f2796534c293a302f043448a05a2d3dae5b7.
---
 Makefile                                 | 24 +++++++++++++++++++++++-
 common.mk                                | 27 ---------------------------
 plugins/profiler/vdrDVBProfiler/Makefile |  2 +-
 plugins/provider/recProvider/Makefile    |  5 +++++
 upnp.h                                   |  2 +-
 5 files changed, 30 insertions(+), 30 deletions(-)
 delete mode 100644 common.mk

diff --git a/Makefile b/Makefile
index cae7843..71adef3 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,17 @@ PLUGIN = upnp
 
 VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g')
 
-include common.mk
+### The C++ compiler and options:
+
+CXX      ?= g++
+ECPPC	 ?= ecppc
+CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses
+
+### The directory environment:
+
+VDRDIR ?= ../../..
+LIBDIR ?= ../../lib
+TMPDIR ?= /tmp
 
 PLUGINDIR= ./PLUGINS
 PLUGINLIBDIR= /usr/lib/vdr/plugins/upnp
@@ -28,6 +38,10 @@ include $(VDRDIR)/Make.global
 
 -include $(VDRDIR)/Make.config
 
+### The version number of VDR's plugin API (taken from VDR's "config.h"):
+
+APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
@@ -70,6 +84,14 @@ LIBS += -lupnp -lcxxtools -ltntnet -ltntdb -ldl
 
 all: libvdr-$(PLUGIN).so i18n
 
+### Implicit rules:
+
+%.o: %.cpp
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
+
+%.cpp: %.ecpp
+	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
+
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
diff --git a/common.mk b/common.mk
deleted file mode 100644
index 382c101..0000000
--- a/common.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-### The directory environment:
-
-VDRDIR ?= ../../..
-LIBDIR ?= ../../lib
-TMPDIR ?= /tmp
-UPNPDIR ?= .
-
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
-
-VDRAPIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
-UPNPAPIVERSION = $(shell sed -ne '/define UPNPPLUGIN_VERSION/s/^.*"\(.*\)".*$$/\1/p' $(UPNPDIR)/include/plugin.h)
-
-SUBPLUGINVERSION = 
-
-### The C++ compiler and options:
-
-CXX      ?= g++
-ECPPC	   ?= ecppc
-CXXFLAGS ?= -g -O3 -Wall -Werror=overloaded-virtual -Wno-parentheses -fPIC
-
-### Implicit rules:
-
-%.cpp: %.ecpp
-	$(ECPPC) $(ECPPFLAGS) $(ECPPFLAGS_CPP) $<
-
-%.o: %.cpp
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
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)
 
diff --git a/upnp.h b/upnp.h
index 10ef354..d0e3bd0 100644
--- a/upnp.h
+++ b/upnp.h
@@ -13,7 +13,7 @@
 
 using namespace upnp;
 
-static const char *VERSION        = "1.0.0";
+static const char *VERSION        = "0.0.1";
 static const char *DESCRIPTION    = "UPnP/DLNA compliant Media Server functionality for VDR";
 
 class cPluginUpnp : public cPlugin {
-- 
cgit v1.2.3