Fix previous commit

[openldap] / build / lib.mk

diff --git a/build/lib.mk b/build/lib.mk
index 9b1e52a5c8a01568afc236e63ff68370e5fd1e2b..0f84b2016edc789e03bacb8d06b3e857e43da5aa 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,21 +9,13 @@
 
 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: install-local
+install-common: FORCE
 
 lint: lint-local FORCE
        $(LINT) $(DEFS) $(DEFINES) $(SRCS)
@@ -27,14 +23,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
+