partial fix to ITS#3659; still problems in merging values with "permissive" set

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

diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index 0895bd0cc77a40957dd6355a6e872784f8a9755a..b1d790ff61f8ca8bd8d3e6c61fae57562bb2de48 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 The OpenLDAP Foundation.
+## Copyright 2003-2005 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -13,10 +13,32 @@
 ## top-level directory of the distribution or, alternatively, at
 ## <http://www.OpenLDAP.org/license.html>.
 
-SRCS = overlays.c dyngroup.c pcache.c \
-       rwm.c rwmconf.c rwmdn.c rwmmap.c
-OBJS = overlays.lo dyngroup.lo pcache.lo \
-       rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo
+SRCS = overlays.c \
+       denyop.c \
+       dyngroup.c \
+       dynlist.c \
+       glue.c \
+       lastmod.c \
+       pcache.c \
+       ppolicy.c \
+       refint.c \
+       rwm.c rwmconf.c rwmdn.c rwmmap.c \
+       syncprov.c \
+       translucent.c \
+       unique.c
+OBJS = overlays.lo \
+       denyop.lo \
+       dyngroup.lo \
+       dynlist.lo \
+       glue.lo \
+       lastmod.lo \
+       pcache.lo \
+       ppolicy.lo \
+       refint.lo \
+       rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo \
+       syncprov.lo \
+       translucent.lo \
+       unique.lo
 
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
@@ -33,18 +55,55 @@ PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@
 XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 
+denyop.la : denyop.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ denyop.lo version.lo $(LINK_LIBS)
+
 dyngroup.la : dyngroup.lo $(@PLAT@_LINK_LIBS)
        $(LTLINK_MOD) -module -o $@ dyngroup.lo version.lo $(LINK_LIBS)
 
+dynlist.la : dynlist.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ dynlist.lo version.lo $(LINK_LIBS)
+
+glue.la : glue.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ glue.lo version.lo $(LINK_LIBS)
+
+lastmod.la : lastmod.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ lastmod.lo version.lo $(LINK_LIBS)
+
 pcache.la : pcache.lo $(@PLAT@_LINK_LIBS)
        $(LTLINK_MOD) -module -o $@ pcache.lo version.lo $(LINK_LIBS)
 
+ppolicy.la : ppolicy.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ ppolicy.lo version.lo $(LINK_LIBS)
+
+refint.la : refint.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ refint.lo version.lo $(LINK_LIBS)
+
 rwm.la : rwm.lo $(@PLAT@_LINK_LIBS)
        $(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo version.lo $(LINK_LIBS)
 
+syncprov.la : syncprov.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
+
+translucent.la : translucent.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ translucent.lo version.lo $(LINK_LIBS)
+
+unique.la : unique.lo $(@PLAT@_LINK_LIBS)
+       $(LTLINK_MOD) -module -o $@ unique.lo version.lo $(LINK_LIBS)
+
 install-local: $(PROGRAMS)
-       @-$(MKDIR) $(DESTDIR)$(moduledir)
-       @for i in $? ; do \
-               $(LTINSTALL) $(INSTALLFLAGS) -m 755 $$i $(DESTDIR)$(moduledir);\
-       done
+       @if test -n "$?" ; then \
+               $(MKDIR) $(DESTDIR)$(moduledir); \
+               $(LTINSTALL) $(INSTALLFLAGS) -m 755 $? $(DESTDIR)$(moduledir);\
+       fi
+
+MKDEPFLAG = -l
+
+.SUFFIXES: .c .o .lo
+
+.c.lo:
+       $(LTCOMPILE_LIB) $<
+
+$(LIBRARY): version.lo
+       $(LTLINK_LIB) -o $@ $(OBJS) version.lo