X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2FMakefile.in;h=a6d04ee1d983ed3b2a07c72dfedb8e95f2559b92;hb=fb2e448e877a8a387084dde517362c9f7bf1b6b7;hp=5e2210eb9f126ed834b2747854d925f399b91b5a;hpb=fb2d226a70288f40c10f28ed83aa607f3bb79a27;p=openldap

diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index 5e2210eb9f..a6d04ee1d9 100644
--- 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-2004 The OpenLDAP Foundation.
+## Copyright 2003-2007 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -14,30 +14,31 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 SRCS = overlays.c \
-	chain.c \
-	denyop.c \
+	accesslog.c \
+	auditlog.c \
+	constraint.c \
+	dds.c \
 	dyngroup.c \
-	glue.c \
-	lastmod.c \
+	dynlist.c \
 	pcache.c \
 	ppolicy.c \
 	refint.c \
+	retcode.c \
 	rwm.c rwmconf.c rwmdn.c rwmmap.c \
+	seqmod.c \
 	syncprov.c \
-	unique.c
-OBJS = overlays.lo \
-	chain.lo \
-	denyop.lo \
-	dyngroup.lo \
-	glue.lo \
-	lastmod.lo \
-	pcache.lo \
-	ppolicy.lo \
-	refint.lo \
-	rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo \
-	syncprov.lo \
-	unique.lo
-
+	translucent.c \
+	unique.c \
+	valsort.c
+OBJS = overlays.o \
+	statover.o \
+	@SLAPD_STATIC_OVERLAYS@
+
+# 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       
 LDAP_LIBDIR= ../../../libraries
 
@@ -53,39 +54,61 @@ PROGRAMS = @SLAPD_DYNAMIC_OVERLAYS@
 XINCPATH = -I.. -I$(srcdir)/..
 XDEFS = $(MODULES_CPPFLAGS)
 
-chain.la : chain.lo $(@PLAT@_LINK_LIBS)
-	$(LTLINK_MOD) -module -o $@ chain.lo version.lo $(LINK_LIBS)
+static:	$(LIBRARY)
 
-denyop.la : denyop.lo $(@PLAT@_LINK_LIBS)
-	$(LTLINK_MOD) -module -o $@ denyop.lo version.lo $(LINK_LIBS)
+dynamic: $(PROGRAMS)
 
-dyngroup.la : dyngroup.lo $(@PLAT@_LINK_LIBS)
-	$(LTLINK_MOD) -module -o $@ dyngroup.lo version.lo $(LINK_LIBS)
+accesslog.la : accesslog.lo
+	$(LTLINK_MOD) -module -o $@ accesslog.lo version.lo $(LINK_LIBS)
 
-glue.la : glue.lo $(@PLAT@_LINK_LIBS)
-	$(LTLINK_MOD) -module -o $@ glue.lo version.lo $(LINK_LIBS)
+auditlog.la : auditlog.lo
+	$(LTLINK_MOD) -module -o $@ auditlog.lo version.lo $(LINK_LIBS)
 
-lastmod.la : lastmod.lo $(@PLAT@_LINK_LIBS)
-	$(LTLINK_MOD) -module -o $@ lastmod.lo version.lo $(LINK_LIBS)
+constraint.la : constraint.lo
+	$(LTLINK_MOD) -module -o $@ constraint.lo version.lo $(LINK_LIBS)
 
-pcache.la : pcache.lo $(@PLAT@_LINK_LIBS)
+dds.la : dds.lo
+	$(LTLINK_MOD) -module -o $@ dds.lo version.lo $(LINK_LIBS)
+
+dyngroup.la : dyngroup.lo
+	$(LTLINK_MOD) -module -o $@ dyngroup.lo version.lo $(LINK_LIBS)
+
+dynlist.la : dynlist.lo
+	$(LTLINK_MOD) -module -o $@ dynlist.lo version.lo $(LINK_LIBS)
+
+pcache.la : pcache.lo
 	$(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)
+ppolicy.la : ppolicy.lo
+	$(LTLINK_MOD) -module -o $@ ppolicy.lo version.lo $(LINK_LIBS) $(MODULES_LIBS)
 
-refint.la : refint.lo $(@PLAT@_LINK_LIBS)
+refint.la : refint.lo
 	$(LTLINK_MOD) -module -o $@ refint.lo version.lo $(LINK_LIBS)
 
-rwm.la : rwm.lo $(@PLAT@_LINK_LIBS)
+retcode.la : retcode.lo
+	$(LTLINK_MOD) -module -o $@ retcode.lo version.lo $(LINK_LIBS)
+
+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)
 
-syncprov.la : syncprov.lo $(@PLAT@_LINK_LIBS)
+seqmod.la : seqmod.lo
+	$(LTLINK_MOD) -module -o $@ seqmod.lo version.lo $(LINK_LIBS)
+
+syncprov.la : syncprov.lo
 	$(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
 
-unique.la : unique.lo $(@PLAT@_LINK_LIBS)
+translucent.la : translucent.lo
+	$(LTLINK_MOD) -module -o $@ translucent.lo version.lo $(LINK_LIBS)
+
+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); \
@@ -97,8 +120,21 @@ MKDEPFLAG = -l
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-	$(LTCOMPILE_LIB) $<
+	$(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:
+	@if test -n "$(OBJS)"; then \
+	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
 
-$(LIBRARY): version.lo
-	$(LTLINK_LIB) -o $@ $(OBJS) version.lo
+veryclean-local:
+	$(RM) statover.c