Fix ITS#2142

[openldap] / libraries / liblber / Makefile.in

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index 33459b7a91af363266ff5a128e636015aa9df091..cae30fbc5496645bf8837f513578edd61cab5462 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -1,33 +1,41 @@
 # $OpenLDAP$
-## Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+## Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
 ## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
 ##
 ## LIBLBER
 ##
 
 LIBRARY = liblber.la
-XLIBRARY = ../liblber.a
 
-SRCS= assert.c decode.c encode.c io.c bprint.c \
-       memory.c options.c sockbuf.c
-OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo \
-       memory.lo options.lo sockbuf.lo
+NT_SRCS = nt_err.c
+NT_OBJS = nt_err.lo
+
+UNIX_SRCS = stdio.c
+UNIX_OBJS = stdio.lo
+
+LIB_DEFS = -DLBER_LIBRARY
+
+SRCS= assert.c decode.c encode.c io.c bprint.c debug.c \
+       memory.c options.c sockbuf.c $(@PLAT@_SRCS)
+OBJS= assert.lo decode.lo encode.lo io.lo bprint.lo debug.lo\
+       memory.lo options.lo sockbuf.lo $(@PLAT@_OBJS)
 XSRCS= version.c
 
 PROGRAMS= dtest etest idtest
 
-LDAP_INCDIR= ../../include       
-LDAP_LIBDIR= ../../libraries       
+LDAP_INCDIR= ../../include
+LDAP_LIBDIR= ../../libraries
 
-XLIBS = -llber
+XLIBS = $(LIBRARY) $(LDAP_LIBLUTIL_A)
 XXLIBS = 
-
-dtest:    $(LIBRARY) dtest.o
-       $(LTLINK) $(LDFLAGS) -o $@ dtest.o $(LIBS)
-etest:  $(LIBRARY) etest.o
-       $(LTLINK) $(LDFLAGS) -o $@ etest.o $(LIBS)
-idtest:  $(LIBRARY) idtest.o
-       $(LTLINK) $(LDFLAGS) -o $@ idtest.o $(LIBS)
+NT_LINK_LIBS = $(AC_LIBS)
+
+dtest:    $(XLIBS) dtest.o
+       $(LTLINK) -o $@ dtest.o $(LIBS)
+etest:  $(XLIBS) etest.o
+       $(LTLINK) -o $@ etest.o $(LIBS)
+idtest:  $(XLIBS) idtest.o
+       $(LTLINK) -o $@ idtest.o $(LIBS)
 
 install-local: FORCE
        -$(MKDIR) $(DESTDIR)$(libdir)