Updated makefile.

5 files changed, 31 insertions, 27 deletions

diff --git a/HISTORY b/HISTORY
index c8a6fa4..0c0be8a 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,9 @@
 VDR Plugin 'useractivity' Revision History
 ------------------------------------------
 
+2011-07-16: Version 0.1.1
+- Updated Makefile
+
 2009-03-13: Version 0.1.0
 
 - Italian translations by Diego Pierotto
diff --git a/Makefile b/Makefile
index 0e684b7..e95c8d9 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 # 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.
-# IPORTANT: the presence of this macro is important for the Make.config
+# 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 = useractivity
@@ -32,7 +32,7 @@ VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).c | awk '{ pri
 ### The C++ compiler and options:
 
 CXX      ?= g++
-CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual
+CXXFLAGS ?= -g -O3 -Wall -Woverloaded-virtual -Wno-parentheses
 
 ### The directory environment:
 
@@ -40,6 +40,10 @@ VDRDIR = ../../..
 LIBDIR = ../../lib
 TMPDIR = /tmp
 
+### Make sure that necessary options are included:
+
+include $(VDRDIR)/Make.global
+
 ### Allow user defined options to overwrite defaults:
 
 -include $(VDRDIR)/Make.config
@@ -73,16 +77,20 @@ ifeq ($(USERACTIVITY_XSS), 1)
   LIBS = -lX11 -lXss
 endif
 
+### The main target:
+
+all: libvdr-$(PLUGIN).so i18n
+
 ### Implicit rules:
 
 %.o: %.c
 	$(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $<
 
-# Dependencies:
+### Dependencies:
 
 MAKEDEP = $(CXX) -MM -MG
 DEPFILE = .dependencies
-$(DEPFILE): Makefile i18n.c
+$(DEPFILE): Makefile
 	@$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@
 
 -include $(DEPFILE)
@@ -99,14 +107,14 @@ I18Npot   = $(PODIR)/$(PLUGIN).pot
 	msgfmt -c -o $@ $<
 
 $(I18Npot): $(wildcard *.c)
-	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --msgid-bugs-address='<timo@tolleri.net>' -o $@ $^
+	xgettext -C -cTRANSLATORS --no-wrap --no-location -k -ktr -ktrNOOP --package-name=vdr-$(PLUGIN) --package-version=$(VERSION) --msgid-bugs-address='<see README>' -o $@ $^
 
 %.po: $(I18Npot)
 	msgmerge -U --no-wrap --no-location --backup=none -q $@ $<
 	@touch $@
 
 $(I18Nmsgs): $(LOCALEDIR)/%/LC_MESSAGES/vdr-$(PLUGIN).mo: $(PODIR)/%.mo
-	@mkdir -p $(dir \$@)
+	@mkdir -p $(dir $@)
 	cp $< $@
 
 .PHONY: i18n
@@ -114,13 +122,11 @@ i18n: $(I18Nmsgs) $(I18Npot)
 
 ### Targets:
 
-all: libvdr-$(PLUGIN).so i18n
-
 libvdr-$(PLUGIN).so: $(OBJS)
-	$(CXX) $(CXXFLAGS) -shared $(OBJS) $(LIBS) -o $@
+	$(CXX) $(CXXFLAGS) $(LDFLAGS) -shared $(OBJS) $(LIBS) -o $@
 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
 
-dist: clean
+dist: $(I18Npo) clean
 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
 	@mkdir $(TMPDIR)/$(ARCHIVE)
 	@cp -a * $(TMPDIR)/$(ARCHIVE)
@@ -129,5 +135,4 @@ dist: clean
 	@echo Distribution package created as $(PACKAGE).tgz
 
 clean:
-	@-rm -f $(PODIR)/*.mo $(PODIR)/*.pot
-	@-rm -f $(OBJS) $(DEPFILE) i18n.c *.so *.tgz core* *~
+	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
diff --git a/po/fi_FI.po b/po/fi_FI.po
index 5f25832..f801be5 100644
--- a/po/fi_FI.po
+++ b/po/fi_FI.po
@@ -1,19 +1,17 @@
-# 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.
-# Hannu Savolainen <hannu@opensound.com>, 2002
-# Jaakko Hyvätti <jaakko@hyvatti.iki.fi>, 2002
-# Niko Tarnanen <niko.tarnanen@hut.fi>, 2003
-# Rolf Ahrenberg <rahrenbe@cc.hut.fi>, 2003
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Timo Eskola <timo@tolleri.net>, 2007.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-useractivity 0.1.0\n"
-"Report-Msgid-Bugs-To: <timo@tolleri.net>\n"
-"POT-Creation-Date: 2009-03-13 09:20+0200\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2011-06-02 21:32+0300\n"
 "PO-Revision-Date: 2007-08-19 22:15+0300\n"
 "Last-Translator: Timo Eskola <timo@tolleri.net>\n"
 "Language-Team: <vdr@linuxtv.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/it_IT.po b/po/it_IT.po
index 7f54f0b..f5703cf 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -8,11 +8,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: vdr-useractivity 0.1.0\n"
-"Report-Msgid-Bugs-To: <timo@tolleri.net>\n"
-"POT-Creation-Date: 2007-08-19 22:20+0300\n"
+"Report-Msgid-Bugs-To: <see README>\n"
+"POT-Creation-Date: 2011-06-02 21:32+0300\n"
 "PO-Revision-Date: 2009-02-10 23:28+0100\n"
 "Last-Translator: Diego Pierotto <vdr-italian@tiscali.it>\n"
 "Language-Team:  <vdr@linuxtv.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,14 +21,11 @@ msgstr ""
 "X-Poedit-Country: ITALY\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: useractivity.c:14
 msgid "Prevents shutdown if there are active users"
 msgstr "Previene lo spegnimento se esistono utenti attivi"
 
-#: useractivity.c:16
 msgid "Active users"
 msgstr "Utenti attivi"
 
-#: useractivity.c:103
 msgid "There are active users in the system"
 msgstr "Esistono utenti attivi nel sistema"
diff --git a/useractivity.c b/useractivity.c
index 00eb352..48bd077 100644
--- a/useractivity.c
+++ b/useractivity.c
@@ -13,7 +13,7 @@
 #error "VDR-1.6.0 API version or greater is required!"
 #endif
 
-static const char *VERSION        = "0.1.0";
+static const char *VERSION        = "0.1.1";
 static const char *DESCRIPTION    = trNOOP("Prevents shutdown if there are active users");
 #if 0
 static const char *MAINMENUENTRY  = trNOOP("Active users");