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 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

(limited to 'Makefile')

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