diff options
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | src/Makefile.am | 10 | ||||
| -rw-r--r-- | src/versioninfo.rc.in | 4 |
3 files changed, 13 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index 8d17351..e76f6ce 100644 --- a/configure.ac +++ b/configure.ac @@ -53,7 +53,6 @@ AC_PROG_AWK AC_CHECK_TOOL(AR, ar, :) AC_CHECK_TOOL(DLLTOOL, dlltool, :) AC_CHECK_TOOL(WINDRES, windres, :) -AC_LIBTOOL_WIN32_DLL AC_PROG_LIBTOOL # We need to compile and run a program on the build machine. @@ -115,15 +114,18 @@ AC_CONFIG_FILES([src/gpg-error-config], [chmod +x src/gpg-error-config]) # Special defines for certain platforms if test "$have_w32_system" = yes; then - W32LDFLAGS="-no-undefined" AC_DEFINE(HAVE_W32_SYSTEM,1,[Defined if we run on a W32 API based system]) BUILD_TIMESTAMP=`date --iso-8601=minutes` AC_SUBST(BUILD_TIMESTAMP) changequote(,)dnl - BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1.0/;s/\./,/g'` + BUILD_FILEVERSION=`echo "$VERSION" | sed 's/\([0-9.]*\).*/\1./;s/\./,/g'` changequote([,])dnl + case "$VERSION" in + *-cvs) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,0" ;; + *-rc*) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,1" ;; + *) BUILD_FILEVERSION="${BUILD_FILEVERSION}0,2" ;; + esac fi -AC_SUBST(W32LDFLAGS) AC_SUBST(BUILD_TIMESTAMP) AC_SUBST(BUILD_FILEVERSION) AM_CONDITIONAL(HAVE_W32_SYSTEM, test "$have_w32_system" = yes) diff --git a/src/Makefile.am b/src/Makefile.am index c4c2c2e..295d899 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -108,24 +108,24 @@ gpg-error.h: Makefile mkheader.awk \ # Special code to build a DLL. The current libtool (1.5.6) is not # able to do this properly; we better use gcc's built in magic. if HAVE_W32_SYSTEM -all-local: libgpg-error.dll libgpg-error.imp +all-local: libgpg-error.dll libgpg-error.dll.a install-exec-hook: - cp libgpg-error.dll libgpg-error.imp $(DESTDIR)$(libdir)/ + cp libgpg-error.dll libgpg-error.dll.a $(DESTDIR)$(libdir)/ cp gpg-error.exe $(DESTDIR)$(bindir)/ $(STRIP) $(DESTDIR)$(libdir)/libgpg-error.dll $(STRIP) $(DESTDIR)$(bindir)/gpg-error.exe -libgpg-error.dll libgpg-error.imp: gpg-error.def \ +libgpg-error.dll libgpg-error.dll.a: gpg-error.def \ code-from-errno.o code-to-errno.o strerror.o strsource.o \ gpg_error-strsource-sym.o gpg_error-strerror-sym.o \ gpg_error-gpg-error.o versioninfo.o $(CC) -shared -o libgpg-error.dll gpg-error.def \ code-from-errno.o code-to-errno.o strerror.o strsource.o \ - versioninfo.o -Wl,--out-implib,libgpg-error.imp + versioninfo.o -Wl,--out-implib,libgpg-error.dll.a $(CC) -o gpg-error.exe gpg_error-strsource-sym.o \ gpg_error-strerror-sym.o gpg_error-gpg-error.o \ - libgpg-error.imp + libgpg-error.dll.a .rc.o: $(WINDRES) `test -f '$<' || echo '$(srcdir)/'`$< $@ diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in index be13301..3384adc 100644 --- a/src/versioninfo.rc.in +++ b/src/versioninfo.rc.in @@ -18,8 +18,8 @@ VS_VERSION_INFO VERSIONINFO - FILEVERSION @BUILD_FILEVERSION@,0 - PRODUCTVERSION @BUILD_FILEVERSION@,0 + FILEVERSION @BUILD_FILEVERSION@ + PRODUCTVERSION @BUILD_FILEVERSION@ FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x21L |