X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=build%2Flib.mk;h=4694f85fdd1256f0d69881c37b902d5d965e2b15;hb=3673cceb6c2157e4d077462f811077291fe8634c;hp=bc7958a57d7a6ba805d62efc89b8945da0a70e80;hpb=e99eab787fd90696f1e668a5c1f1bd35f320acf1;p=openldap

diff --git a/build/lib.mk b/build/lib.mk
index bc7958a57d..4694f85fdd 100644
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,18 +1,29 @@
 # $OpenLDAP$
-## Copyright 1998,1999 The OpenLDAP Foundation
-## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
-## of this package for details.
-##---------------------------------------------------------------------------
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
+##
+## Copyright 1998-2005 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)
+version.c: Makefile
 	$(RM) $@
 	$(MKVERSION) $(LIBRARY) > $@
 
+version.o version.lo: version.c $(OBJS)
+
 install-common: FORCE
 
 lint: lint-local FORCE
@@ -21,12 +32,17 @@ 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/* \
 		../`$(BASENAME) $(LIBRARY) .la`.so* \
-		../`$(BASENAME) $(LIBRARY) .la`*.dll *.exe
+		../`$(BASENAME) $(LIBRARY) .la`*.dll
 
 depend-common: FORCE
 	$(MKDEP) $(DEFS) $(DEFINES) $(SRCS) $(XXSRCS)
@@ -35,3 +51,4 @@ lint-local: FORCE
 lint5-local: FORCE
 
 Makefile: $(top_srcdir)/build/lib.mk
+