Run xgettext on the .h and not the .ui

Tweack the rules in po/. Not perfect you can't run make update-po (and
so make dist) if your builddir isn't a subdir of srcdir. And of course
it still putting te .gmo in srcdir

diff --git a/po/Makevars b/po/Makevars
index 47814770c0503f0212c2895ee0cdfcd1667f8a4b..1dbb57e36cb085584bc05f951c5f9c1d6a152168 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -1,5 +1,7 @@
 # Makefile variables for PO directory in any package using GNU gettext.
 
+VPATH += ../modules/gui ../modules/gui/qt4 ../modules/gui/qt4/ui
+
 # Usually the message domain is the same as the package name.
 DOMAIN = $(PACKAGE)
 
@@ -8,7 +10,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=_NS --keyword=_ANS --keyword=qtr --language=C++
+XGETTEXT_OPTIONS = --directory=.. --keyword=_ --keyword=N_ --keyword=_NS --keyword=_ANS --keyword=qtr --keyword=Q_ --language=C++
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 740c28bd302ea20dc20d5c33a77b56b7ad86cdd7..9509a26005724d928bbc284d2b56fd222a0aa85d 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,3 @@
-# automatically created by make update-po
-
 # main sources
 include/mmx.h
 include/vlc_access.h
@@ -737,23 +735,23 @@ modules/gui/qt4/qt4.cpp
 modules/gui/qt4/qt4.hpp
 modules/gui/qt4/recents.cpp
 modules/gui/qt4/recents.hpp
-modules/gui/qt4/ui/equalizer.ui
-modules/gui/qt4/ui/open.ui
-modules/gui/qt4/ui/open_capture.ui
-modules/gui/qt4/ui/open_disk.ui
-modules/gui/qt4/ui/open_file.ui
-modules/gui/qt4/ui/open_net.ui
-modules/gui/qt4/ui/podcast_configuration.ui
-modules/gui/qt4/ui/sout.ui
-modules/gui/qt4/ui/sprefs_audio.ui
-modules/gui/qt4/ui/sprefs_input.ui
-modules/gui/qt4/ui/sprefs_interface.ui
-modules/gui/qt4/ui/sprefs_subtitles.ui
-modules/gui/qt4/ui/sprefs_video.ui
-modules/gui/qt4/ui/streampanel.ui
-modules/gui/qt4/ui/v4l2.ui
-modules/gui/qt4/ui/video_effects.ui
-modules/gui/qt4/ui/vlm.ui
+modules/gui/qt4/ui/equalizer.h
+modules/gui/qt4/ui/open.h
+modules/gui/qt4/ui/open_capture.h
+modules/gui/qt4/ui/open_disk.h
+modules/gui/qt4/ui/open_file.h
+modules/gui/qt4/ui/open_net.h
+modules/gui/qt4/ui/podcast_configuration.h
+modules/gui/qt4/ui/sout.h
+modules/gui/qt4/ui/sprefs_audio.h
+modules/gui/qt4/ui/sprefs_input.h
+modules/gui/qt4/ui/sprefs_interface.h
+modules/gui/qt4/ui/sprefs_subtitles.h
+modules/gui/qt4/ui/sprefs_video.h
+modules/gui/qt4/ui/streampanel.h
+modules/gui/qt4/ui/v4l2.h
+modules/gui/qt4/ui/video_effects.h
+modules/gui/qt4/ui/vlm.h
 modules/gui/qt4/util/customwidgets.cpp
 modules/gui/qt4/util/customwidgets.hpp
 modules/gui/qt4/util/input_slider.cpp