component cleanup

[openldap] / servers / slapd / Makefile.in

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 6e34d817faa931b06d3e86bfc97a72f80f9bd76d..f926463896f355d8153284d7532e27a271562832 100644 (file)
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -35,9 +35,9 @@ SRCS  = main.c globals.c config.c daemon.c \
                oidm.c starttls.c index.c sets.c referral.c root_dse.c \
                sasl.c module.c mra.c mods.c sl_malloc.c limits.c \
                backglue.c operational.c matchedValues.c cancel.c syncrepl.c \
-               backover.c ctxcsn.c ldapsync.c sessionlog.c \
+               backover.c ctxcsn.c ldapsync.c sessionlog.c frontend.c \
                slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
-               slappasswd.c slaptest.c slapauth.c slapacl.c \
+               slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
                $(@PLAT@_SRCS)
 
 OBJS   = main.o globals.o config.o daemon.o \
@@ -52,9 +52,9 @@ OBJS  = main.o globals.o config.o daemon.o \
                oidm.o starttls.o index.o sets.o referral.o root_dse.o \
                sasl.o module.o mra.o mods.o sl_malloc.o limits.o \
                backglue.o operational.o matchedValues.o cancel.o syncrepl.o \
-               backover.o ctxcsn.o ldapsync.o sessionlog.o \
+               backover.o ctxcsn.o ldapsync.o sessionlog.o frontend.o \
                slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \
-               slappasswd.o slaptest.o slapauth.o slapacl.o \
+               slappasswd.o slaptest.o slapauth.o slapacl.o component.o \
                $(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include -I$(srcdir)/slapi
@@ -257,9 +257,9 @@ libslapi.a: slapi/.libs/libslapi.a
 slapd: $(SLAPD_DEPENDS) @LIBSLAPI@
        $(LTLINK) -o $@ $(SLAPD_OBJECTS) $(LIBS) \
                $(WRAP_LIBS)
-       rm -f $(SLAPTOOLS)
+       $(RM) $(SLAPTOOLS)
        for i in $(SLAPTOOLS); do \
-               $(LN_S) slapd $$i; done
+               $(LN_S) slapd$(EXEEXT) $$i$(EXEEXT); done
 
 
 sslapd: version.o
@@ -330,7 +330,7 @@ depend-local-srv: FORCE
        @echo ""
 
 clean-local:
-       rm -f *.exp *.def *.base *.a *.objs symdummy.c
+       $(RM) *.exp *.def *.base *.a *.objs symdummy.c
 
 clean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -340,7 +340,7 @@ clean-local-srv: FORCE
                        if test $$? != 0 ; then exit 1; fi ; \
                fi; \
        done
-       rm -f *.tmp all-cffiles
+       $(RM) *.tmp all-cffiles
 
 veryclean-local-srv: FORCE
        @for i in $(SUBDIRS); do \
@@ -419,16 +419,15 @@ install-conf: FORCE
 install-db-config: FORCE
        @-$(MKDIR) $(DESTDIR)$(localstatedir) $(DESTDIR)$(sysconfdir)
        @-$(INSTALL) -m 700 -d $(DESTDIR)$(localstatedir)/openldap-data
-       $(INSTALL) $(INSTALLFLAGS) -m 600 DB_CONFIG \
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
                $(DESTDIR)$(localstatedir)/openldap-data/DB_CONFIG.example
-       $(INSTALL) $(INSTALLFLAGS) -m 600 DB_CONFIG \
+       $(INSTALL) $(INSTALLFLAGS) -m 600 $(srcdir)/DB_CONFIG \
                $(DESTDIR)$(sysconfdir)/DB_CONFIG.example
 
 install-tools: FORCE
        -$(MKDIR) $(DESTDIR)$(sbindir)
-       cd $(DESTDIR)$(sbindir); \
-       rm -f $(SLAPTOOLS); \
        for i in $(SLAPTOOLS); do \
-               $(LN_S) $(libexecdir)/slapd $$i; \
+               $(RM) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
+               $(LN_S) -f $(DESTDIR)$(libexecdir)/slapd$(EXEEXT) $(DESTDIR)$(sbindir)/$$i$(EXEEXT); \
        done