Revert previous commit, added NT mkvers script

[openldap] / build / lib.mk

diff --git a/build/lib.mk b/build/lib.mk
index bc7958a57d7a6ba805d62efc89b8945da0a70e80..d31ad5c93d09c6cc0e01ca617be6bfa08b10be6c 100644 (file)
--- a/build/lib.mk
+++ b/build/lib.mk
@@ -1,5 +1,5 @@
 # $OpenLDAP$
-## Copyright 1998,1999 The OpenLDAP Foundation
+## Copyright 1998-2003 The OpenLDAP Foundation
 ## COPYING RESTRICTIONS APPLY.  See COPYRIGHT File in top level directory
 ## of this package for details.
 ##---------------------------------------------------------------------------
@@ -9,10 +9,12 @@
 
 all-common: $(LIBRARY) $(PROGRAMS)
 
-version.c: $(OBJS)
+version.c: Makefile
        $(RM) $@
        $(MKVERSION) $(LIBRARY) > $@
 
+version.o: version.c $(OBJS)
+
 install-common: FORCE
 
 lint: lint-local FORCE
@@ -21,12 +23,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 +42,4 @@ lint-local: FORCE
 lint5-local: FORCE
 
 Makefile: $(top_srcdir)/build/lib.mk
+