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 77d559143432fd5f208ddbac682012a1ab81696e..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 \
@@ -29,6 +30,7 @@ SRCS = overlays.c \
 OBJS = overlays.o \
        @SLAPD_STATIC_OVERLAYS@
 
+LTONLY_MOD = $(LTONLY_mod)
 LDAP_INCDIR= ../../../include       
 LDAP_LIBDIR= ../../../libraries
 
@@ -48,6 +50,9 @@ static:       $(LIBRARY)
 
 dynamic: $(PROGRAMS)
 
+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)
 
@@ -76,7 +81,8 @@ 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)
+       $(LTLINK_MOD) -module -o $@ rwm.lo rwmconf.lo rwmdn.lo rwmmap.lo \
+               version.lo $(LINK_LIBS) $(LDAP_LIBLREWRITE_LA)
 
 syncprov.la : syncprov.lo
        $(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS)
@@ -100,6 +106,14 @@ MKDEPFLAG = -l
 .c.lo:
        $(LTCOMPILE_MOD) $<
 
-$(LIBRARY): version.lo
+$(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
+