summaryrefslogtreecommitdiff
path: root/httpd
diff options
context:
space:
mode:
authorDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2015-02-09 01:07:24 +0100
committerDieter Hametner <dh (plus) vdr (at) gekrumbel (dot) de>2015-02-09 01:07:24 +0100
commit33aff426eb96055c8b89894cb2a0d0514483e1c9 (patch)
treec95158db1881add3b7cc70610b64fe39fc464a7b /httpd
parent6fd4948898043309957a822e0562596a5cf0b735 (diff)
downloadvdr-plugin-live-33aff426eb96055c8b89894cb2a0d0514483e1c9.tar.gz
vdr-plugin-live-33aff426eb96055c8b89894cb2a0d0514483e1c9.tar.bz2
Change to VDR 2.x compatible Makefiles. This terminates the
compatibility of the LIVE plugin with VDR versions < 1.7.37. This is based on a patch I received by the vdr-mailing-list user 'macmenot'.
Diffstat (limited to 'httpd')
-rw-r--r--httpd/Makefile19
1 files changed, 4 insertions, 15 deletions
diff --git a/httpd/Makefile b/httpd/Makefile
index a11d57c..d21eb2f 100644
--- a/httpd/Makefile
+++ b/httpd/Makefile
@@ -1,23 +1,14 @@
-CXX ?= g++
-AR ?= ar
-
-CXXFLAGS ?= -O2 -Woverloaded-virtual -Wall -fPIC
-
-CXXFLAGS += `tntnet-config --cxxflags`
+### The official name of this plugin.
+PLUGIN = live
### Includes and Defines (add further entries here):
-
INCLUDES += -I.
### The object files (add further files here):
-
OBJS = dispatcher.o job.o regex.o worker.o \
listener.o poller.o tntnet.o
-### Default rules:
-
-.PHONY: all clean
-
+### The main target:
all: libhttpd.a
### Implicit rules:
@@ -25,8 +16,7 @@ all: libhttpd.a
%.o: %.cpp
$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-# Dependencies:
-
+### Dependencies:
MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
@@ -35,7 +25,6 @@ $(DEPFILE): Makefile
-include $(DEPFILE)
### Targets:
-
libhttpd.a: $(OBJS)
$(AR) r $@ $^