Revert previous commit, added NT mkvers script

[openldap] / build / lib.mk

diff --git a/build/lib.mk b/build/lib.mk
index d92d72503dfcf316ddec72a88bf27a68cfcbc1df..d31ad5c93d09c6cc0e01ca617be6bfa08b10be6c 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,3 +1,7 @@
+# $OpenLDAP$
+## Copyright 1998-2003 The OpenLDAP Foundation
+## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
+## of this package for details.
 ##---------------------------------------------------------------------------
 ##
 ## Makefile Template for Libraries
@@ -5,13 +9,11 @@
 
 all-common: $(LIBRARY) $(PROGRAMS)
 
-version.c: $(OBJS) $(srcdir)/Version.c
+version.c: Makefile
        $(RM) $@
-       (u=$${USER-root} v=`$(CAT) $(VERSIONFILE)` d=`$(PWD)` \
-       h=`$(HOSTNAME)` t=`$(DATE)`; $(SED) -e "s|%WHEN%|$${t}|" \
-       -e "s|%WHOANDWHERE%|$${u}@$${h}:$${d}|" \
-       -e "s|%VERSION%|$${v}|" \
-       < $(srcdir)/Version.c > $@)
+       $(MKVERSION) $(LIBRARY) > $@
+
+version.o: version.c $(OBJS)
 
 install-common: FORCE
 
@@ -21,15 +23,23 @@ lint: lint-local FORCE
 lint5: lint5-local FORCE
        $(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
+#
+# In the mingw/cygwin environment, the so and dll files must be
+# deleted separately, instead of using the {.so*,*.dll} construct
+# that was previously used. It just didn't work.
+#
 clean-common:  FORCE
        $(RM) $(LIBRARY) ../$(LIBRARY) $(XLIBRARY) \
-               $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
-               *.o *.lo a.out core version.c .libs/*
+               $(PROGRAMS) $(XPROGRAMS) $(XSRCS) $(XXSRCS) \
+               *.o *.lo a.out *.exe core version.c .libs/* \
+               ../`$(BASENAME) $(LIBRARY) .la`.so* \
+               ../`$(BASENAME) $(LIBRARY) .la`*.dll
 
 depend-common: FORCE
-       $(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
+       $(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
 
 lint-local: FORCE
 lint5-local: FORCE
 
 Makefile: $(top_srcdir)/build/lib.mk
+