Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

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

diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index fd248f12a16da9bdf940e174f87450c4497fcfb8..3af20e8e13044ee0b15c986b3ffd8ba123c05c6d 100644 (file)
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 2003-2005 The OpenLDAP Foundation.
+## Copyright 2003-2012 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -15,22 +15,32 @@
 
 SRCS = overlays.c \
        accesslog.c \
-       allop.c \
-       denyop.c \
+       auditlog.c \
+       constraint.c \
+       dds.c \
+       deref.c \
        dyngroup.c \
        dynlist.c \
-       glue.c \
-       lastmod.c \
+       memberof.c \
        pcache.c \
+       collect.c \
        ppolicy.c \
        refint.c \
        retcode.c \
        rwm.c rwmconf.c rwmdn.c rwmmap.c \
+       seqmod.c \
+       sssvlv.c \
        syncprov.c \
        translucent.c \
-       unique.c
-OBJS = overlays.o \
-       @SLAPD_STATIC_OVERLAYS@
+       unique.c \
+       valsort.c
+OBJS = statover.o \
+       @SLAPD_STATIC_OVERLAYS@ \
+       overlays.o
+
+# Add here the objs that are needed by overlays, but do not make it
+# into SLAPD_STATIC_OVERLAYS...
+OBJDEP=rwm.o rwmconf.o rwmdn.o rwmmap.o
 
 LTONLY_MOD = $(LTONLY_mod)
 LDAP_INCDIR= ../../../include       
@@ -55,11 +65,17 @@ dynamic: $(PROGRAMS)
 accesslog.la : accesslog.lo
        $(LTLINK_MOD) -module -o $@ accesslog.lo version.lo $(LINK_LIBS)
 
-allop.la : allop.lo
-       $(LTLINK_MOD) -module -o $@ allop.lo version.lo $(LINK_LIBS)
+auditlog.la : auditlog.lo
+       $(LTLINK_MOD) -module -o $@ auditlog.lo version.lo $(LINK_LIBS)
+
+constraint.la : constraint.lo
+       $(LTLINK_MOD) -module -o $@ constraint.lo version.lo $(LINK_LIBS)
+
+dds.la : dds.lo
+       $(LTLINK_MOD) -module -o $@ dds.lo version.lo $(LINK_LIBS)
 
-denyop.la : denyop.lo
-       $(LTLINK_MOD) -module -o $@ denyop.lo version.lo $(LINK_LIBS)
+deref.la : deref.lo
+       $(LTLINK_MOD) -module -o $@ deref.lo version.lo $(LINK_LIBS)
 
 dyngroup.la : dyngroup.lo
        $(LTLINK_MOD) -module -o $@ dyngroup.lo version.lo $(LINK_LIBS)
@@ -67,15 +83,15 @@ dyngroup.la : dyngroup.lo
 dynlist.la : dynlist.lo
        $(LTLINK_MOD) -module -o $@ dynlist.lo version.lo $(LINK_LIBS)
 
-glue.la : glue.lo
-       $(LTLINK_MOD) -module -o $@ glue.lo version.lo $(LINK_LIBS)
-
-lastmod.la : lastmod.lo
-       $(LTLINK_MOD) -module -o $@ lastmod.lo version.lo $(LINK_LIBS)
+memberof.la : memberof.lo
+       $(LTLINK_MOD) -module -o $@ memberof.lo version.lo $(LINK_LIBS)
 
 pcache.la : pcache.lo
        $(LTLINK_MOD) -module -o $@ pcache.lo version.lo $(LINK_LIBS)
 
+collect.la : collect.lo
+       $(LTLINK_MOD) -module -o $@ collect.lo version.lo $(LINK_LIBS)
+
 ppolicy.la : ppolicy.lo
        $(LTLINK_MOD) -module -o $@ ppolicy.lo version.lo $(LINK_LIBS) $(MODULES_LIBS)
 
@@ -87,10 +103,15 @@ retcode.la : retcode.lo
 
 rwm_x.o: rwm.o rwmconf.o rwmdn.o rwmmap.o
        $(LD) -r -o $@ rwm.o rwmconf.o rwmdn.o rwmmap.o
-       
+
 rwm.la : rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo
-       $(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo \
-               version.lo $(LINK_LIBS) $(LDAP_LIBLREWRITE_LA)
+       $(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo version.lo $(LINK_LIBS)
+
+seqmod.la : seqmod.lo
+       $(LTLINK_MOD) -module -o $@ seqmod.lo version.lo $(LINK_LIBS)
+
+sssvlv.la : sssvlv.lo
+       $(LTLINK_MOD) -module -o $@ sssvlv.lo version.lo $(LINK_LIBS)
 
 syncprov.la : syncprov.lo
        $(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
@@ -101,6 +122,9 @@ translucent.la : translucent.lo
 unique.la : unique.lo
        $(LTLINK_MOD) -module -o $@ unique.lo version.lo $(LINK_LIBS)
 
+valsort.la : valsort.lo
+       $(LTLINK_MOD) -module -o $@ valsort.lo version.lo $(LINK_LIBS)
+
 install-local: $(PROGRAMS)
        @if test -n "$?" ; then \
                $(MKDIR) $(DESTDIR)$(moduledir); \
@@ -114,14 +138,19 @@ MKDEPFLAG = -l
 .c.lo:
        $(LTCOMPILE_MOD) $<
 
+statover.o: statover.c $(srcdir)/../slap.h
+
 $(LIBRARY): $(OBJS) version.lo
        $(AR) rs $@ $(OBJS)
 
 # Must fixup depends for non-libtool objects
-depend-local:
+depend-local: depend-common
        @if test -n "$(OBJS)"; then \
-       OBJ2=`echo $(OBJS) | $(SED) -e 's/\.o//g'`; \
+       OBJ2=`echo $(OBJS) $(OBJDEP) | $(SED) -e 's/\.o//g'`; \
        SCR=''; for i in $$OBJ2; do SCR="$$SCR -e s/^$$i.lo:/$$i.o:/"; done; \
        mv Makefile Makefile.bak; $(SED) $$SCR Makefile.bak > Makefile && \
        $(RM) Makefile.bak; fi
 
+veryclean-local:
+       $(RM) statover.c
+