VDR 1.7.35+ compatible Makefile (tested on 1.7.41)

VDR 1.6.0 is not supported anymore

3 files changed, 57 insertions, 71 deletions

diff --git a/Makefile b/Makefile
index 00d2423..133ae68 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,7 @@
 # prefix for non-VDR stuff
 PREFIX ?= /usr/local
-# VDR directory
-VDRDIR ?= /usr/src/vdr-1.6.0
-# VDR's library directory
-VDRPLUGINDIR ?= $(VDRDIR)/PLUGINS/lib
 # VDR's plugin conf directory
 VDRPLUGINCONFDIR ?= /video/plugins
-# VDR's locale directory
-VDRLOCALEDIR ?= $(VDRDIR)/locale
 
 VERSION := $(shell grep VERSION src/libwebvi/webvi/version.py | cut -d \' -f 2)
 
@@ -15,18 +9,15 @@ TMPDIR = /tmp
 ARCHIVE = webvideo-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
-APIVERSION := $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h 2> /dev/null)
-LIBDIR = $(VDRPLUGINDIR)
+# The following two commented lines cause the main VDR Makefile to
+# consider this as a plugin Makefile:
+#PKGCFG
+#$(LIBDIR)/$^.$(APIVERSION)
 
-# Default target compiles everything but does not install anything.
-all-noinstall: libwebvi vdr-plugin
-
-# This target is used by VDR's make plugins. It compiles everything
-# and installs VDR plugin.
-all: libwebvi vdr-plugin $(LIBDIR)/libvdr-webvideo.so.$(APIVERSION) webvi.conf
+all: libwebvi vdr-plugin
 
 vdr-plugin: libwebvi
-	$(MAKE) -C src/vdr-plugin LOCALEDIR=./locale LIBDIR=. VDRDIR=$(VDRDIR) CXXFLAGS="-fPIC -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses $(CXXFLAGS)"
+	$(MAKE) -C src/vdr-plugin
 
 libwebvi: build-python
 	$(MAKE) -C src/libwebvi all libwebvi.a
@@ -37,20 +28,8 @@ build-python: webvi.conf
 webvi.conf webvi.plugin.conf: %.conf: examples/%.conf
 	sed 's_templatepath = /usr/local/share/webvi/templates_templatepath = $(PREFIX)/share/webvi/templates_g' < $< > $@
 
-$(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION): vdr-plugin
-ifeq ($(APIVERSION),)
-	@echo "No APIVERSION in $(VDRDIR)/config.h"
-	@exit 1
-else
-	mkdir -p $(DESTDIR)$(VDRPLUGINDIR)
-	cp -f src/vdr-plugin/libvdr-webvideo.so.$(APIVERSION) $(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION)
-endif
-
-install-vdr-plugin: $(DESTDIR)$(VDRPLUGINDIR)/libvdr-webvideo.so.$(APIVERSION)
-	mkdir -p $(DESTDIR)$(VDRLOCALEDIR)
-	cp -rf src/vdr-plugin/locale/* $(DESTDIR)$(VDRLOCALEDIR)
-	mkdir -p $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo
-	cp -f src/vdr-plugin/mime.types $(DESTDIR)$(VDRPLUGINCONFDIR)/webvideo
+install-vdr-plugin:
+	$(MAKE) -C src/vdr-plugin install
 
 install-libwebvi: libwebvi
 	$(MAKE) -C src/libwebvi install
diff --git a/debian/rules b/debian/rules
index 01c7339..e6b79b6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,8 +11,8 @@ include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/makefile.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
-DEB_MAKE_BUILD_TARGET := all-noinstall VDRDIR=/usr/include/vdr
-DEB_MAKE_INSTALL_TARGET := install-vdr-plugin install-python DESTDIR=$(CURDIR)/debian/tmp/ PREFIX=/usr VDRDIR=/usr/include/vdr VDRPLUGINDIR=/usr/lib/vdr/plugins VDRLOCALEDIR=/usr/share/locale VDRPLUGINCONFDIR=/var/lib/vdr/plugins
+DEB_MAKE_BUILD_TARGET := all
+DEB_MAKE_INSTALL_TARGET := install DESTDIR=$(CURDIR)/debian/tmp/ PREFIX=/usr VDRPLUGINCONFDIR=/var/lib/vdr/plugins
 DEB_MAKE_CHECK_TARGET =
 
 DEB_INSTALL_CHANGELOGS_ALL = HISTORY
diff --git a/src/vdr-plugin/Makefile b/src/vdr-plugin/Makefile
index af63761..ffdb1b2 100644
--- a/src/vdr-plugin/Makefile
+++ b/src/vdr-plugin/Makefile
@@ -6,53 +6,54 @@
 # 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.
-# IMPORTANT: the presence of this macro is important for the Make.config
-# file. So it must be defined, even if it is not used here!
-#
+
 PLUGIN = webvideo
 
 ### The version number of this plugin (taken from the main source file):
 
 VERSION = $(shell grep 'const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$5 }' | sed -e 's/[";]//g')
 
-### The C++ compiler and options:
-
-CXX      ?= g++
-CXXFLAGS ?= -g -O2 -Wall -Woverloaded-virtual -Wno-parentheses
-
 ### The directory environment:
 
-VDRDIR = ../../../../..
-LIBDIR = ../../../../lib
-TMPDIR = /tmp
-
-### Libraries
+# 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
 
-LIBS = `xml2-config --libs` -L../libwebvi -lwebvi
+### The compiler options:
 
-### Make sure that necessary options are included:
+override CFLAGS   += $(call PKGCFG,cflags) `xml2-config --cflags`
+override CXXFLAGS += $(call PKGCFG,cxxflags) `xml2-config --cflags`
+override LDFLAGS  += `xml2-config --libs` -L../libwebvi -lwebvi
 
--include $(VDRDIR)/Make.global
+export CFLAGS
+export CXXFLAGS
 
-### Allow user defined options to overwrite defaults:
+### The version number of VDR's plugin API:
 
--include $(VDRDIR)/Make.config
+APIVERSION = $(call PKGCFG,apiversion)
 
-### The version number of VDR's plugin API (taken from VDR's "config.h"):
+### Allow user defined options to overwrite defaults:
 
-APIVERSION = $(shell sed -ne '/define APIVERSION/s/^.*"\(.*\)".*$$/\1/p' $(VDRDIR)/config.h)
+-include $(PLGCFG)
 
 ### The name of the distribution archive:
 
 ARCHIVE = $(PLUGIN)-$(VERSION)
 PACKAGE = vdr-$(ARCHIVE)
 
+### The name of the shared object file:
+
+SOFILE = libvdr-$(PLUGIN).so
+
 ### Includes and Defines (add further entries here):
 
-LIBWEBVIINCPATH = ../libwebvi
-INCLUDES += -I$(VDRDIR)/include $(LIBWEBVIINCLUDES) -I$(LIBWEBVIINCPATH) `xml2-config --cflags`
+INCLUDES += -I../libwebvi
 
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
 
 ### The object files (add further files here):
 
@@ -60,60 +61,66 @@ OBJS = $(PLUGIN).o buffer.o common.o config.o download.o history.o menu.o menuda
 
 ### The main target:
 
-all: libvdr-$(PLUGIN).so i18n
+all: $(SOFILE) i18n
 
 ### Implicit rules:
 
 %.o: %.c
-	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
 
 ### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
 $(DEPFILE): Makefile
-	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+	@$(MAKEDEP) $(CXXFLAGS) $(DEFINES) $(INCLUDES) $(OBJS:%.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): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<see README>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -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: $(I18Nmsgs) $(I18Npot)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
 
 ### Targets:
 
-libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
-	cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
+$(SOFILE): $(OBJS)
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+install-lib: $(SOFILE)
+	install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
+
+install: install-lib install-i18n
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
-	@tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE)
+	@tar czf $(PACKAGE).tgz -C $(TMPDIR) --exclude debian --exclude CVS --exclude .svn $(ARCHIVE)
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(OBJS) $(DEPFILE) *.so *.so.* *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.so.* *.tgz core* *~