Relocate schema_init() call to main()

[openldap] / servers / slapd / tools / Makefile.in

diff --git a/servers/slapd/tools/Makefile.in b/servers/slapd/tools/Makefile.in
index 5e6c8719ffb00761c615076bf7bdd04c459baa82..7b897ce186dd04fc820732a3012db7527db6ab30 100644 (file)
--- a/servers/slapd/tools/Makefile.in
+++ b/servers/slapd/tools/Makefile.in
@@ -1,6 +1,8 @@
 # $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 #-----------------------------------------------------------------------------
-# Copyright (c) 1995 Regents of the University of Michigan.
+# Portions Copyright (c) 1995 Regents of the University of Michigan.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms are permitted
@@ -25,17 +27,21 @@ SLAPD_MODULES = @SLAPD_MODULES_LIST@
 XDEFS = $(MODULES_CPPFLAGS)
 XLDFLAGS = $(MODULES_LDFLAGS) $(SLAPD_MODULES)
 
-XLIBS = -lavl -lldif -lldbm -lldap_r -llber -llutil
+XLIBS = -lavl -lldif -lldbm -llutil -lldap_r -llber
 XXLIBS = $(LDAPD_LIBS) $(SLAPD_LIBS) \
-       $(PERL_LDFLAGS) $(LDBM_LIBS) $(SECURITY_LIBS) \
+       $(LDBM_LIBS) $(SECURITY_LIBS) \
        $(LDIF_LIBS) $(LUTIL_LIBS)
 XXXLIBS = $(LTHREAD_LIBS) $(MODULES_LIBS)
 
-PROGRAMS=ldif slapadd slapcat slapindex
+PROGRAMS=ldif slappasswd slapadd slapcat slapindex
 LDBMPROGRAMS=centipede sizecount
 BDB2PROGRAMS=
 QUIPUPROGRAMS=chlog2replog edb2ldif
 
+# CPPFLAGS will include the defines for dynamic libs in Mingw32.
+NT_DYN_DEFS = -DLIBLBER_DECL=dllimport -DLIBLDAP_DECL=dllimport
+CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_DEFS)
+
 SRCS = ldif.c mimic.c slapcommon.c
 
 XSRCS = edb2-vers.c
@@ -46,16 +52,22 @@ BDB2SRCS =
 
 QUIPUSRCS      = edb2ldif.c ldapsyntax.c chlog2replog.c
 SLAPD_OBJS = ../config.o ../ch_malloc.o ../backend.o ../charray.o \
-               ../module.o ../aclparse.o ../schema.o ../filterentry.o \
+               ../module.o ../aclparse.o ../filterentry.o \
+               ../schema.o ../schema_check.o ../schema_init.o ../schemaparse.o \
+               ../ad.o ../at.o ../mr.o ../oc.o ../syntax.o \
                ../acl.o ../phonetic.o ../attr.o ../value.o ../entry.o \
                ../dn.o ../filter.o ../str2filter.o ../ava.o ../init.o \
-               ../controls.o ../schemaparse.o
-SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o 
+               ../controls.o ../kerberos.o ../passwd.o \
+               ../extended.o ../starttls.o
+
+SLAPOBJS = $(SLAPD_OBJS) slapcommon.o mimic.o
 
 EDB2LDIFSRCS    = edb2ldif.c ldapsyntax.c
 EDB2LDIFOBJS    = edb2ldif.o ldapsyntax.o
 
-all-local: build-progs build-ldbm build-bdb2 build-quipu
+UNIX_PRGS = build-ldbm build-bdb2 build-quipu
+
+all-local: build-progs $(@PLAT@_PRGS)
 
 build-progs: $(PROGRAMS)
 
@@ -92,6 +104,9 @@ slapindex:   slapindex.o ../libbackends.a $(SLAPOBJS) $(SLAPD_LIBDEPEND)
 ldif:          ldif.o $(SLAPD_LIBDEPEND) 
        $(LTLINK) -o $@ ldif.o $(LIBS)
 
+slappasswd:            slappasswd.o $(SLAPD_LIBDEPEND) 
+       $(LTLINK) -o $@ slappasswd.o $(LIBS)
+
 #
 # LDBM Specific Tools
 #
@@ -120,10 +135,10 @@ chlog2replog: chlog2replog.o ../lock.o ../ch_malloc.o $(SLAPD_LIBDEPEND)
 
 clean-local: FORCE
        $(RM) $(PROGRAMS) $(LDBMPROGRAMS) $(BDB2PROGRAMS) $(QUIPUPROGRAMS) \
-               $(XPROGRAMS) $(XSRCS) *.o core .libs/*
+               $(XPROGRAMS) $(XSRCS) *.o core .libs/* *.exe
 
 depend-local: FORCE
-       @DEPEND_LDBM= ; DEPEND_BDB2= ; DEPEND_QUIPU= ; \
+       DEPEND_LDBM= ; DEPEND_BDB2= ; DEPEND_QUIPU= ; \
        if [ "$(BUILD_LDBM)" != "no" ]; then \
                DEPEND_LDBM="$(LDBMSRCS)"; \
        fi; \
@@ -142,17 +157,17 @@ install-local: install-ldbm-$(BUILD_LDBM) install-bdb2-$(BUILD_BDB2) \
 install-ldbm-no install-bdb2-no install-quipu-no:
 
 install-ldbm-yes install-ldbm-mod: FORCE
-       @-$(MKDIR) $(sbindir) 
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapadd $(sbindir)  ; \
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapcat $(sbindir)  ; \
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 slapindex $(sbindir)        ; \
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 ldif $(sbindir)     ; \
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 centipede $(sbindir)
+       -$(MKDIR) $(DESTDIR)$(sbindir) 
+       @for bin in $(PROGRAMS); do \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$bin$(EXEEXT) \
+                                                   $(DESTDIR)$(sbindir); \
+       done
 
 install-bdb2-yes install-bdb2-mod: FORCE
-       @-$(MKDIR) $(sbindir) 
+       @-$(MKDIR) $(DESTDIR)$(sbindir) 
 
 install-quipu-yes: FORCE
-       @-$(MKDIR) $(sbindir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 edb2ldif $(sbindir); \
-       $(LTINSTALL) $(INSTALLFLAGS) -m 755 chlog2replog $(sbindir)
+       @-$(MKDIR) $(DESTDIR)$(sbindir)
+       for bin in edb2ldif chlog2replog; do \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$bin $(DESTDIR)$(sbindir); \
+       done