misc slapi cleanup

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 7f225c2cee79734d8badbf7d6edceb5b2c32031c..fd6d5e5d754ca99e1ee46d7057583de95a5aa86d 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -39,9 +39,10 @@ LDAP_INCDIR= ../../include -Islapi
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_STATIC_DEPENDS=@SLAPD_SLAPI_DEPEND@ @SLAPD_NO_STATIC@ libbackends.a
+SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
+SLAPD_SLAPI_DEPEND=@SLAPD_SLAPI_DEPEND@
 
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS)
@@ -224,13 +225,13 @@ slapd.exp: libslapd.a
        dlltool --dllname slapd.exe --input-def slapd.def \
                --base-file slapd.base --output-exp $@
 
-.slapi: FORCE
-       $(AR) ruv slapi/libtmpslapd.a $(OBJS)
-       (cd slapi; $(MAKE) $(MFLAGS) all)
-
 libslapi.a: .slapi
        cp slapi/.libs/libslapi.a .
 
+.slapi: slapd
+       $(AR) ruv slapi/libtmpslapd.a $(OBJS)
+       (cd slapi; $(MAKE) $(MFLAGS) all)
+
 slapd: $(SLAPD_DEPENDS)
        $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
                $(WRAP_LIBS)
@@ -238,7 +239,7 @@ slapd: $(SLAPD_DEPENDS)
 sslapd: version.o
        $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
-tools $(SLAPD_DYNAMIC_BACKENDS): slapd
+tools $(SLAPD_DYNAMIC_BACKENDS) $(SLAPD_SLAPI_DEPEND): slapd
        cd $@; $(MAKE) $(MFLAGS) all
        @touch $@