Clean up

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 542f72c3bb5a98833586b2cbe80cc0dcc3535a75..be1e368b4810ed38e6302d4117e207e823468695 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -16,9 +16,11 @@ SRCS = main.c daemon.c connection.c search.c filter.c add.c charray.c \
                phonetic.c acl.c str2filter.c aclparse.c init.c user.c \
                repl.c lock.c controls.c extended.c kerberos.c passwd.c \
                schema.c schema_check.c schema_init.c schema_prep.c \
-               schemaparse.c ad.c at.c mr.c syntax.c oc.c \
-               monitor.c configinfo.c starttls.c index.c \
-               root_dse.c sasl.c module.c suffixalias.c $(@PLAT@_SRCS)
+               schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \
+               configinfo.c starttls.c index.c sets.c \
+               root_dse.c sasl.c module.c suffixalias.c mra.c mods.c \
+               limits.c \
+               $(@PLAT@_SRCS)
 
 OBJS   = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                attr.o entry.o config.o backend.o result.o operation.o \
@@ -27,9 +29,11 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                phonetic.o acl.o str2filter.o aclparse.o init.o user.o \
                repl.o lock.o controls.o extended.o kerberos.o passwd.o \
                schema.o schema_check.o schema_init.o schema_prep.o \
-               schemaparse.o ad.o at.o mr.o syntax.o oc.o \
-               monitor.o configinfo.o starttls.o index.o \
-               root_dse.o sasl.o module.o suffixalias.o $(@PLAT@_OBJS)
+               schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \
+               configinfo.o starttls.o index.o sets.o \
+               root_dse.o sasl.o module.o suffixalias.o mra.o mods.o \
+               limits.o \
+               $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include
 LDAP_LIBDIR= ../../libraries
@@ -41,7 +45,7 @@ XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
 
 # $(LTHREAD_LIBS) must be last
-XLIBS = libbackends.a -lavl -lldbm -lldif -llutil -lldap_r -llber
+XLIBS = libbackends.a -lavl -lldbm -lldif -llutil -llunicode -lldap_r -llber
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) \
         $(SECURITY_LIBS) \
         $(LDIF_LIBS) $(LUTIL_LIBS)
@@ -52,7 +56,7 @@ BUILD_SRV = @BUILD_SLAPD@
 
 all-local-srv: all-cffiles
 
-NT_DYN_DEFS  = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
+NT_DYN_DEFS  = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
 
 DEFINES = $(@PLAT@_@LIB_LINKAGE@_DEFS)
 
@@ -101,8 +105,7 @@ slapd.def: $(OBJS) version.o
 # We don't want to include symbols from dynamic libraries.
 all.def: $(STATIC_DEFS) $(DYNAMIC_DEFS)
        cat $(STATIC_DEFS) | grep " @ " | sed -e 's/ @ [0-9]*//' > $@
-       if [ "@LIB_LINKAGE@" != "DYN" ] ; \
-       then \
+       if test "@LIB_LINKAGE@" != "DYN" ; then \
            cat $(DYNAMIC_DEFS) | grep " @ " | sed -e 's/ @ [0-9]*//' >> $@; \
        fi
        echo EXPORTS > tmp.def
@@ -160,7 +163,7 @@ sslapd: version.o
 
 .backend: $(@PLAT@_IMPLIB) FORCE
        @for i in back-*; do \
-               if [ -d $$i ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) all ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -180,13 +183,13 @@ libbackends.a: .backend
                        mv $$j $${pre}$$j; \
                  done; \
                  $(AR) ruv libbackends.a *.o 2>&1 | grep -v truncated; \
-                 $(RM) *.o __.SYMDEF; \
+                 $(RM) *.o __.SYMDEF  ________64ELEL_ ; \
                  echo "added backend library $$i"; \
                ); \
        done
        @mv -f tmp/libbackends.a ./libbackends.a
        @$(RM) -r tmp
-       @if [ ! -z "$(RANLIB)" ]; then \
+       @if test ! -z "$(RANLIB)" ; then \
                $(RANLIB) libbackends.a; \
        fi
        @ls -l libbackends.a
@@ -197,7 +200,7 @@ version.c: $(OBJS) $(SLAPD_LIBDEPEND)
 
 depend-local-srv: FORCE
        @for i in back-* shell-backends tools; do \
-               if [ -d $$i ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -210,7 +213,7 @@ clean-local:
 
 clean-local-srv: FORCE
        @for i in back-* shell-backends tools; do \
-               if [ -d $$i ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -220,7 +223,7 @@ clean-local-srv: FORCE
 
 veryclean-local-srv: FORCE
        @for i in back-* shell-backends tools; do \
-               if [ -d $$i ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
                fi; \
@@ -233,9 +236,9 @@ install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(localstatedir)
        $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-       @if [ ! -z "$(SLAPD_MODULES)" ]; then \
+       @if test ! -z "$(SLAPD_MODULES)" ; then \
            for i in back-* shell-backends tools; do \
-               if [ -d $$i ]; then \
+               if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) install ); \
                        if test $$? != 0 ; then exit 1; fi ; \
@@ -251,25 +254,26 @@ all-cffiles: slapd
        touch all-cffiles
 
 install-schema: FORCE
-       @-$(MKDIR) $(DESTDIR)$(sysconfdir)/schema
-       @cd $(srcdir) ; \
-       for i in schema/*.schema ; do \
-               if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \
-                       echo "installing $$i in $(sysconfdir)"; \
-                       echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(sysconfdir)/$$i; \
-                       $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $(DESTDIR)$(sysconfdir)/$$i; \
+       @-$(MKDIR) $(DESTDIR)$(schemadir)
+       for i in $(srcdir)/schema/*.schema ; do \
+               SF=`basename $$i` ; \
+               SD="$(DESTDIR)$(schemadir)/$$SF" ; \
+               if test ! -f $$SD ; then \
+                       echo "installing $$SF in $(schemadir)" ; \
+                       echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \
                else \
-                       echo "PRESERVING EXISTING SCHEMA FILE $(DESTDIR)$(sysconfdir)/$$i"; \
-               fi; \
-               $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i.default ; \
+                       echo "PRESERVING EXISTING SCHEMA FILE $$SD" ; \
+               fi ; \
+               $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD.default ; \
        done
 
 install-conf: FORCE
        @-$(MKDIR) $(DESTDIR)$(sysconfdir)
        @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-ldbm
        $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf.default
-       if test ! -f $(DESTDIR)$(sysconfdir)/$$cf; then \
-               echo "installing $$cf in $(sysconfdir)"; \
+       if test ! -f $(DESTDIR)$(sysconfdir)/slapd.conf; then \
+               echo "installing slapd.conf in $(sysconfdir)"; \
                echo "$(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf"; \
                $(INSTALL) $(INSTALLFLAGS) -m 600 slapd.conf.tmp $(DESTDIR)$(sysconfdir)/slapd.conf; \
        else \