diff options
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index d948021..7c5556c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -38,11 +38,10 @@ bin_SCRIPTS = gpg-error-config m4datadir = $(datadir)/aclocal m4data_DATA = gpg-error.m4 - EXTRA_DIST = mkstrtable.awk err-sources.h.in err-codes.h.in \ mkerrnos.awk errnos.in README \ mkerrcodes.awk mkerrcodes1.awk mkerrcodes2.awk mkerrcodes.c \ - mkheader.awk gpg-error.h.in mkw32errmap.c w32ce-add.h \ + mkheader.awk gpg-error.h.in mkw32errmap.c w32-add.h w32ce-add.h \ err-sources.h err-codes.h gpg-error-config.in gpg-error.m4 \ gpg-error.def.in versioninfo.rc.in @@ -58,7 +57,7 @@ CLEANFILES = err-sources.h err-codes.h code-to-errno.h code-from-errno.h \ extra-h.in $(tmp_files) if HAVE_W32_SYSTEM -arch_sources = w32-gettext.h w32-gettext.c +arch_sources = w32-gettext.c RCCOMPILE = $(RC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ -DLOCALEDIR=\"$(localedir)\" $(AM_CPPFLAGS) $(CPPFLAGS) @@ -71,7 +70,7 @@ SUFFIXES = .rc .lo gpg_error_res = versioninfo.lo no_undefined = -no-undefined -export_symbols = -export-symbols $(srcdir)/gpg-error.def +export_symbols = -export-symbols gpg-error.def install-def-file: gpg-error.def $(INSTALL) gpg-error.def $(DESTDIR)$(libdir)/gpg-error.def @@ -100,7 +99,7 @@ libgpg_error_la_LDFLAGS = -version-info \ $(no_undefined) $(export_symbols) libgpg_error_la_SOURCES = gpg-error.h gettext.h $(arch_sources) \ - init.c strsource.c strerror.c code-to-errno.c code-from-errno.c + init.c init.h strsource.c strerror.c code-to-errno.c code-from-errno.c # Note that RCCOMPILE needs the same defines as ..._la_CPPFLAGS but # without the extra_cppflags because they may include am -idirafter @@ -108,7 +107,7 @@ libgpg_error_la_SOURCES = gpg-error.h gettext.h $(arch_sources) \ libgpg_error_la_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags) libgpg_error_la_LIBADD = $(gpg_error_res) $(intllibs) -gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c $(arch_sources) +gpg_error_SOURCES = strsource-sym.c strerror-sym.c gpg-error.c gpg_error_CPPFLAGS = -DLOCALEDIR=\"$(localedir)\" $(extra_cppflags) gpg_error_LDADD = ./libgpg-error.la @LTLIBINTL@ @@ -175,10 +174,13 @@ errnos-sym.h: Makefile mkstrtable.awk errnos.in -v prefix=GPG_ERR_ -v namespace=errnos_ \ $(srcdir)/errnos.in >$@ -extra-h.in: Makefile w32ce-add.h +extra-h.in: Makefile w32-add.h w32ce-add.h -rm extra-h.in +if HAVE_W32_SYSTEM + cat $(srcdir)/w32-add.h >>extra-h.in +endif if HAVE_W32CE_SYSTEM - cat $(srcdir)/w32ce-add.h >extra-h.in + cat $(srcdir)/w32ce-add.h >>extra-h.in endif echo EOF >>extra-h.in |