[GNUnet-SVN] r20344 - in gnunet-ext: . po src/ext

[gnunet]

Author: grothoff
Date: 2012-03-07 16:42:55 +0100 (Wed, 07 Mar 2012)
New Revision: 20344

Added:
   gnunet-ext/po/Makevars
Removed:
   gnunet-ext/po/Makevars.template
Modified:
   gnunet-ext/Makefile.am
   gnunet-ext/po/POTFILES.in
   gnunet-ext/src/ext/Makefile.am
Log:
-fixes

Modified: gnunet-ext/Makefile.am
===================================================================
--- gnunet-ext/Makefile.am      2012-03-07 15:32:41 UTC (rev 20343)
+++ gnunet-ext/Makefile.am      2012-03-07 15:42:55 UTC (rev 20344)
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS = po src
+SUBDIRS = src
 
 EXTRA_DIST = config.rpath  \
   install-sh

Copied: gnunet-ext/po/Makevars (from rev 20343, gnunet-ext/po/Makevars.template)
===================================================================
--- gnunet-ext/po/Makevars                              (rev 0)
+++ gnunet-ext/po/Makevars      2012-03-07 15:42:55 UTC (rev 20344)
@@ -0,0 +1,41 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+
+# 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
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =

Deleted: gnunet-ext/po/Makevars.template
===================================================================
--- gnunet-ext/po/Makevars.template     2012-03-07 15:32:41 UTC (rev 20343)
+++ gnunet-ext/po/Makevars.template     2012-03-07 15:42:55 UTC (rev 20344)
@@ -1,41 +0,0 @@
-# Makefile variables for PO directory in any package using GNU gettext.
-
-# Usually the message domain is the same as the package name.
-DOMAIN = $(PACKAGE)
-
-# These two variables depend on the location of this directory.
-subdir = po
-top_builddir = ..
-
-# These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
-
-# 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
-# package.  (Note that the msgstr strings, extracted from the package's
-# sources, belong to the copyright holder of the package.)  Translators are
-# expected to transfer the copyright for their translations to this person
-# or entity, or to disclaim their copyright.  The empty string stands for
-# the public domain; in this case the translators are expected to disclaim
-# their copyright.
-COPYRIGHT_HOLDER = Free Software Foundation, Inc.
-
-# This is the email address or URL to which the translators shall report
-# bugs in the untranslated strings:
-# - Strings which are not entire sentences, see the maintainer guidelines
-#   in the GNU gettext documentation, section 'Preparing Strings'.
-# - Strings which use unclear terms or require additional context to be
-#   understood.
-# - Strings which make invalid assumptions about notation of date, time or
-#   money.
-# - Pluralisation problems.
-# - Incorrect English spelling.
-# - Incorrect formatting.
-# It can be your email address, or a mailing list address where translators
-# can write to without being subscribed, or the URL of a web page through
-# which the translators can contact you.
-MSGID_BUGS_ADDRESS =
-
-# This is the list of locale categories, beyond LC_MESSAGES, for which the
-# message catalogs shall be used.  It is usually empty.
-EXTRA_LOCALE_CATEGORIES =

Modified: gnunet-ext/po/POTFILES.in
===================================================================
--- gnunet-ext/po/POTFILES.in   2012-03-07 15:32:41 UTC (rev 20343)
+++ gnunet-ext/po/POTFILES.in   2012-03-07 15:42:55 UTC (rev 20344)
@@ -1 +1,2 @@
 # List of source files which contain translatable strings.
+src/ext/gnunet-ext.c

Modified: gnunet-ext/src/ext/Makefile.am
===================================================================
--- gnunet-ext/src/ext/Makefile.am      2012-03-07 15:32:41 UTC (rev 20343)
+++ gnunet-ext/src/ext/Makefile.am      2012-03-07 15:42:55 UTC (rev 20344)
@@ -2,7 +2,8 @@
 
 INCLUDES = \
   -I$(top_srcdir)/src/include \
-  -I$(top_srcdir)
+  -I$(top_srcdir) \
+  @GNUNET_CFLAGS@ 
 
 lib_LTLIBRARIES = libgnunetext.la
 
@@ -11,7 +12,7 @@
 libgnunetext_la_LIBADD = \
   -lgnunetutil
 libgnunetext_la_LDFLAGS = \
-  $(GN_LIB_LDFLAGS)  $(WINFLAGS) \
+  $(GNUNET_LIBS)  $(WINFLAGS) \
   -version-info 0:0:0
 
 
@@ -44,4 +45,3 @@
 test_ext_api_LDADD = \
   $(top_builddir)/src/ext/libgnunetext.la \
   -lgnunetutil
-