More for WindowsCE support removal.

* src/Makefile.am: Clean up.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>

1 files changed, 9 insertions, 18 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index b8334a4..7e82d26 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -24,9 +24,6 @@
 # depend on the configuration anyway.
 #
 
-gpg_extra_headers =
-extra_cppflags =
-
 localedir = $(datadir)/locale
 
 bin_PROGRAMS = gpg-error
@@ -101,14 +98,14 @@ EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \
 BUILT_SOURCES = $(srcdir)/err-sources.h $(srcdir)/err-codes.h \
 	code-to-errno.h code-from-errno.h \
 	err-sources-sym.h err-codes-sym.h errnos-sym.h gpg-error.h gpgrt.h \
-	gpg-error.def mkw32errmap.map.c
+	gpg-error.def
 
-tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h mkw32errmap.map.c
+tmp_files = _mkerrcodes.h _gpg-error.def.h mkw32errmap.tab.h
 
 CLEANFILES = code-to-errno.h code-from-errno.h \
 	gpg-error.h gpgrt.h \
         mkerrcodes$(EXEEXT_FOR_BUILD) mkerrcodes.h gpg-error.def mkw32errmap.tab.h \
-	mkw32errmap.map.c err-sources-sym.h err-codes-sym.h errnos-sym.h \
+	err-sources-sym.h err-codes-sym.h errnos-sym.h \
 	gpg-extra/errno.h mkheader$(EXEEXT_FOR_BUILD) \
 	gpgrt-config gpg-error-config-old gpg-error-config-test.sh \
 	gpg-error-config gpg-error-config-test.log \
@@ -125,7 +122,7 @@ if HAVE_W32_SYSTEM
 arch_sources = w32-gettext.c w32-lock.c w32-lock-obj.h w32-thread.c \
 	       w32-iconv.c w32-estream.c w32-reg.c spawn-w32.c
 RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
-            -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS)
+            $(libgpg_error_la_CPPFLAGS) $(AM_CPPFLAGS) $(CPPFLAGS)
 LTRCCOMPILE = $(LIBTOOL) --mode=compile --tag=RC $(RCCOMPILE)
 
 SUFFIXES = .rc .lo
@@ -206,15 +203,12 @@ nodist_libgpg_error_la_SOURCES = gpg-error.h
 # libgpg_error_la_DEPENDENCIES = \
 #        $(srcdir)/gpg-error.vers
 
-# Note that RCCOMPILE needs the same defines as ..._la_CPPFLAGS but
-# without the extra_cppflags because they may include am -idirafter
-# which is not supported by the RC compiler.
-libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
+libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\"
 libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) $(socklibs) $(LIBTHREAD)
 
 gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c
 gpg_error_CPPFLAGS = -DPKGDATADIR=\"$(pkgdatadir)\" \
-                     -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags)
+                     -DLOCALEDIR=\"$(localedir)\"
 gpg_error_LDADD = libgpg-error.la $(LTLIBINTL)
 
 # We build err-sources.h and err-codes.h in the source directory.
@@ -242,20 +236,17 @@ code-to-errno.h: Makefile mkerrnos.awk errnos.in
 	$(AWK) -f $(srcdir)/mkerrnos.awk $(srcdir)/errnos.in >$@
 
 # It is correct to use $(CPP).  We want the host's idea of the error codes.
-mkerrcodes.h: Makefile mkerrcodes.awk $(gpg_extra_headers)
+mkerrcodes.h: Makefile mkerrcodes.awk
 	$(AWK) -f $(srcdir)/mkerrcodes1.awk $(srcdir)/errnos.in >_$@
-	$(CPP) $(CPPFLAGS) $(extra_cppflags) -P _$@ | grep GPG_ERR_ | \
+	$(CPP) $(CPPFLAGS) -P _$@ | grep GPG_ERR_ | \
                $(AWK) -f $(srcdir)/mkerrcodes.awk >$@
 	-rm _$@
 
-mkw32errmap.map.c:
-	echo "/*dummy*/" > $@
-
 # We use CC proper for preprocessing thus we have to convince it that
 # the data is really to be preprocessed.
 gpg-error.def: Makefile gpg-error.def.in
 	cat $(srcdir)/gpg-error.def.in >_$@.h
-	$(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) $(extra_cppflags) _$@.h | \
+	$(CPP) $(DEFAULT_INCLUDES) $(INCLUDES) _$@.h | \
 	  grep -v '^#' >$@
 	-rm _$@.h