ITS#3773 additional fix

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

diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in
index 52e1bcfbff661c052ff05f5a800a5073c5db9b80..bd356d0c5f521ead71f028843f2a51571bbe1c4a 100644 (file)
--- a/servers/slapd/overlays/Makefile.in
+++ b/servers/slapd/overlays/Makefile.in
@@ -14,6 +14,7 @@
 ## <http://www.OpenLDAP.org/license.html>.
 
 SRCS = overlays.c \
+       accesslog.c \
        denyop.c \
        dyngroup.c \
        dynlist.c \
@@ -26,9 +27,10 @@ SRCS = overlays.c \
        syncprov.c \
        translucent.c \
        unique.c
-OBJS = overlays.lo \
+OBJS = overlays.o \
        @SLAPD_STATIC_OVERLAYS@
 
+LTONLY_MOD = $(LTONLY_mod)
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
 
@@ -48,43 +50,47 @@ static:     $(LIBRARY)
 
 dynamic: $(PROGRAMS)
 
-denyop.la : denyop.lo $(@PLAT@_LINK_LIBS)
+accesslog.la : accesslog.lo
+       $(LTLINK_MOD) -module -o $@ accesslog.lo version.lo $(LINK_LIBS)
+
+denyop.la : denyop.lo
        $(LTLINK_MOD) -module -o $@ denyop.lo version.lo $(LINK_LIBS)
 
-dyngroup.la : dyngroup.lo $(@PLAT@_LINK_LIBS)
+dyngroup.la : dyngroup.lo
        $(LTLINK_MOD) -module -o $@ dyngroup.lo version.lo $(LINK_LIBS)
 
-dynlist.la : dynlist.lo $(@PLAT@_LINK_LIBS)
+dynlist.la : dynlist.lo
        $(LTLINK_MOD) -module -o $@ dynlist.lo version.lo $(LINK_LIBS)
 
-glue.la : glue.lo $(@PLAT@_LINK_LIBS)
+glue.la : glue.lo
        $(LTLINK_MOD) -module -o $@ glue.lo version.lo $(LINK_LIBS)
 
-lastmod.la : lastmod.lo $(@PLAT@_LINK_LIBS)
+lastmod.la : lastmod.lo
        $(LTLINK_MOD) -module -o $@ lastmod.lo version.lo $(LINK_LIBS)
 
-pcache.la : pcache.lo $(@PLAT@_LINK_LIBS)
+pcache.la : pcache.lo
        $(LTLINK_MOD) -module -o $@ pcache.lo version.lo $(LINK_LIBS)
 
-ppolicy.la : ppolicy.lo $(@PLAT@_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_x.o: rwm.lo rwmconf.lo rwmdn.lo rwmmap.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 $(@PLAT@_LINK_LIBS)
-       $(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo version.lo $(LINK_LIBS)
+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)
 
-syncprov.la : syncprov.lo $(@PLAT@_LINK_LIBS)
+syncprov.la : syncprov.lo
        $(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
 
-translucent.la : translucent.lo $(@PLAT@_LINK_LIBS)
+translucent.la : translucent.lo
        $(LTLINK_MOD) -module -o $@ translucent.lo version.lo $(LINK_LIBS)
 
-unique.la : unique.lo $(@PLAT@_LINK_LIBS)
+unique.la : unique.lo
        $(LTLINK_MOD) -module -o $@ unique.lo version.lo $(LINK_LIBS)
 
 install-local: $(PROGRAMS)
@@ -98,8 +104,16 @@ MKDEPFLAG = -l
 .SUFFIXES: .c .o .lo
 
 .c.lo:
-       $(LTCOMPILE_LIB) $<
-
-$(LIBRARY): version.lo
-       $(LTLINK_LIB) -o $@ $(OBJS) version.lo
+       $(LTCOMPILE_MOD) $<
+
+$(LIBRARY): $(OBJS) version.lo
+       $(AR) rs $@ $(OBJS)
+
+# Must fixup depends for non-libtool objects
+depend-local:
+       @if test -n "$(OBJS)"; then \
+       OBJ2=`echo $(OBJS) | $(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