From f8a5ce4a6e91953d6965f4571f562d85881f39c8 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Thu, 24 Mar 2011 06:49:04 +0000 Subject: [PATCH] ITS#6870 move ldif.c and fetch.c from liblutil to libldap --- libraries/libldap/Makefile.in | 4 ++-- libraries/{liblutil => libldap}/fetch.c | 0 libraries/{liblutil => libldap}/ldif.c | 0 libraries/libldap_r/Makefile.in | 4 ++-- libraries/liblutil/Makefile.in | 25 ++----------------------- 5 files changed, 6 insertions(+), 27 deletions(-) rename libraries/{liblutil => libldap}/fetch.c (100%) rename libraries/{liblutil => libldap}/ldif.c (100%) diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in index 4b71ddd800..782101d992 100644 --- a/libraries/libldap/Makefile.in +++ b/libraries/libldap/Makefile.in @@ -28,7 +28,7 @@ SRCS = bind.c open.c result.c error.c compare.c search.c \ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ tls2.c tls_o.c tls_g.c tls_m.c \ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ - assertion.c deref.c ldifutil.c + assertion.c deref.c ldifutil.c ldif.c fetch.c OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ controls.lo messages.lo references.lo extended.lo cyrus.lo \ @@ -41,7 +41,7 @@ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ tls2.lo tls_o.lo tls_g.lo tls_m.lo \ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ - assertion.lo deref.lo ldifutil.lo + assertion.lo deref.lo ldifutil.lo ldif.lo fetch.lo LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries diff --git a/libraries/liblutil/fetch.c b/libraries/libldap/fetch.c similarity index 100% rename from libraries/liblutil/fetch.c rename to libraries/libldap/fetch.c diff --git a/libraries/liblutil/ldif.c b/libraries/libldap/ldif.c similarity index 100% rename from libraries/liblutil/ldif.c rename to libraries/libldap/ldif.c diff --git a/libraries/libldap_r/Makefile.in b/libraries/libldap_r/Makefile.in index f5e9e8963b..de0d67b6f3 100644 --- a/libraries/libldap_r/Makefile.in +++ b/libraries/libldap_r/Makefile.in @@ -30,7 +30,7 @@ XXSRCS = apitest.c test.c \ charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \ tls2.c tls_o.c tls_g.c tls_m.c \ turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \ - assertion.c deref.c ldifutil.c + assertion.c deref.c ldifutil.c ldif.c fetch.c SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \ thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \ thr_pth.c thr_stub.c thr_debug.c @@ -48,7 +48,7 @@ OBJS = threads.lo rdwr.lo rmutex.lo tpool.lo rq.lo \ charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \ tls2.lo tls_o.lo tls_g.lo tls_m.lo \ turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \ - assertion.lo deref.lo ldifutil.lo + assertion.lo deref.lo ldifutil.lo ldif.lo fetch.lo LDAP_INCDIR= ../../include LDAP_LIBDIR= ../../libraries diff --git a/libraries/liblutil/Makefile.in b/libraries/liblutil/Makefile.in index ff7bc3a880..06da05c951 100644 --- a/libraries/liblutil/Makefile.in +++ b/libraries/liblutil/Makefile.in @@ -14,9 +14,6 @@ ## . LIBRARY = liblutil.a - -SHAREDLIB = libldif.la - PROGRAM = testavl LDAP_INCDIR= ../../include @@ -32,19 +29,17 @@ XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) SRCS = base64.c entropy.c sasl.c signal.c hash.c passfile.c \ md5.c passwd.c sha1.c getpass.c lockf.c utils.c uuid.c sockpair.c \ - avl.c tavl.c ldif.c fetch.c \ + avl.c tavl.c \ testavl.c \ meter.c \ @LIBSRCS@ $(@PLAT@_SRCS) OBJS = base64.o entropy.o sasl.o signal.o hash.o passfile.o \ md5.o passwd.o sha1.o getpass.o lockf.o utils.o uuid.o sockpair.o \ - avl.o tavl.o ldif.o fetch.o \ + avl.o tavl.o \ meter.o \ @LIBOBJS@ $(@PLAT@_OBJS) -SHAREDLIBOBJS = ldif.lo fetch.lo - testavl: $(XLIBS) testavl.o (LTLINK) -o $@ testavl.o $(LIBS) @@ -64,19 +59,3 @@ slapdmsg.res: slapdmsg.rc slapdmsg.bin clean-local: $(RM) *.res -all-local: $(SHAREDLIB) - -.SUFFIXES: .c .o .lo - -.c.lo: - $(LTCOMPILE_LIB) $< - -$(LIBRARY): $(SHAREDLIBOBJS) version.lo - -$(SHAREDLIB): $(SHAREDLIBOBJS) version.lo - $(LTLINK_LIB) -o $(SHAREDLIB) $(SHAREDLIBOBJS) version.lo $(LINK_LIBS) - -install-local: FORCE - -$(MKDIR) $(DESTDIR)$(libdir) - $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(SHAREDLIB) $(DESTDIR)$(libdir) - $(LTFINISH) $(DESTDIR)$(libdir) -- 2.39.5