mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-18 11:05:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

ITS#6870 move ldif.c and fetch.c from liblutil to libldap

Browse Source
This commit is contained in:
Howard Chu 2011-03-24 06:49:04 +00:00
parent fa8d57d492
commit f8a5ce4a6e
5 changed files with 6 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/libldap/Makefile.in
View File

@ -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 \ 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 \ tls2.c tls_o.c tls_g.c tls_m.c \
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.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 \ OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \
controls.lo messages.lo references.lo extended.lo cyrus.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 \ 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 \ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.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_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries

0
libraries/liblutil/fetch.c → libraries/libldap/fetch.c
View File

0
libraries/liblutil/ldif.c → libraries/libldap/ldif.c
View File

4
libraries/libldap_r/Makefile.in
View File

@ -30,7 +30,7 @@ XXSRCS = apitest.c test.c \
charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.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 \ tls2.c tls_o.c tls_g.c tls_m.c \
turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.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 \ SRCS = threads.c rdwr.c rmutex.c tpool.c rq.c \
thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \ thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
thr_pth.c thr_stub.c thr_debug.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 \ 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 \ tls2.lo tls_o.lo tls_g.lo tls_m.lo \
turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.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_INCDIR= ../../include
LDAP_LIBDIR= ../../libraries LDAP_LIBDIR= ../../libraries

25
libraries/liblutil/Makefile.in
View File

@ -14,9 +14,6 @@
## <http://www.OpenLDAP.org/license.html>. ## <http://www.OpenLDAP.org/license.html>.
LIBRARY = liblutil.a LIBRARY = liblutil.a
SHAREDLIB = libldif.la
PROGRAM = testavl PROGRAM = testavl
LDAP_INCDIR= ../../include 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 \ 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 \ 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 \ testavl.c \
meter.c \ meter.c \
@LIBSRCS@ $(@PLAT@_SRCS) @LIBSRCS@ $(@PLAT@_SRCS)
OBJS = base64.o entropy.o sasl.o signal.o hash.o passfile.o \ 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 \ 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 \ meter.o \
@LIBOBJS@ $(@PLAT@_OBJS) @LIBOBJS@ $(@PLAT@_OBJS)
SHAREDLIBOBJS = ldif.lo fetch.lo
testavl: $(XLIBS) testavl.o testavl: $(XLIBS) testavl.o
(LTLINK) -o $@ testavl.o $(LIBS) (LTLINK) -o $@ testavl.o $(LIBS)
@ -64,19 +59,3 @@ slapdmsg.res: slapdmsg.rc slapdmsg.bin
clean-local: clean-local:
$(RM) *.res $(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)