Adapted Makefiles to VDR 1.7.36+ (thanks to macmenot). Old makefiles have

been renamed to Makefile-1.7.33 (fixes #1199)

Author: Frank Schmirler

CONTRIBUTORS

@@ -211,3 +211,6 @@ Uwe
 
 Chris Tallon
   for his kind permission to use VOMP's recplayer for replaying recordings
+
+macmenot
+  for adapting Makefiles to VDR 1.7.36+

HISTORY

@@ -1,6 +1,8 @@
 VDR Plugin 'streamdev' Revision History
 ---------------------------------------
 
+- Adapted Makefiles to VDR 1.7.36+ (thanks to macmenot). Old makefiles have
+  been renamed to Makefile-1.7.33.
 - API changes of VDR 1.7.38 (thanks to mal@vdr-developer)
 - Added simple recordings menu in HTTP server
 - Restructured menuHTTP classes

Makefile

@@ -1,57 +1,44 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.23 2010/08/02 10:36:59 schmirl Exp $
+# $Id: $
 
-# The main source file name.
-#
-PLUGIN = streamdev
-
-### The C/C++ compiler and options:
+# The official name of this plugin.
+# This name will be used in the '-P...' option of VDR to load the plugin.
+# By default the main source file also carries this name.
 
-CC       ?= gcc
-CFLAGS   ?= -g -O2 -Wall
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+PLUGIN = streamdev
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }' | sed -e 's/[";]//g')
 
 ### The directory environment:
 
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+# Use package data if installed...otherwise assume we're under the VDR source directory:
+PKGCFG = $(if $(VDRDIR),$(shell pkg-config --variable=$(1) $(VDRDIR)/vdr.pc),$(shell pkg-config --variable=$(1) vdr || pkg-config --variable=$(1) ../../../vdr.pc))
+LIBDIR = $(call PKGCFG,libdir)
+LOCDIR = $(call PKGCFG,locdir)
+PLGCFG = $(call PKGCFG,plgcfg)
+#
+TMPDIR ?= /tmp
+
+### The compiler options:
 
-### The version number of VDR (taken from VDR's "config.h"):
+export CFLAGS   = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,cxxflags)
 
-APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-APIVERSNUM = $(shell grep 'define APIVERSNUM ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
-TSPLAYVERSNUM = $(shell grep 'define TSPLAY_PATCH_VERSION ' $(VDRDIR)/device.h | awk '{ print $$3 }')
+### The version number of VDR's plugin API:
 
-### Allow user defined options to overwrite defaults:
+APIVERSION = $(call PKGCFG,apiversion)
 
-ifeq ($(shell test $(APIVERSNUM) -ge 10713; echo $$?),0)
-include $(VDRDIR)/Make.global
-else
-ifeq ($(shell test $(APIVERSNUM) -ge 10704 -o -n "$(TSPLAYVERSNUM)" ; echo $$?),0)
-DEFINES  += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
-CFLAGS   += -fPIC
-CXXFLAGS += -fPIC
-else
-CFLAGS   += -fPIC
-CXXFLAGS += -fPIC
-endif
-endif
+### Allow user defined options to overwrite defaults:
 
--include $(VDRDIR)/Make.config
+-include $(PLGCFG)
 
 ### export all vars for sub-makes, using absolute paths
-
-VDRDIR := $(shell cd $(VDRDIR) >/dev/null 2>&1 && pwd)
 LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd)
+LOCDIR := $(shell cd $(LOCDIR) >/dev/null 2>&1 && pwd)
 export
 unexport PLUGIN
 
@@ -63,6 +50,7 @@ PACKAGE = vdr-$(ARCHIVE)
 ### Includes and Defines (add further entries here):
 
 INCLUDES += -I$(VDRDIR)/include -I..
+export INCLUDES
 
 DEFINES += -D_GNU_SOURCE
 
@@ -82,21 +70,21 @@ all: client server
 
 client:
 	$(MAKE) -C ./tools
-	$(MAKE) -C ./client
+	$(MAKE) -C ./client install
 	# installs to $(LIBDIR)/libvdr-streamdev-client.so.$(APIVERSION)
 
 server:
 	$(MAKE) -C ./tools
 	$(MAKE) -C ./libdvbmpeg
 	$(MAKE) -C ./remux
-	$(MAKE) -C ./server
+	$(MAKE) -C ./server install
 	# installs to $(LIBDIR)/libvdr-streamdev-server.so.$(APIVERSION)
 
 dist: clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz --exclude CVS -C $(TMPDIR) $(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@echo Distribution package created as $(PACKAGE).tgz
 

Makefile-1.7.33

@@ -0,0 +1,108 @@
+#
+# Makefile for a Video Disk Recorder plugin
+#
+# $Id: Makefile,v 1.23 2010/08/02 10:36:59 schmirl Exp $
+
+# The main source file name.
+#
+PLUGIN = streamdev
+
+### The C/C++ compiler and options:
+
+CC       ?= gcc
+CFLAGS   ?= -g -O2 -Wall
+
+CXX      ?= g++
+CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
+
+### The version number of this plugin (taken from the main source file):
+
+VERSION = $(shell grep 'const char \*VERSION *=' common.c | awk '{ print $$5 }' | sed -e 's/[";]//g')
+
+### The directory environment:
+
+VDRDIR = ../../..
+LIBDIR = ../../lib
+TMPDIR = /tmp
+
+### The version number of VDR (taken from VDR's "config.h"):
+
+APIVERSION = $(shell grep 'define APIVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+APIVERSNUM = $(shell grep 'define APIVERSNUM ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g')
+TSPLAYVERSNUM = $(shell grep 'define TSPLAY_PATCH_VERSION ' $(VDRDIR)/device.h | awk '{ print $$3 }')
+
+### Allow user defined options to overwrite defaults:
+
+ifeq ($(shell test $(APIVERSNUM) -ge 10713; echo $$?),0)
+include $(VDRDIR)/Make.global
+else
+ifeq ($(shell test $(APIVERSNUM) -ge 10704 -o -n "$(TSPLAYVERSNUM)" ; echo $$?),0)
+DEFINES  += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+else
+CFLAGS   += -fPIC
+CXXFLAGS += -fPIC
+endif
+endif
+
+-include $(VDRDIR)/Make.config
+
+### export all vars for sub-makes, using absolute paths
+
+VDRDIR := $(shell cd $(VDRDIR) >/dev/null 2>&1 && pwd)
+LIBDIR := $(shell cd $(LIBDIR) >/dev/null 2>&1 && pwd)
+export
+unexport PLUGIN
+
+### The name of the distribution archive:
+
+ARCHIVE = $(PLUGIN)-$(VERSION)
+PACKAGE = vdr-$(ARCHIVE)
+
+### Includes and Defines (add further entries here):
+
+INCLUDES += -I$(VDRDIR)/include -I..
+
+DEFINES += -D_GNU_SOURCE
+
+ifdef DEBUG
+DEFINES += -DDEBUG
+endif
+ifdef STREAMDEV_DEBUG
+DEFINES += -DDEBUG
+endif
+
+### The main target:
+
+.PHONY: all client server dist clean
+all: client server
+
+### Targets:
+
+client:
+	$(MAKE) -C ./tools
+	$(MAKE) -C ./client
+	# installs to $(LIBDIR)/libvdr-streamdev-client.so.$(APIVERSION)
+
+server:
+	$(MAKE) -C ./tools
+	$(MAKE) -C ./libdvbmpeg
+	$(MAKE) -C ./remux
+	$(MAKE) -C ./server
+	# installs to $(LIBDIR)/libvdr-streamdev-server.so.$(APIVERSION)
+
+dist: clean
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@mkdir $(TMPDIR)/$(ARCHIVE)
+	@cp -a * $(TMPDIR)/$(ARCHIVE)
+	@tar czf $(PACKAGE).tgz --exclude CVS -C $(TMPDIR) $(ARCHIVE)
+	@-rm -rf $(TMPDIR)/$(ARCHIVE)
+	@echo Distribution package created as $(PACKAGE).tgz
+
+clean:
+	$(MAKE) -C ./tools clean
+	$(MAKE) -C ./libdvbmpeg clean
+	$(MAKE) -C ./remux clean
+	$(MAKE) -C ./client clean
+	$(MAKE) -C ./server clean

README

@@ -107,6 +107,11 @@ the streamdev-0.5.x releases for older versions.
 2.2 Compiling:
 --------------
 
+The Makefiles are for VDR 1.7.36 and above. For VDR 1.7.33 and below, please
+replace the Makefiles in the main directory and in the client/ and server/
+subdirectories with the corresponding Makefile-1.7.33 files. With VDR 1.7.34 and
+1.7.35 YMMV ;)
+
   cd vdr-1.X.X/PLUGINS/src
   tar xvfz vdr-streamdev-0.5.0.tgz
   ln -s streamdev-0.5.0 streamdev

client/Makefile

@@ -1,14 +1,18 @@
 #
 # Makefile for a Video Disk Recorder plugin
 #
-# $Id: Makefile,v 1.2 2010/07/19 13:49:25 schmirl Exp $
+# $Id: $
 
 # The official name of this plugin.
 # This name will be used in the '-P...' option of VDR to load the plugin.
 # By default the main source file also carries this name.
-#
+
 PLUGIN = streamdev-client
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
 DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
@@ -22,8 +26,7 @@ CLIENTOBJS = $(PLUGIN).o \
 
 ### The main target:
 
-.PHONY: all i18n dist clean
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
@@ -34,51 +37,47 @@ all: libvdr-$(PLUGIN).so i18n
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
-
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(CLIENTOBJS:%.o=%.c) $(COMMONOBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(CLIENTOBJS:%.o=%.c) $(COMMONOBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
 
 ### Internationalization (I18N):
 
 PODIR     = po
-LOCALEDIR = $(VDRDIR)/locale
 I18Npo    = $(wildcard $(PODIR)/*.po)
-I18Nmsgs  = $(addprefix $(LOCALEDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
+I18Nmo    = $(addsuffix .mo, $(foreach file, $(I18Npo), $(basename $(file))))
+I18Nmsgs  = $(addprefix $(DESTDIR)$(LOCDIR)/, $(addsuffix /LC_MESSAGES/vdr-$(PLUGIN).mo, $(notdir $(foreach file, $(I18Npo), $(basename $(file))))))
 I18Npot   = $(PODIR)/$(PLUGIN).pot
 
 %.mo: %.po
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(CLIENTOBJS:%.o=%.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<http://www.vdr-developer.org/mantisbt/>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<[email protected]>' -o $@ `ls $^`
 
 %.po: $(I18Npot)
-	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
+	msgmerge -U --no-wrap --no-location --backup=none -q -N $@ $<
 	@touch $@
 
-$(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir $@)
-	cp $< $@
+$(I18Nmsgs): $(DESTDIR)$(LOCDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
+	install -D -m644 $< $@
+
+.PHONY: i18n
+i18n: $(I18Nmo) $(I18Npot)
 
-i18n: $(I18Nmsgs)
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
+$(SOFILE): $(CLIENTOBJS) $(COMMONOBJS) ../tools/sockettools.a
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $^ -o $@
 
-%.so: 
-	$(CXX) $(CXXFLAGS) -shared $^ -o $@
-	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
 
-dist: clean
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@mkdir $(TMPDIR)/$(ARCHIVE)
-	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz --exclude CVS -C $(TMPDIR) $(ARCHIVE)
-	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-	@echo Distribution package created as $(PACKAGE).tgz
+install: install-lib install-i18n
 
 clean:
-	@-rm -f $(COMMONOBJS) $(CLIENTOBJS) $(DEPFILE) $(PODIR)/*.mo $(PODIR)/*.pot *.so *.tgz core* *~
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(COMMONOBJS) $(CLIENTOBJS) $(DEPFILE) *.so *.tgz core* *~