Move schema needed by slapd to core.schema so that only one file

[openldap] / libraries / liblber / Makefile.in

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index ef1f8a02c933fa1388538fb4372ebda782725654..0c687d843de72f4753f905e37eee9d1f8d95d240 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -1,4 +1,5 @@
-## Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+# $OpenLDAP$
+## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## LIBLBER
@@ -7,8 +8,13 @@
 LIBRARY = liblber.la
 XLIBRARY = ../liblber.a
 
-SRCS= decode.c encode.c io.c bprint.c options.c
-OBJS= decode.lo encode.lo io.lo bprint.lo options.lo
+NT_SRCS = nt_err.c
+NT_OBJS = nt_err.lo
+
+SRCS= assert.c decode.c encode.c io.c bprint.c \
+       memory.c options.c sockbuf.c $(@PLAT@_SRCS)
+OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo \
+       memory.lo options.lo sockbuf.lo $(@PLAT@_OBJS)
 XSRCS= version.c
 
 PROGRAMS= dtest etest idtest
@@ -19,6 +25,17 @@ LDAP_LIBDIR= ../../libraries
 XLIBS = -llber
 XXLIBS = 
 
+LINKAGE = @LT_LIB_LINKAGE@
+
+NT_DYN_TEST_DEFS = -DLIBLBER_DECL=dllimport
+
+# Extras for building the library
+EXTRA_DEFS = $(@PLAT@_@LIB_LINKAGE@_LIB_DEFS)
+EXTRA_LIBS =
+
+# Only the test programs will pick up these defs.
+CPPFLAGS = $(@PLAT@_@LIB_LINKAGE@_TEST_DEFS)
+
 dtest:    $(LIBRARY) dtest.o
        $(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)
 etest:  $(LIBRARY) etest.o
@@ -27,6 +44,6 @@ idtest:  $(LIBRARY) idtest.o
        $(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)
 
 install-local: FORCE
-       -$(MKDIR) $(libdir)
-       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+       -$(MKDIR) $(DESTDIR)$(libdir)
+       $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)