Revert ol_version stuff, just use mkversion

diff --git a/include/ol_version.h b/include/ol_version.h
deleted file mode 100644 (file)
index c0535b8..0000000
--- a/include/ol_version.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation
- * COPYING RESTRICTIONS APPLY.  See COPYRIGHT file in top level directory
- * of this package for details.
- */
-
-#define _OLV_DATE __DATE__
-#define _OLV_TIME __TIME__
-#ifndef _OLV_STATIC
-#define        _OLV_STATIC     static
-#endif
-#include "ol_version0.h"

diff --git a/include/setup.mak b/include/setup.mak
index cbedb7b0df655b81439b16b01429c72ab2cf7c5a..532acae501d9673482e0a224f0c2abe05935805e 100644 (file)
--- a/include/setup.mak
+++ b/include/setup.mak
@@ -23,7 +23,7 @@ ol_string="$(ol_package) $(ol_version)-$(ol_type)"
 .nt.h:
        copy $*.nt $*.h
 
-all: setup.txt ol_version0.h
+all: setup.txt
 
 setup.txt: lber_types.h ldap_config.h ldap_features.h portable.h setup.mak
        copy setup.mak setup.txt
@@ -53,5 +53,3 @@ i
 e
 <<NOKEEP
 
-ol_version0.h: ../build/version.h
-       $(CPP) /EP -D_OLV_WHO=\"$(USERNAME)@$(COMPUTERNAME)\" $? > $@