diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-19 14:24:27 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-19 14:24:27 +0100 |
| commit | d2774e48780a6350b7435b5975397e0234e300bf (patch) | |
| tree | 6b28f20b0c2b39422c92caaac71b936fca7989f6 /po | |
| parent | 15eb883def371a660ee8c9e8f47edb164d0a7feb (diff) | |
| parent | 048c41a4661a6fffc5a4842390902493eea82168 (diff) | |
| download | xine-lib-d2774e48780a6350b7435b5975397e0234e300bf.tar.gz xine-lib-d2774e48780a6350b7435b5975397e0234e300bf.tar.bz2 | |
Merge from 1.1, dropping the channels.conf patch for XDG-related reasons.
--HG--
rename : m4/_xine.m4 => m4/types.m4
rename : po/libxine1.pot => po/libxine2.pot
Diffstat (limited to 'po')
| -rw-r--r-- | po/Makefile.in.in | 6 | ||||
| -rw-r--r-- | po/Makevars | 30 | ||||
| -rw-r--r-- | po/Makevars.extra.in | 4 |
3 files changed, 34 insertions, 6 deletions
diff --git a/po/Makefile.in.in b/po/Makefile.in.in index f59b1c08b..5022b8b18 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -10,10 +10,7 @@ # # Origin: gettext-0.16 -include @srcdir@/Makefile.format - PACKAGE = @PACKAGE@ -LIBNAME = @LIBNAME@ VERSION = @VERSION@ PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ @@ -68,7 +65,7 @@ POFILES = @POFILES@ GMOFILES = @GMOFILES@ UPDATEPOFILES = @UPDATEPOFILES@ DUMMYPOFILES = @DUMMYPOFILES@ -DISTFILES.common = Makefile.in.in remove-potcdate.sin Makefile.format \ +DISTFILES.common = Makefile.in.in remove-potcdate.sin \ $(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) DISTFILES = $(DISTFILES.common) Makevars POTFILES.in \ $(POFILES) $(GMOFILES) \ @@ -139,7 +136,6 @@ $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ fi; \ $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - $(XGETTEXT_FORMAT_FLAGS) $(XGETTEXT_FORMAT_FLAGS_PRIVATE) \ --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ --files-from=$(srcdir)/POTFILES.in \ --copyright-holder='$(COPYRIGHT_HOLDER)' \ diff --git a/po/Makevars b/po/Makevars index b51ea1918..6c59427c9 100644 --- a/po/Makevars +++ b/po/Makevars @@ -1,5 +1,9 @@ # Makefile variables for PO directory in any package using GNU gettext. +include Makevars.extra + +DISTFILES += Makevars.extra.in + # Usually the message domain is the same as the package name. DOMAIN = $(LIBNAME) @@ -7,8 +11,29 @@ DOMAIN = $(LIBNAME) subdir = po top_builddir = .. +# Internal usage +XGETTEXT_FORMAT_FLAGS_PRIVATE = \ + --flag=xine_log_msg:1:c-format \ + --flag=xine_log_err:1:c-format \ + --flag=set_hc_result:3:c-format \ + --flag=log_printf:1:c-format \ + --flag=error_message:1:c-format \ + --flag=error_callback:5:c-format \ + --flag=dbgprintf:1:c-format \ + --flag=dbg_printf:1:c-format \ + --flag=sock_string_write:3:c-format \ + --flag=broadcaster_string_write:3:c-format \ + --flag=scratch_printf:3:c-format + +# External usage (installed include files) +XGETTEXT_FORMAT_FLAGS = \ + --flag=xine_log:3:c-format \ + --flag=xine_vlog:3:c-format + # These options get passed to xgettext. -XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 +XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8 \ + $(XGETTEXT_FORMAT_FLAGS_PRIVATE) \ + $(XGETTEXT_FORMAT_FLAGS) # 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 @@ -40,3 +65,6 @@ MSGID_BUGS_ADDRESS = xine-devel@lists.sourceforge.net # message catalogs shall be used. It is usually empty. EXTRA_LOCALE_CATEGORIES = +debug: +install-debug: + diff --git a/po/Makevars.extra.in b/po/Makevars.extra.in new file mode 100644 index 000000000..6a0d10ba6 --- /dev/null +++ b/po/Makevars.extra.in @@ -0,0 +1,4 @@ +# Extra file just to get LIBNAME correctly. +# Unfortunate but it's the only way to avoid changing po/Makefile.in.in + +LIBNAME = @LIBNAME@ |