Revert previous commit, added NT mkvers script

diff --git a/build/mkvers.bat b/build/mkvers.bat
new file mode 100755 (executable)
index 0000000..3144a6c
--- /dev/null
+++ b/build/mkvers.bat
@@ -0,0 +1,18 @@
+rem $OpenLDAP$
+rem Copyright 1998-2003 The OpenLDAP Foundation
+rem COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+rem of this package for details.
+rem
+rem Create a version.c file from build/version.h
+rem
+
+rem input, output, app, static
+
+copy %1 %2
+(echo. ) >> %2
+(echo #include "portable.h") >> %2
+(echo. ) >> %2
+(echo %4 const char __Version[] =) >> %2
+(echo "@(#) $" OPENLDAP_PACKAGE ": %3 " OPENLDAP_VERSION) >> %2
+(echo " (" __DATE__ " " __TIME__ ") $\n") >> %2
+(echo "\t%USERNAME%@%COMPUTERNAME% %CD:\=/%\n";) >> %2

diff --git a/build/top.mk b/build/top.mk
index 60cbc4e0136749eac67d544f3b50a77a5dde8195..bcfb0d6088490359c6db74c51c36fa35b63132fb 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -66,7 +66,7 @@ LIBVERSION = @OPENLDAP_LIBVERSION@
 LTVERSION = -version-info $(LIBVERSION)
 
 # libtool --only flag for libraries: platform specific
-NT_LTONLY_LIB = --only-$(BUILD_LIBS_DYNAMIC)
+NT_LTONLY_LIB = # --only-$(BUILD_LIBS_DYNAMIC)
 LTONLY_LIB = $(@PLAT@_LTONLY_LIB)
 
 # libtool --only flag for modules: depends on linkage of module
@@ -170,7 +170,6 @@ AC_CFLAGS = @CFLAGS@
 AC_DEFS = @CPPFLAGS@ # @DEFS@
 AC_LDFLAGS = @LDFLAGS@
 AC_LIBS = @LIBS@
-CWD_DEF = -D_OLV_CWD=\"`pwd`\"
 
 KRB4_LIBS = @KRB4_LIBS@
 KRB5_LIBS = @KRB5_LIBS@

diff --git a/build/version.h b/build/version.h
index 800a7fcf814140f14cb58ead8ea4534bb8455029..dc6dd3964b82bf8e44c600721d682e7f5e4f45cc 100644 (file)
--- a/build/version.h
+++ b/build/version.h
@@ -7,7 +7,3 @@
 static const char copyright[] =
 "Copyright 1998-2003 The OpenLDAP Foundation\n"
 "COPYING RESTRICTIONS APPLY\n";
-
-_OLV_STATIC const char __Version[] =
-"@(#) $" OPENLDAP_PACKAGE ": " _OLV_APP " " OPENLDAP_VERSION " (" _OLV_DATE " " _OLV_TIME ") $\n\t" _OLV_WHO ":" _OLV_CWD "\n";
-