SLAPI - Netscape plugin API for slapd - based on patch contributed by Steve Omrani...

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 936ee9d1062fa091f1ce7984d854f27953872867..4bc2c7314241f495a271a496f06d05e9f0260748 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -9,7 +9,7 @@ XSRCS=version.c
 NT_SRCS = nt_svc.c
 NT_OBJS = nt_svc.o ../../libraries/liblutil/slapdmsg.res
 
-SRCS   = main.c daemon.c connection.c search.c filter.c add.c charray.c \
+SRCS   = main.c daemon.c connection.c search.c filter.c add.c cr.c \
                attr.c entry.c config.c backend.c result.c operation.c \
                dn.c compare.c modify.c delete.c modrdn.c ch_malloc.c \
                value.c ava.c bind.c unbind.c abandon.c filterentry.c \
@@ -22,7 +22,7 @@ SRCS  = main.c daemon.c connection.c search.c filter.c add.c charray.c \
                limits.c backglue.c operational.c matchedValues.c \
                $(@PLAT@_SRCS)
 
-OBJS   = main.o daemon.o connection.o search.o filter.o add.o charray.o \
+OBJS   = main.o daemon.o connection.o search.o filter.o add.o cr.o \
                attr.o entry.o config.o backend.o result.o operation.o \
                dn.o compare.o modify.o delete.o modrdn.o ch_malloc.o \
                value.o ava.o bind.o unbind.o abandon.o filterentry.o \
@@ -35,20 +35,20 @@ OBJS        = main.o daemon.o connection.o search.o filter.o add.o charray.o \
                limits.o backglue.o operational.o matchedValues.o \
                $(@PLAT@_OBJS)
 
-LDAP_INCDIR= ../../include
+LDAP_INCDIR= ../../include -Islapi
 LDAP_LIBDIR= ../../libraries
 
 SLAP_DIR=
-SLAPD_MODULES=@SLAPD_MODULES_LIST@
+SLAPD_STATIC_DEPENDS=@SLAPD_SLAPI_DEPEND@ @SLAPD_NO_STATIC@ libbackends.a
 SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@
 SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@
 
 XDEFS = $(MODULES_CPPFLAGS)
-XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
+XLDFLAGS = $(MODULES_LDFLAGS)
 
-XLIBS = libbackends.a $(SLAPD_L)
+XLIBS = $(SLAPD_STATIC_DEPENDS) $(SLAPD_L)
 XXLIBS = $(LDBM_LIBS) $(SLAPD_LIBS) $(SECURITY_LIBS) $(LDIF_LIBS) $(LUTIL_LIBS)
-XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS)
+XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) $(SLAPI_LIBS)
 
 BUILD_OPT = "--enable-slapd"
 BUILD_SRV = @BUILD_SLAPD@
@@ -58,7 +58,7 @@ all-local-srv: all-cffiles
 NT_SLAPD_DEPENDS = slapd.exp
 NT_SLAPD_OBJECTS = slapd.exp symdummy.o $(OBJS) version.o
 
-UNIX_SLAPD_DEPENDS = libbackends.a version.o $(SLAP_L)
+UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L)
 UNIX_SLAPD_OBJECTS = $(OBJS) version.o
 
 SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS)
@@ -224,24 +224,25 @@ slapd.exp: libslapd.a
        dlltool --dllname slapd.exe --input-def slapd.def \
                --base-file slapd.base --output-exp $@
 
+.slapi: FORCE
+       (cd slapi; $(MAKE) $(MFLAGS) all)
+
+libslapi.a: .slapi
+       $(AR) ruv slapi/libtmpslapd.a $(OBJS)
+       cp slapi/.libs/libslapi.a .
+
 slapd: $(SLAPD_DEPENDS)
-       $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) $(WRAP_LIBS)
-       @if test -n "$(SLAPD_DYNAMIC_BACKENDS)"; then \
-           echo "building dynamic backends..."; \
-           for i in XX $(SLAPD_DYNAMIC_BACKENDS); do \
-               if test $$i != XX; then \
-                   echo " "; echo "  cd $$i; $(MAKE) $(MFLAGS) all"; \
-                   ( cd $$i; $(MAKE) $(MFLAGS) all ); \
-                   if test $$? != 0; then exit 1; fi; \
-               fi; \
-           done; \
-           echo " "; \
-       fi
-       cd tools; $(MAKE) $(MFLAGS) all
+       $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
+               libslapi.a slapi/libtmpslapd.a \
+               $(WRAP_LIBS)
 
 sslapd: version.o
        $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS)
 
+tools $(SLAPD_DYNAMIC_BACKENDS): slapd
+       cd $@; $(MAKE) $(MFLAGS) all
+       @touch $@
+
 #
 # In Windows, dynamic backends have to be built after slapd. For this
 # reason, we only build static backends now and dynamic backends later.
@@ -288,7 +289,7 @@ version.c: $(OBJS) $(SLAPD_LIBDEPEND)
        $(MKVERSION) -s -n Versionstr slapd > $@
 
 depend-local-srv: FORCE
-       @for i in back-* shell-backends tools; do \
+       @for i in back-* shell-backends slapi tools; do \
                if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) depend ); \
@@ -301,7 +302,7 @@ clean-local:
        rm -f *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
-       @for i in back-* shell-backends tools; do \
+       @for i in back-* shell-backends slapi tools; do \
                if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) clean ); \
@@ -311,7 +312,7 @@ clean-local-srv: FORCE
        rm -f *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
-       @for i in back-* shell-backends tools; do \
+       @for i in back-* shell-backends slapi tools; do \
                if test -d $$i -a -f $$i/Makefile ; then \
                        echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
                        ( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
@@ -325,7 +326,7 @@ install-slapd: FORCE
        -$(MKDIR) $(DESTDIR)$(localstatedir)
        $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \
                slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
-       @for i in back-* shell-backends tools; do \
+       @for i in back-* shell-backends slapi tools; do \
            if test -d $$i -a -f $$i/Makefile ; then \
                echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
                ( cd $$i; $(MAKE) $(MFLAGS) install ); \
@@ -333,7 +334,7 @@ install-slapd: FORCE
            fi; \
        done
 
-all-cffiles: slapd
+all-cffiles: slapd $(SLAPD_DYNAMIC_BACKENDS) tools
        @if test $(PLAT) = NT; then \
            sysconfdir=`cygpath -w $(sysconfdir) | \
                $(SED) -e 's/\\\\/\\\\\\\\\\\\\\\\/g'`; \