X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2FMakefile.in;h=d4e76b33de3e50833694bdf0ba270f59f6b4aad9;hb=437d2ce5a920d12402b557b4b814e6d14cd40c9d;hp=f977e9c1e6657f0ba9167dd0b67a1e78e537fa9b;hpb=29a5c972658c0c3c21a86c1b027f68885aed5386;p=openldap diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index f977e9c1e6..d4e76b33de 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -9,8 +9,9 @@ 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 \ - attr.c entry.c config.c backend.c result.c operation.c \ +SRCS = main.c globals.c config.c daemon.c \ + connection.c search.c filter.c add.c cr.c \ + attr.c entry.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 \ phonetic.c acl.c str2filter.c aclparse.c init.c user.c \ @@ -18,12 +19,13 @@ SRCS = main.c daemon.c connection.c search.c filter.c add.c charray.c \ schema.c schema_check.c schema_init.c schema_prep.c \ schemaparse.c ad.c at.c mr.c syntax.c oc.c saslauthz.c \ oidm.c starttls.c index.c sets.c referral.c \ - root_dse.c sasl.c module.c suffixalias.c mra.c mods.c \ - limits.c backglue.c operational.c \ + root_dse.c sasl.c module.c mra.c mods.c \ + limits.c backglue.c operational.c matchedValues.c cancel.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 \ +OBJS = main.o globals.o config.o daemon.o \ + connection.o search.o filter.o add.o cr.o \ + attr.o entry.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 \ phonetic.o acl.o str2filter.o aclparse.o init.o user.o \ @@ -31,25 +33,24 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.o \ schema.o schema_check.o schema_init.o schema_prep.o \ schemaparse.o ad.o at.o mr.o syntax.o oc.o saslauthz.o \ oidm.o starttls.o index.o sets.o referral.o \ - root_dse.o sasl.o module.o suffixalias.o mra.o mods.o \ - limits.o backglue.o operational.o \ + root_dse.o sasl.o module.o mra.o mods.o \ + limits.o backglue.o operational.o matchedValues.o cancel.o \ $(@PLAT@_OBJS) -LDAP_INCDIR= ../../include +LDAP_INCDIR= ../../include -I$(srcdir)/slapi LDAP_LIBDIR= ../../libraries SLAP_DIR= -SLAPD_MODULES=@SLAPD_MODULES_LIST@ +SLAPD_STATIC_DEPENDS=@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) -# $(LTHREAD_LIBS) must be last -XLIBS = libbackends.a -lavl @LDBM_LIB@ -lldif -llutil -llunicode -lldap_r -llber +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) $(SLAPI_LIBS) @LIBSLAPI@ $(MODULES_LIBS) BUILD_OPT = "--enable-slapd" BUILD_SRV = @BUILD_SLAPD@ @@ -59,7 +60,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 +UNIX_SLAPD_DEPENDS = $(SLAPD_STATIC_DEPENDS) version.o $(SLAPD_L) UNIX_SLAPD_OBJECTS = $(OBJS) version.o SLAPD_DEPENDS = $(@PLAT@_SLAPD_DEPENDS) @@ -225,24 +226,25 @@ slapd.exp: libslapd.a dlltool --dllname slapd.exe --input-def slapd.def \ --base-file slapd.base --output-exp $@ -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 +libslapi.a: .slapi + (cd slapi; $(MAKE) $(MFLAGS) all) + cp slapi/.libs/libslapi.a . + +.slapi: $(SLAPD_OBJECTS) + $(AR) ruv slapi/libtmpslapd.a $(OBJS) + (cd slapi; $(MAKE) $(MFLAGS) all) + +slapd: $(SLAPD_DEPENDS) @LIBSLAPI@ + $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \ + $(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. @@ -284,12 +286,14 @@ libbackends.a: .backend fi @ls -l libbackends.a; echo "" -version.c: $(OBJS) $(SLAPD_LIBDEPEND) +version.c: Makefile @-$(RM) $@ $(MKVERSION) -s -n Versionstr slapd > $@ +version.o: version.c $(OBJS) $(SLAPD_LIBDEPEND) + 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 ); \ @@ -302,7 +306,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 ); \ @@ -312,7 +316,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 ); \ @@ -326,7 +330,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 ); \ @@ -334,7 +338,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'`; \ @@ -355,6 +359,11 @@ all-cffiles: slapd install-schema: FORCE @-$(MKDIR) $(DESTDIR)$(schemadir) + i="$(srcdir)/schema/README" ; \ + SF=`basename $$i` ; \ + SD="$(DESTDIR)$(schemadir)/$$SF" ; \ + echo $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD ; \ + $(INSTALL) $(INSTALLFLAGS) -m 444 $$i $$SD for i in $(srcdir)/schema/*.schema ; do \ SF=`basename $$i` ; \ SD="$(DESTDIR)$(schemadir)/$$SF" ; \