[svn] GnuPG - r5179 - in trunk: g13 po

[svn author marcus]

Author: marcus
Date: 2009-10-16 15:13:00 +0200 (Fri, 16 Oct 2009)
New Revision: 5179

Modified:
   trunk/g13/ChangeLog
   trunk/g13/Makefile.am
   trunk/po/ChangeLog
   trunk/po/POTFILES.in
Log:
po/
2009-10-16  Marcus Brinkmann  <marcus at 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 at g10code.com>

	* Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS).
	(g13_LDADD): Add $(KSBA_LIBS).


Modified: trunk/g13/ChangeLog
===================================================================
--- trunk/g13/ChangeLog	2009-10-16 10:56:59 UTC (rev 5178)
+++ trunk/g13/ChangeLog	2009-10-16 13:13:00 UTC (rev 5179)
@@ -0,0 +1,5 @@
+2009-10-16  Marcus Brinkmann  <marcus at g10code.com>
+
+	* Makefile.am (AM_CFLAGS): Add $(KSBA_CFLAGS).
+	(g13_LDADD): Add $(KSBA_LIBS).
+

Modified: trunk/po/ChangeLog
===================================================================
--- trunk/po/ChangeLog	2009-10-16 10:56:59 UTC (rev 5178)
+++ trunk/po/ChangeLog	2009-10-16 13:13:00 UTC (rev 5179)
@@ -1,3 +1,8 @@
+2009-10-16  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* de.po: Translate new strings.

Modified: trunk/g13/Makefile.am
===================================================================
--- trunk/g13/Makefile.am	2009-10-16 10:56:59 UTC (rev 5178)
+++ trunk/g13/Makefile.am	2009-10-16 13:13:00 UTC (rev 5179)
@@ -24,7 +24,8 @@
 
 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 @@
 	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)
 

Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in	2009-10-16 10:56:59 UTC (rev 5178)
+++ trunk/po/POTFILES.in	2009-10-16 13:13:00 UTC (rev 5179)
@@ -28,8 +28,8 @@
 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