Ready for release?

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index f63dd543ffa0970bdecf3b462cafbd2b1d10d82d..408126e0105dd641caec6449b5f95e99fd508487 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -35,9 +35,10 @@ SRCS = main.c globals.c bconfig.c config.c daemon.c \
                oidm.c starttls.c index.c sets.c referral.c root_dse.c \
                sasl.c module.c mra.c mods.c sl_malloc.c zn_malloc.c limits.c \
                operational.c matchedValues.c cancel.c syncrepl.c \
-               backover.c ctxcsn.c ldapsync.c frontend.c \
+               backglue.c backover.c ctxcsn.c ldapsync.c frontend.c \
                slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
                slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
+               aci.c alock.c \
                $(@PLAT@_SRCS)
 
 OBJS   = main.o globals.o bconfig.o config.o daemon.o \
@@ -52,9 +53,10 @@ OBJS = main.o globals.o bconfig.o config.o daemon.o \
                oidm.o starttls.o index.o sets.o referral.o root_dse.o \
                sasl.o module.o mra.o mods.o sl_malloc.o zn_malloc.o limits.o \
                operational.o matchedValues.o cancel.o syncrepl.o \
-               backover.o ctxcsn.o ldapsync.o frontend.o \
+               backglue.o backover.o ctxcsn.o ldapsync.o frontend.o \
                slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \
                slappasswd.o slaptest.o slapauth.o slapacl.o component.o \
+               aci.o alock.o \
                $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I.
@@ -166,7 +168,7 @@ slapd.def: libbackends.a liboverlays.a version.o
                    done="" ;\
                    base=`expr "$$i" : "-l\(.*\)"`; \
                    for p in $$paths ; do \
-                       for ext in la dll a ; do \
+                       for ext in la dll dll.a a ; do \
                            path=$$p/lib$$base.$$ext; \
                            test ! -f $$path && continue; \
                            if test $$ext = la ; then \
@@ -190,12 +192,14 @@ slapd.def: libbackends.a liboverlays.a version.o
                    test -z "$$obj" && continue; \
                    ;; \
                *.la) \
-                   if test -n "$LTSTATIC"; then \
+                   if test -n "$(LTSTATIC)"; then \
                            base=`expr "$$i" : ".*/\(.*\).la"`; \
                            path=`expr "$$i" : "\(.*/\).*"`; \
                            obj=$$path.libs/$$base.a; \
                    fi; \
                    ;; \
+               *.dll.a) \
+                   ;; \
                *.o | *.a) \
                    obj=$$i; \
            esac; \
@@ -333,7 +337,7 @@ backends.o: backends.c $(srcdir)/slap.h
 
 depend-local-srv: FORCE
        @for i in $(SUBDIRS); do \
-               if test -d $$i -a -f $$i/Makefile ; then \
+               if test -d $$i && test -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -349,7 +353,7 @@ veryclean-local:
 
 clean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
-               if test -d $$i -a -f $$i/Makefile ; then \
+               if test -d $$i && test -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -359,7 +363,7 @@ clean-local-srv: FORCE
 
 veryclean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
-               if test -d $$i -a -f $$i/Makefile ; then \
+               if test -d $$i && test -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
                fi; \
@@ -374,7 +378,7 @@ install-slapd: FORCE
        $(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
        @for i in $(SUBDIRS); do \
-           if test -d $$i -a -f $$i/Makefile ; then \
+           if test -d $$i && test -f $$i/Makefile ; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
                if test $$? != 0 ; then exit 1; fi ; \
@@ -401,7 +405,7 @@ all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) dynamic_overlays
        touch all-cffiles
 
 install-schema: FORCE
-       @if test -e $(DESTDIR)$(schemadir) ; then \
+       @if test -d $(DESTDIR)$(schemadir) ; then \
                echo "MOVING EXISTING SCHEMA DIR to $(DESTDIR)$(schemadir).$$$$" ; \
                mv $(DESTDIR)$(schemadir) $(DESTDIR)$(schemadir).$$$$ ; \
        fi