aboutsummaryrefslogtreecommitdiffstats
path: root/src/Makefile.am
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2010-05-12 17:21:36 +0000
committerMarcus Brinkmann <[email protected]>2010-05-12 17:21:36 +0000
commitca3e5c63b9c170a1d8e7705ed1343310b92a9bab (patch)
treebbbfcb5b8f772b62c6d2bce7e369eba5e639aeb4 /src/Makefile.am
parent2010-05-12 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-ca3e5c63b9c170a1d8e7705ed1343310b92a9bab.tar.gz
gpgme-ca3e5c63b9c170a1d8e7705ed1343310b92a9bab.zip
2010-05-12 Marcus Brinkmann <[email protected]>
* Makefile.am (system_components): Remove custom cppflags from RCCOMPILE (because gpg-error adds -idirafter that makes RC bail. [HAVE_W32CE_SYSTEM]: Add w32-ce.h and w32-ce.c, clear libexec_PROGRAMS. * w32-ce.h, w32-ce.c: New files.
Diffstat (limited to 'src/Makefile.am')
-rw-r--r--src/Makefile.am13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index 1ecb7610..e557c7bb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,6 +68,10 @@ system_components = ath.h posix-util.c posix-sema.c posix-io.c
system_components_not_extra =
endif
+if HAVE_W32CE_SYSTEM
+system_components += w32-ce.h w32-ce.c
+endif
+
if HAVE_GPGSM
gpgsm_components = engine-gpgsm.c
else
@@ -155,14 +159,17 @@ AM_CPPFLAGS = @GPG_ERROR_CFLAGS@ @PTH_CPPFLAGS@ \
AM_CFLAGS = @LIBASSUAN_CFLAGS@ @PTH_CFLAGS@ @GLIB_CFLAGS@ @QT4_CORE_CFLAGS@
if HAVE_W32_SYSTEM
-
# Windows provides us with an endless stream of Tough Love. To spawn
# processes with a controlled set of inherited handles, we need a
# wrapper process.
+# Except on Windows CE. There nothing is inheritable anyway.
+if HAVE_W32CE_SYSTEM
+libexec_PROGRAMS =
+else
libexec_PROGRAMS = gpgme-w32spawn
+endif
-RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
- $(AM_CPPFLAGS) $(CPPFLAGS)
+RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES)
LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
SUFFIXES = .rc .lo