s/slapentry/slapadd/

[openldap] / libraries / libldap / Makefile.in

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index 9b7524c7693e69811a6620f3a92680ea0ddda681..2603785cea2ee095895928ad98adf9d3bbc357f0 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -1,49 +1,62 @@
+## Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## Makefile.in for LDAP -lldap
 ##
-LIBRARY = libldap.a
-PROGRAMS = apitest ltest ttest
-
-LDAP_INCDIR= ../../include       
-LDAP_LIBDIR= ../../libraries
+LIBRARY = libldap.la
+XLIBRARY = ../libldap.a
 
+PROGRAMS = apitest ltest ttest
 
 SRCS   = bind.c open.c result.c error.c compare.c search.c \
+       controls.c messages.c references.c extended.c \
        modify.c add.c modrdn.c delete.c abandon.c ufn.c cache.c \
-       getfilter.c sbind.c kbind.c unbind.c friendly.c cldap.c \
+       getfilter.c sasl.c sbind.c kbind.c unbind.c friendly.c cldap.c \
        free.c disptmpl.c srchpref.c dsparse.c tmplout.c sort.c \
        getdn.c getentry.c getattr.c getvalues.c addentry.c \
        request.c getdxbyname.c os-ip.c url.c charset.c \
-       init.c options.c
-OBJS   = bind.o open.o result.o error.o compare.o search.o \
-       modify.o add.o modrdn.o delete.o abandon.o ufn.o cache.o \
-       getfilter.o sbind.o kbind.o unbind.o friendly.o cldap.o \
-       free.o disptmpl.o srchpref.o dsparse.o tmplout.o sort.o \
-       getdn.o getentry.o getattr.o getvalues.o addentry.o \
-       request.o getdxbyname.o os-ip.o url.o charset.o \
-       init.o options.o
-
-LIBS = -L$(LDAP_LIBDIR) -lldap -llber $(AC_LIBS)
-LIBLBER = ../liblber/liblber.a
-
-apitest:       $(LIBRARY) apitest.o $(LIBLBER)
-       $(CC) $(LDFLAGS) -o $@ apitest.o $(LIBS)
-ltest: $(LIBRARY) test.o $(LIBLBER)
-       $(CC) $(LDFLAGS) -o $@ test.o $(LIBS)
-ttest: $(LIBRARY) tmpltest.o $(LIBLBER)
-       $(CC) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
-
-CFFILES= ldapfilter.conf ldapfriendly ldaptemplates.conf ldapsearchprefs.conf
-
-install-local: $(LIBRARY) $(CFFILES) FORCE
-       -$(MKDIR) -p $(libdir)
-       $(INSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
-       @(cd /tmp; $(RANLIB) $(libdir)/$(LIBRARY))
-       -$(MKDIR) -p $(sysconfdir)
+       init.c options.c print.c string.c util-int.c schema.c \
+       charray.c digest.c tls.c
+OBJS   = bind.lo open.lo result.lo error.lo compare.lo search.lo \
+       controls.lo messages.lo references.lo extended.lo \
+       modify.lo add.lo modrdn.lo delete.lo abandon.lo ufn.lo cache.lo \
+       getfilter.lo sasl.lo sbind.lo kbind.lo unbind.lo friendly.lo cldap.lo \
+       free.lo disptmpl.lo srchpref.lo dsparse.lo tmplout.lo sort.lo \
+       getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \
+       request.lo getdxbyname.lo os-ip.lo url.lo charset.lo \
+       init.lo options.lo print.lo string.lo util-int.lo schema.lo \
+       charray.lo digest.lo tls.lo
+
+LDAP_INCDIR= ../../include       
+LDAP_LIBDIR= ../../libraries
+
+XLIBS = -lldap -llber
+XXLIBS = $(SECURITY_LIBS) $(TLS_LIBS)
+
+apitest:       $(LIBRARY) apitest.o $(LDAP_LIBLBER_DEPEND)
+       $(LTLINK) $(LDFLAGS) -o $@ apitest.o $(LIBS)
+ltest: $(LIBRARY) test.o $(LDAP_LIBLBER_DEPEND)
+       $(LTLINK) $(LDFLAGS) -o $@ test.o $(LIBS)
+ttest: $(LIBRARY) tmpltest.o $(LDAP_LIBLBER_DEPEND)
+       $(LTLINK) $(LDFLAGS) -o $@ tmpltest.o $(LIBS)
+
+CFFILES=ldap.conf ldapfilter.conf ldaptemplates.conf ldapsearchprefs.conf
+
+install-local: $(CFFILES) FORCE
+       -$(MKDIR) $(libdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+       -$(MKDIR) $(sysconfdir)
        @for i in $(CFFILES); do \
-               echo "installing $$i in $(sysconfdir)"; \
-               if test -f $(sysconfdir)/$$i; then \
-                       $(MV) $(sysconfdir)/$$i $(sysconfdir)/$$i-; \
+               if test ! -f $(sysconfdir)/$$i; then \
+                       echo "installing $$i in $(sysconfdir)"; \
+                       echo "$(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i"; \
+                       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i; \
+               else \
+                       echo "PRESERVING EXISTING CONFIGURATION FILE $(sysconfdir)/$$i" ; \
                fi; \
-               $(INSTALL) $(INSTALLFLAGS) -m 644 $$i $(sysconfdir); \
+               $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/$$i $(sysconfdir)/$$i.default; \
        done
+       -$(MKDIR) $(datadir)
+       -$(MV) $(datadir)/ldapfriendly $(datadir)/ldapfriendly-
+       $(INSTALL) $(INSTALLFLAGS) -m 644 $(srcdir)/ldapfriendly $(datadir)/ldapfriendly
+