summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY6
-rw-r--r--Makefile98
-rw-r--r--po/de_DE.po~192
3 files changed, 61 insertions, 235 deletions
diff --git a/HISTORY b/HISTORY
index aeb69b9..fef243e 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
VDR Plugin 'mousemate' Revision History
---------------------------------------
-2008-05-01: Version 0.1.6
+
+2013-03-22: Version 0.1.7
+- Makefile for VDR 1.7.33+
+
+2008-05-01: Version 0.1.6
- only vdr > 1.5.7 is supported
- added one4all in setup menu
diff --git a/Makefile b/Makefile
index d9c87e7..f70ec41 100644
--- a/Makefile
+++ b/Makefile
@@ -1,114 +1,128 @@
#
# Makefile for a Video Disk Recorder plugin
#
-# MouseMate
# 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 = mousemate
+### Some custom options:
+
+ifdef MOUSEMATE_DEBUG
+DEFINES += -DDEBUG
+endif
+
+ifdef MOUSEMATE_EVENTCODE_SNIFFER
+DEFINES += -DEVENTCODE_SNIFFER
+endif
+
### The version number of this plugin (taken from the main source file):
VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ print $$6 }' | sed -e 's/[";]//g')
-### The C++ compiler and options:
+### The directory environment:
-CXX ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+# 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 directory environment:
+### The compiler options:
-VDRDIR = ../../..
-LIBDIR = ../../lib
-TMPDIR = /tmp
+export CFLAGS = $(call PKGCFG,cflags)
+export CXXFLAGS = $(call PKGCFG,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):
-INCLUDES += -I$(VDRDIR)/include
+INCLUDES +=
-DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
+DEFINES += -DPLUGIN_NAME_I18N='"$(PLUGIN)"'
### The object files (add further files here):
-OBJS = mousemate.o MouseMateMonitor.o MouseMate.o setup.o ButtonObserver.o
-
-ifdef MOUSEMATE_DEBUG
-DEFINES += -DDEBUG
-endif
+OBJS = $(PLUGIN).o MouseMateMonitor.o MouseMate.o setup.o ButtonObserver.o
-ifdef MOUSEMATE_EVENTCODE_SNIFFER
-DEFINES += -DEVENTCODE_SNIFFER
-endif
+### The main target:
+all: $(SOFILE) i18n
### Implicit rules:
%.o: %.c
- $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) -o $@ $<
-# Dependencies:
+### Dependencies:
-MAKEDEP = g++ -MM -MG
+MAKEDEP = $(CXX) -MM -MG
DEPFILE = .dependencies
$(DEPFILE): Makefile
- @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
+ @$(MAKEDEP) $(CPPFLAGS) $(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='<jollyjoe80@yahoo.de>' -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)
+i18n: $(I18Nmo) $(I18Npot)
+
+install-i18n: $(I18Nmsgs)
### Targets:
-all: libvdr-$(PLUGIN).so i18n
+$(SOFILE): $(OBJS)
+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) -o $@
+
+install-lib: $(SOFILE)
+ install -D $^ $(DESTDIR)$(LIBDIR)/$^.$(APIVERSION)
-libvdr-$(PLUGIN).so: $(OBJS)
- $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@
- @cp $@ $(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).tar.gz -C $(TMPDIR) --exclude .gitignore --exclude debian --exclude .git $(ARCHIVE)
@-rm -rf $(TMPDIR)/$(ARCHIVE)
@echo Distribution package created as $(PACKAGE).tgz
diff --git a/po/de_DE.po~ b/po/de_DE.po~
deleted file mode 100644
index 12a6c56..0000000
--- a/po/de_DE.po~
+++ /dev/null
@@ -1,192 +0,0 @@
-# VDR plugin language source file.
-# Copyright (C) 2007 Klaus Schmidinger <kls@cadsoft.de>
-# This file is distributed under the same license as the VDR package.
-# Klaus Schmidinger <kls@cadsoft.de>, 2000
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: VDR 1.5.7\n"
-"Report-Msgid-Bugs-To: <jollyjoe80@yahoo.de>\n"
-"POT-Creation-Date: 2008-05-01 18:22+0200\n"
-"PO-Revision-Date: 2008-02-10 18:28+0100\n"
-"Last-Translator: Klaus Schmidinger <kls@cadsoft.de>\n"
-"Language-Team: <vdr@linuxtv.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-msgid "Controls VDR via a mouse"
-msgstr "Bedient VDR mit einer Maus"
-
-msgid "Sensitivity wheel"
-msgstr "Sensitivität Rad"
-
-msgid "Double click time (ms)"
-msgstr "Doppelklick Zeit (ms)"
-
-msgid "Alternative key binding"
-msgstr "Alternative Tastenzuordnung"
-
-msgid "no"
-msgstr "nein"
-
-msgid "yes"
-msgstr "ja"
-
-msgid "Toggle click time (ms)"
-msgstr "Umschaltklick Zeit (ms)"
-
-msgid "Show toggle with scroll lock led"
-msgstr "Umschalten mit Scroll-Lock LED zeigen"
-
-msgid "Toggle automatic off"
-msgstr "Umschalten automatisch aus"
-
-msgid "Toggle off time (ms)"
-msgstr "Umschalten aus nach Zeit (ms)"
-
-msgid "Extra pushed turn events"
-msgstr "Extra gedrückte Dreh-Events"
-
-msgid "Extra x,y turn events"
-msgstr "Extra x,y Dreh-Events"
-
-msgid "Sensitivity x"
-msgstr "Sensitivität x"
-
-msgid "Sensitivity y"
-msgstr "Sensitivität y"
-
-msgid "DVD sensitive replay context"
-msgstr "DVD sensitiver Replay Kontext"
-
-msgid "MP3 sensitive replay context"
-msgstr "MP3 sensitiver Replay Kontext"
-
-msgid "CDDA sensitive replay context"
-msgstr "CDDA sensitiver Replay Kontext"
-
-msgid "IMAGE sensitive replay context"
-msgstr "IMAGE sensitiver Replay Kontext"
-
-msgid "Set keys for context"
-msgstr "Setze Tasten für Kontext"
-
-msgid "Turn wheel left"
-msgstr "Rad links drehen"
-
-msgid "Turn wheel right"
-msgstr "Rad rechts drehen"
-
-msgid "Turn x axis left"
-msgstr "X Achse links drehen"
-
-msgid "Turn x axis right"
-msgstr "X Achse rechts drehen"
-
-msgid "Turn y axis left"
-msgstr "Y Achse links drehen"
-
-msgid "Turn y axis right"
-msgstr "Y Achse rechts drehen"
-
-msgid "Left click"
-msgstr "Klick links"
-
-msgid "Left double-click"
-msgstr "Doppelklick links"
-
-msgid "Middle click"
-msgstr "Klick mitte"
-
-msgid "Middle double-click"
-msgstr "Doppelklick mitte"
-
-msgid "Middle pushed turn left"
-msgstr "Mitte gedrückt links drehen"
-
-msgid "Middle pushed turn right"
-msgstr "Mitte gedrückt rechts drehen"
-
-msgid "Right click"
-msgstr "Klick rechts"
-
-msgid "Right double-click"
-msgstr "Doppelklick rechts"
-
-msgid "Side click"
-msgstr "Klick seite"
-
-msgid "Side double-click"
-msgstr "Doppelklick seite"
-
-msgid "Extra click"
-msgstr "Klick extra"
-
-msgid "Extra double-click"
-msgstr "Doppelklick extra"
-
-msgid "Forward click"
-msgstr "Klick vorwärts"
-
-msgid "Forward double-click"
-msgstr "Doppelklick vorwärts"
-
-msgid "Back click"
-msgstr "Klick zurück"
-
-msgid "Back double-click"
-msgstr "Doppelklick zurück"
-
-msgid "Task click"
-msgstr "Klick task"
-
-msgid "Task double-click"
-msgstr "Doppelklick Task"
-
-msgid "Left pushed turn left"
-msgstr "Links gedrückt links drehen"
-
-msgid "Left pushed turn right"
-msgstr "Links gedrückt rechts drehen"
-
-msgid "Right pushed turn left"
-msgstr "Rechts gedrückt links drehen"
-
-msgid "Right pushed turn right"
-msgstr "Rechts gedrückt rechts drehen"
-
-msgid "Side pushed turn left"
-msgstr "Seite gedrückt links drehen"
-
-msgid "Side pushed turn right"
-msgstr "Seite gedrückt rechts drehen"
-
-msgid "Extra pushed turn left"
-msgstr "Extra gedrückt links drehen"
-
-msgid "Extra pushed turn right"
-msgstr "Extra gedrückt rechts drehen"
-
-msgid "Forward pushed turn left"
-msgstr "Vorwärts gedrückt links drehen"
-
-msgid "Forward pushed turn right"
-msgstr "Vorwärts gedrückt rechts drehen"
-
-msgid "Back pushed turn left"
-msgstr "Zurück gedrückt links drehen"
-
-msgid "Back pushed turn right"
-msgstr "Zurück gedrückt rechts drehen"
-
-msgid "Task pushed turn left"
-msgstr "Task gedrückt links drehen"
-
-msgid "Task pushed turn right"
-msgstr "Task gedrückt rechts drehen"
-
-msgid "Set current key binding for all contexts?"
-msgstr "Aktuelle Tastenzuordnung für alle Kontexte setzen?"
-
-