X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Flib.mk;h=d62b0e80703da93b883861348fb654f5d6acd215;hb=62f4745bfca51b0ee29916396d5559745f5c3d63;hp=8ae91785ad33a89e635e42b77b9a446fe283d70d;hpb=09b44ff1018bc6437a0f1de527d2018d46076fe3;p=openldap

diff --git a/build/lib.mk b/build/lib.mk
index 8ae91785ad..d62b0e8070 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,25 +1,30 @@
-##---------------------------------------------------------------------------
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2006 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)
 
-$(LIBRARY): version.o
-	$(AR) ru $@ $(OBJS) version.o
-	@$(RANLIB) $@;	\
-	$(RM) ../$@;	\
-	(d=`$(PWD)` ; $(LN_S) `$(BASENAME) $$d`/$@ ../$@)
-
-version.c: $(OBJS)
+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}|" \
-	< Version.c > $@)
+	$(MKVERSION) $(LIBRARY) > $@
+
+version.o version.lo: version.c $(OBJS)
 
-install-common: all-common install-local
+install-common: FORCE
 
 lint: lint-local FORCE
 	$(LINT) $(DEFS) $(DEFINES) $(SRCS)
@@ -27,14 +32,23 @@ lint: lint-local FORCE
 lint5: lint5-local FORCE
 	$(5LINT) $(DEFS) $(DEFINES) $(SRCS)
 
-clean-common: 	clean-local
-	$(RM) $(LIBRARY) ../$(LIBRARY) $(PROGRAMS) $(XPROGRAMS) $(XSRCS) \
-		*.o a.out core version.c
-
-depend-common: depend-local
-	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS)
-
-veryclean-common: veryclean-local clean-common
+#
+# 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 *.exe core version.c .libs/* \
+		../`$(BASENAME) $(LIBRARY) .la`.so* \
+		../`$(BASENAME) $(LIBRARY) .la`*.dll
+
+depend-common: FORCE
+	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
 
 lint-local: FORCE
 lint5-local: FORCE
+
+Makefile: $(top_srcdir)/build/lib.mk
+