X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Flib.mk;h=09859f6e75bf40624e6fa91b9c5b7496d36ea5fc;hb=825870a0725dceba602b5ce6f6f4f326038b4c21;hp=28c3df63d4c418f60fbc0fb6b532e49ee185c82c;hpb=43094a1b33036b1abe266f5013ad971a88609e0d;p=openldap

diff --git a/build/lib.mk b/build/lib.mk
index 28c3df63d4..09859f6e75 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,20 +1,28 @@
-## Copyright 1998,1999 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2009 The OpenLDAP Foundation.
+## All rights reserved.
 ##
-## Makefile Template for Libraries
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
 ##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
+##---------------------------------------------------------------------------
+#
+# Makefile Template for Libraries
+#
 
 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.lo: version.c $(OBJS)
 
 install-common: FORCE
 
@@ -24,10 +32,15 @@ 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) $(XXSRCS) \
-		*.o *.lo a.out core version.c .libs/*
+		*.o *.lo a.out *.exe core version.c .libs/*
 
 depend-common: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
@@ -36,3 +49,4 @@ lint-local: FORCE
 lint5-local: FORCE
 
 Makefile: $(top_srcdir)/build/lib.mk
+