From 4cc7efdadc08ef665d59caed103d715a67c0aa43 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 26 Aug 2005 02:20:45 +0000 Subject: [PATCH] Revert ITS#3577 patch, breaks Windows build and not needed in RE23. --- build/top.mk | 4 ++-- configure.in | 2 +- libraries/librewrite/Makefile.in | 11 +++-------- servers/slapd/back-meta/Makefile.in | 3 +-- servers/slapd/overlays/Makefile.in | 3 +-- 5 files changed, 8 insertions(+), 15 deletions(-) diff --git a/build/top.mk b/build/top.mk index 1a9d11cb02..c836f374ee 100644 --- a/build/top.mk +++ b/build/top.mk @@ -161,7 +161,7 @@ LDAP_LIBLBER_LA = $(LDAP_LIBDIR)/liblber/liblber.la LDAP_LIBLDAP_LA = $(LDAP_LIBDIR)/libldap/libldap.la LDAP_LIBLDAP_R_LA = $(LDAP_LIBDIR)/libldap_r/libldap_r.la -LDAP_LIBLREWRITE_LA = $(LDAP_LIBDIR)/librewrite/liblrewrite.la +LDAP_LIBREWRITE_A = $(LDAP_LIBDIR)/librewrite/librewrite.a LDAP_LIBLUNICODE_A = $(LDAP_LIBDIR)/liblunicode/liblunicode.a LDAP_LIBLUTIL_A = $(LDAP_LIBDIR)/liblutil/liblutil.a @@ -169,7 +169,7 @@ LDAP_L = $(LDAP_LIBLUTIL_A) \ $(LDAP_LIBLDAP_LA) $(LDAP_LIBLBER_LA) SLURPD_L = $(LDAP_LIBLUTIL_A) \ $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) -SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBLREWRITE_LA) \ +SLAPD_L = $(LDAP_LIBLUNICODE_A) $(LDAP_LIBREWRITE_A) \ $(SLURPD_L) WRAP_LIBS = @WRAP_LIBS@ diff --git a/configure.in b/configure.in index 420943373e..c26e2c5a32 100644 --- a/configure.in +++ b/configure.in @@ -3168,7 +3168,7 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk] [libraries/libldap_r/Makefile:build/top.mk:libraries/libldap_r/Makefile.in:build/lib.mk:build/lib-shared.mk] [libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk] [libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk] -[libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-shared.mk] +[libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk] [servers/Makefile:build/top.mk:servers/Makefile.in:build/dir.mk] [servers/slapd/Makefile:build/top.mk:servers/slapd/Makefile.in:build/srv.mk] [servers/slapd/back-bdb/Makefile:build/top.mk:servers/slapd/back-bdb/Makefile.in:build/mod.mk] diff --git a/libraries/librewrite/Makefile.in b/libraries/librewrite/Makefile.in index bb3b8272f2..7c32249068 100644 --- a/libraries/librewrite/Makefile.in +++ b/libraries/librewrite/Makefile.in @@ -20,13 +20,13 @@ SRCS = config.c context.c info.c ldapmap.c map.c params.c rule.c \ session.c subst.c var.c xmap.c \ parse.c rewrite.c XSRCS = version.c -OBJS = config.lo context.lo info.lo ldapmap.lo map.lo params.lo rule.lo \ - session.lo subst.lo var.lo xmap.lo +OBJS = config.o context.o info.o ldapmap.o map.o params.o rule.o \ + session.o subst.o var.o xmap.o LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries -LIBRARY = liblrewrite.la +LIBRARY = librewrite.a PROGRAMS = rewrite XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A) \ $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) @@ -35,8 +35,3 @@ XXXLIBS = $(LTHREAD_LIBS) rewrite: $(XLIBS) rewrite.o parse.o $(LTLINK) -o $@ rewrite.o parse.o $(LIBS) - -install-local: FORCE - -$(MKDIR) $(DESTDIR)$(libdir) - $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir) - $(LTFINISH) $(DESTDIR)$(libdir) diff --git a/servers/slapd/back-meta/Makefile.in b/servers/slapd/back-meta/Makefile.in index 46be0895a5..1292b4c858 100644 --- a/servers/slapd/back-meta/Makefile.in +++ b/servers/slapd/back-meta/Makefile.in @@ -29,8 +29,7 @@ BUILD_MOD = @BUILD_META@ mod_DEFS = -DSLAPD_IMPORT MOD_DEFS = $(@BUILD_META@_DEFS) -shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) \ - $(LDAP_LIBLREWRITE_LA) +shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA) NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS) diff --git a/servers/slapd/overlays/Makefile.in b/servers/slapd/overlays/Makefile.in index e1caea4dc0..59547e22fe 100644 --- a/servers/slapd/overlays/Makefile.in +++ b/servers/slapd/overlays/Makefile.in @@ -90,8 +90,7 @@ 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) syncprov.la : syncprov.lo $(LTLINK_MOD) -module -o $@ syncprov.lo version.lo $(LINK_LIBS) -- 2.39.5