summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2009-10-16 15:13:00 +0200
committerMarcus Brinkmann <mb@g10code.com>2009-10-16 15:13:00 +0200
commitae53ef68549f826e421a72aaeb4718ddcf349a82 (patch)
tree244de8bb9bf003237a7aaa31e29739a34e4994f1
parentReworked the server commands. (diff)
downloadgnupg2-ae53ef68549f826e421a72aaeb4718ddcf349a82.tar.xz
gnupg2-ae53ef68549f826e421a72aaeb4718ddcf349a82.zip
po/
2009-10-16 Marcus Brinkmann <marcus@g10code.com> * POTFILES.in: g10/encode.c was renamed to g10/encrypt.c, and encr-data.c was renamed to decrypt-data.c g13/ 2009-10-16 Marcus Brinkmann <marcus@g10code.com> * Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS). (g13_LDADD): Add $(KSBA_LIBS).
-rw-r--r--g13/ChangeLog5
-rw-r--r--g13/Makefile.am5
-rw-r--r--po/ChangeLog5
-rw-r--r--po/POTFILES.in4
4 files changed, 15 insertions, 4 deletions
diff --git a/g13/ChangeLog b/g13/ChangeLog
index e69de29bb..119ef9b7d 100644
--- a/g13/ChangeLog
+++ b/g13/ChangeLog
@@ -0,0 +1,5 @@
+2009-10-16 Marcus Brinkmann <marcus@g10code.com>
+
+ * Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS).
+ (g13_LDADD): Add $(KSBA_LIBS).
+
diff --git a/g13/Makefile.am b/g13/Makefile.am
index 3143e8a4d..f10f7fd38 100644
--- a/g13/Makefile.am
+++ b/g13/Makefile.am
@@ -24,7 +24,8 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/intl -I$(top_srcdir)/common
include $(top_srcdir)/am/cmacros.am
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS) \
+ $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS)
g13_SOURCES = \
g13.c g13.h \
@@ -41,6 +42,6 @@ g13_SOURCES = \
be-truecrypt.c be-truecrypt.h
g13_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
- $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
+ $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
$(GPG_ERROR_LIBS) $(LIBINTL)
diff --git a/po/ChangeLog b/po/ChangeLog
index 9eceada25..221b5ab53 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2009-10-16 Marcus Brinkmann <marcus@g10code.com>
+
+ * POTFILES.in: g10/encode.c was renamed to g10/encrypt.c, and
+ encr-data.c was renamed to decrypt-data.c
+
2009-09-03 Werner Koch <wk@g10code.com>
* de.po: Translate new strings.
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9248043f5..f31d10993 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -28,8 +28,8 @@ g10/card-util.c
g10/dearmor.c
g10/decrypt.c
g10/delkey.c
-g10/encode.c
-g10/encr-data.c
+g10/encrypt.c
+g10/decrypt-data.c
g10/exec.c
g10/export.c
g10/getkey.c