[svn] assuan - r363 - trunk/src

[svn author wk]

Author: wk
Date: 2010-03-22 13:33:12 +0100 (Mon, 22 Mar 2010)
New Revision: 363

Added:
   trunk/src/w32ce-add.h
Modified:
   trunk/src/ChangeLog
   trunk/src/Makefile.am
   trunk/src/mkheader.c
Log:
Do not distribute assuan.h.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2010-03-22 12:16:18 UTC (rev 362)
+++ trunk/src/ChangeLog	2010-03-22 12:33:12 UTC (rev 363)
@@ -1,6 +1,7 @@
 2010-03-22  Werner Koch  <wk at g10code.com>
 
 	* Makefile.am (mkheader, assuan.h): Build header file.
+	(nodist_libassuan_la_SOURCES): New.  Use it for assuan.h.
 	* mkheader.c: New.
 	* assuan.h: Rename to assuan.h.in.
 

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2010-03-22 12:16:18 UTC (rev 362)
+++ trunk/src/Makefile.am	2010-03-22 12:33:12 UTC (rev 363)
@@ -29,7 +29,7 @@
 lib_LTLIBRARIES += libgpgcedev.la
 bin_PROGRAMS = gpgcemgr
 endif
-include_HEADERS = assuan.h
+nodist_include_HEADERS = assuan.h
 
 if HAVE_LD_VERSION_SCRIPT
 libassuan_version_script_cmd = -Wl,--version-script=$(srcdir)/libassuan.vers
@@ -42,7 +42,7 @@
 BUILT_SOURCES = assuan.h
 
 common_sources = \
-	assuan.h.in assuan.h w32ce-add.h \
+	assuan.h.in w32ce-add.h \
 	assuan-defs.h \
 	assuan.c context.c system.c \
 	debug.c debug.h conversion.c sysutils.c \
@@ -109,6 +109,7 @@
 
 
 libassuan_la_SOURCES = $(common_sources) assuan-io.c
+nodist_libassuan_la_SOURCES = assuan.h
 libassuan_la_CPPFLAGS = $(AM_CPPFLAGS) @GPG_ERROR_CFLAGS@
 libassuan_la_LDFLAGS = $(libassuan_res_ldflag) $(no_undefined) \
 	$(export_symbols) $(libassuan_version_script_cmd) -version-info \

Modified: trunk/src/mkheader.c
===================================================================
--- trunk/src/mkheader.c	2010-03-22 12:16:18 UTC (rev 362)
+++ trunk/src/mkheader.c	2010-03-22 12:33:12 UTC (rev 363)
@@ -53,7 +53,9 @@
 
   while (fgets (line, LINESIZE, fp))
     {
-      if (line[0] != '#' && line[1] != '#')
+      if (line[0] == '#' && line[1] == '#')
+        ;
+      else
         fputs (line, stdout);
     }
   if (ferror (fp))

Added: trunk/src/w32ce-add.h
===================================================================
--- trunk/src/w32ce-add.h	                        (rev 0)
+++ trunk/src/w32ce-add.h	2010-03-22 12:33:12 UTC (rev 363)
@@ -0,0 +1,28 @@
+## w32ce-add.h - Include fragment to build assuan.h.
+## Copyright (C) 2010  Free Software Foundation, Inc.
+##
+## This file is part of Assuan.
+##
+## Assuan is free software; you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as
+## published by the Free Software Foundation; either version 2.1 of
+## the License, or (at your option) any later version.
+##
+## Assuan is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+## Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public
+## License along with this program; if not, see <http://www.gnu.org/licenses/>.
+##
+##
+## This file is included by the mkheader tool.  Lines starting with
+## a double hash mark are not copied to the destination file.
+
+HANDLE _assuan_w32ce_prepare_pipe (int *r_rvid, int write_end);
+HANDLE _assuan_w32ce_finish_pipe (int rvid, int write_end);
+DWORD _assuan_w32ce_create_pipe (HANDLE *read_hd, HANDLE *write_hd,
+                                 LPSECURITY_ATTRIBUTES sec_attr, DWORD size);
+#define CreatePipe(a,b,c,d) _assuan_w32ce_create_pipe ((a),(b),(c),(d))
+