X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=be1e368b4810ed38e6302d4117e207e823468695;hb=b09727567d047cb79c8da8545cca9c8355822185;hp=8a32149e984ee064179d4eb02a9799fa1744c8e0;hpb=42bb3e2e854600c7dc8e40a5809aebd71cefd564;p=openldap diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index 8a32149e98..be1e368b48 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -15,8 +15,12 @@ SRCS = main.c daemon.c connection.c search.c filter.c add.c charray.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 \ repl.c lock.c controls.c extended.c kerberos.c passwd.c \ - schema.c schemaparse.c monitor.c configinfo.c \ - root_dse.c sasl.c module.c suffixalias.c $(@PLAT@_SRCS) + 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 \ + 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 \ @@ -24,22 +28,27 @@ OBJS = main.o daemon.o connection.o search.o filter.o add.o charray.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 \ repl.o lock.o controls.o extended.o kerberos.o passwd.o \ - schema.o schemaparse.o monitor.o configinfo.o \ - root_dse.o sasl.o module.o suffixalias.o $(@PLAT@_OBJS) + 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 \ + 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 SLAP_DIR= SLAPD_MODULES=@SLAPD_MODULES_LIST@ + 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) \ - $(SLAPD_PERL_LDFLAGS) $(SECURITY_LIBS) \ - $(LDIF_LIBS) $(LUTIL_LIBS) + $(SECURITY_LIBS) \ + $(LDIF_LIBS) $(LUTIL_LIBS) XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS) BUILD_OPT = "--enable-slapd" @@ -47,51 +56,117 @@ BUILD_SRV = @BUILD_SLAPD@ all-local-srv: all-cffiles -NT_GEN_DEFS = -DLIBLUTIL_DECL=dllexport -DLIBAVL_DECL=dllexport \ - -DLIBLDBM_DECL=dllexport -DLIBLDIF_DECL=dllexport - -NT_DYN_DEFS = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport $(NT_GEN_DEFS) -NT_STAT_DEFS = -DLIBLBER_DECL=dllexport -DLIBLDAP_DECL=dllexport $(NT_GEN_DEFS) +NT_DYN_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport DEFINES = $(@PLAT@_@LIB_LINKAGE@_DEFS) -slapd.def: slapd.syms - ( \ - echo EXPORTS > $@; \ - _hint=1; \ - for symbol in `cat $<`; do \ - echo " $$symbol @ $$_hint ; " >> $@; \ - _hint=`expr 1 + $$_hint`; \ - done \ - ) +# The tricky part about building slapd in NT is that it will export symbols +# like a DLL. The symbols that it exports should be representative of all +# of the static symbols that it knows about. -slapd.base: version.o - $(LTLINK) -o slapd $(OBJS) version.o $(LIBS) $(WRAP_LIBS) \ - -Wl,--base-file,$@ - rm -f slapd +NT_EXP = slapd.exp +NT_IMPLIB = libslapd.a +NT_DUMMY = symdummy.o -slapd.exp: slapd.def slapd.base - dlltool --dllname slapd.exe --def slapd.def --base-file slapd.base \ - --output-exp $@ +# Add extra def targets here +EXTRA_DEFS = -libslapd.a: slapd.def - dlltool --dllname slapd.exe --def $< --output-lib $@ +# NT needs this if libltdl is built statically. You'll have to fix the path +# to point to where libltdl was built, then put ltdl.def in EXTRA_DEFS +ltdl.def: ../../../libtool/libltdl/*.o + dlltool --export-all-symbols --output-def $@ $^ -NT_EXP = slapd.exp -NT_IMP_LIB = libslapd.a +DYNAMIC_DEFS = liblber.def libldap_r.def + +STATIC_DEFS = libavl.def libldbm.def libldif.def liblutil.def slapd.def \ + $(EXTRA_DEFS) + +libavl.def: $(LDAP_LIBDIR)/libavl/*.o + dlltool --export-all-symbols --output-def $@ `ls $^ | grep -v test` + +liblber.def: $(LDAP_LIBDIR)/liblber/*.o + dlltool --export-all-symbols --output-def $@ `ls $^ | grep -v test` + +libldap_r.def: $(LDAP_LIBDIR)/libldap_r/*.o + dlltool --export-all-symbols --output-def $@ `ls $^ | grep -v test` + +libldbm.def: $(LDAP_LIBDIR)/libldbm/*.o + dlltool --export-all-symbols --output-def $@ `ls $^ | grep -v test` + +libldif.def: $(LDAP_LIBDIR)/libldif/*.o + dlltool --export-all-symbols --output-def $@ `ls $^ | grep -v test` + +liblutil.def: $(LDAP_LIBDIR)/liblutil/*.o + dlltool --export-all-symbols --output-def $@ `ls $^ | grep -v test` + +slapd.def: $(OBJS) version.o + dlltool --export-all-symbols --exclude-symbols main,ServiceMain@8 --output-def $@ `ls $^ | grep -v test` + +# 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 test "@LIB_LINKAGE@" != "DYN" ; then \ + cat $(DYNAMIC_DEFS) | grep " @ " | sed -e 's/ @ [0-9]*//' >> $@; \ + fi + echo EXPORTS > tmp.def + sort $@ >> tmp.def + rm -f $@ + dlltool --input-def tmp.def --output-def $@ + rm -f tmp.def + +DUMMYTMP = symdummytmp.c + +symdummy.c: all.def $(ALL_DEFS) + rm -f $@ + echo "static void never_called() {" > $(DUMMYTMP) + cat $< | grep " @ " | while read line; \ + do \ + set dummy $$line; \ + case $$# in \ + 5) \ + echo "int $$2();" >> $@; \ + echo "$$2();" >> $(DUMMYTMP); \ + ;; \ + 6) \ + echo "extern int $$2;" >> $@; \ + echo "$$2 = 0;" >> $(DUMMYTMP); \ + ;; \ + esac; \ + done + echo "" >> $@ + echo "}" >> $(DUMMYTMP) + cat $(DUMMYTMP) >> $@ + rm -f $(DUMMYTMP) -slapd: $(@PLAT@_IMP_LIB) libbackends.a version.o $(@PLAT@_EXP) - $(LTLINK) -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS) $(@PLAT@_EXP) +symdummy.o: symdummy.c + $(CC) $(CFLAGS) -c $< + +SLAPD_OBJS = $(OBJS) version.o symdummy.o + +slapd.exp: libbackends.a all.def $(SLAPD_OBJS) + $(LTLINK) -o slapd $(SLAPD_OBJS) $(LIBS) $(WRAP_LIBS) -Wl,--base-file,slapd.base + rm -f slapd.exe + dlltool --dllname slapd.exe --input-def all.def --base-file slapd.base --output-exp $@ + $(LTLINK) -o slapd $(SLAPD_OBJS) $(LIBS) $(WRAP_LIBS) $@ -Wl,--base-file,slapd.base + rm -f slapd.exe + dlltool --dllname slapd.exe --input-def all.def --base-file slapd.base --output-exp $@ + +libslapd.a: all.def + dlltool --dllname slapd.exe --input-def $< --output-lib $@ + +slapd: libbackends.a version.o $(@PLAT@_EXP) $(@PLAT@_DUMMY) + $(LTLINK) -o $@ $(@PLAT@_EXP) $(@PLAT@_DUMMY) $(OBJS) version.o $(LIBS) $(WRAP_LIBS) (cd tools; $(MAKE) $(MFLAGS) all) sslapd: version.o $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS) -.backend: FORCE +.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 ; \ fi; \ done; \ echo " " @@ -108,45 +183,47 @@ 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 -version.c: libbackends.a $(OBJS) $(SLAPD_LIBDEPEND) +version.c: $(OBJS) $(SLAPD_LIBDEPEND) @-$(RM) $@ $(MKVERSION) -s -n Versionstr slapd > $@ 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 ; \ fi; \ done @echo "" clean-local: - rm -f *.exp *.def *.base *.a + rm -f *.exp *.def *.base *.a *.objs symdummy.c 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 ; \ fi; \ done rm -f *.tmp all-cffiles 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; \ @@ -157,60 +234,51 @@ install-local-srv: install-slapd install-conf install-schema install-tools install-slapd: FORCE -$(MKDIR) $(DESTDIR)$(libexecdir) -$(MKDIR) $(DESTDIR)$(localstatedir) - $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapd$(EXEEXT) \ - $(DESTDIR)$(libexecdir) - @if [ ! -z "$(SLAPD_MODULES)" ]; then \ + $(LTINSTALL) $(INSTALLFLAGS) -s -m 755 \ + slapd$(EXEEXT) $(DESTDIR)$(libexecdir) + @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 ; \ fi; \ done; \ fi - -CFFILES=slapd.conf slapd.at.conf slapd.oc.conf - all-cffiles: slapd - @for i in $(CFFILES); do \ - tmpcf=$$i.tmp; \ - $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \ - -e 's;%LOCALSTATEDIR%;$(localstatedir);' \ - $(srcdir)/$$i > $$tmpcf ; \ - done + $(SED) -e 's;%SYSCONFDIR%;$(sysconfdir);' \ + -e 's;%LOCALSTATEDIR%;$(localstatedir);' \ + -e 's;%MODULEDIR%;$(moduledir);' \ + $(srcdir)/slapd.conf > slapd.conf.tmp ; \ touch all-cffiles install-schema: FORCE - @-$(MKDIR) $(DESTDIR)$(sysconfdir)/schema - @for i in schema/*.schema ; do \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ - echo "installing $$i in $(sysconfdir)"; \ - echo $(INSTALL) $(INSTALLFLAGS) $$i $(DESTDIR)$(sysconfdir)/$$i; \ - $(INSTALL) $(INSTALLFLAGS) $$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) - @for i in $(CFFILES); do \ - tmpcf=$$i.tmp ; \ - if test $$i = slapd.conf ; then \ - mode=600 ; \ - else \ - mode=644 ; \ - fi ; \ - if test ! -f $(DESTDIR)$(sysconfdir)/$$i; then \ - echo "installing $$i in $(sysconfdir)"; \ - echo "$(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i"; \ - $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i; \ - else \ - echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/$$i" ; \ - fi; \ - $(INSTALL) $(INSTALLFLAGS) -m $$mode $$tmpcf $(DESTDIR)$(sysconfdir)/$$i.default ; \ - done + @-$(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)/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 \ + echo "PRESERVING EXISTING CONFIGURATION FILE $(DESTDIR)$(sysconfdir)/slapd.conf" ; \ + fi install-tools: FORCE @-$(MKDIR) $(DESTDIR)$(sbindir)