diff options
| -rw-r--r-- | src/ChangeLog | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/mkheader.c | 4 | ||||
| -rw-r--r-- | src/w32ce-add.h | 28 |
4 files changed, 35 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6034272..d8b1521 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,6 +1,7 @@ 2010-03-22 Werner Koch <[email protected]> * 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. diff --git a/src/Makefile.am b/src/Makefile.am index 6723648..d28d2a2 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,7 +29,7 @@ if HAVE_W32CE_SYSTEM 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 @@ CLEANFILES = mkheader assuan.h 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 @@ endif 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 \ diff --git a/src/mkheader.c b/src/mkheader.c index 22cdc94..3a99408 100644 --- a/src/mkheader.c +++ b/src/mkheader.c @@ -53,7 +53,9 @@ include_file (const char *fname, int lnr, const char *name) while (fgets (line, LINESIZE, fp)) { - if (line[0] != '#' && line[1] != '#') + if (line[0] == '#' && line[1] == '#') + ; + else fputs (line, stdout); } if (ferror (fp)) diff --git a/src/w32ce-add.h b/src/w32ce-add.h new file mode 100644 index 0000000..76ce141 --- /dev/null +++ b/src/w32ce-add.h @@ -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)) + |