X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=libraries%2Fliblber%2FMakefile.in;h=dbe51598855e215c1231c7c250dec53c97482db8;hb=0355abeb1a0ea471970c5313a69ce5b20916b408;hp=1b5523d2f6d112baf9cb94c4e73cf2b034d85090;hpb=f999e1350d0f0f18f6a7b297cb57db398f963878;p=openldap

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index 1b5523d2f6..dbe5159885 100644
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -1,32 +1,52 @@
-## Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+# LIBLBER
+# $OpenLDAP$
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## LIBLBER
+## Copyright 1998-2007 The OpenLDAP Foundation.
+## All rights reserved.
 ##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted only as authorized by the OpenLDAP
+## Public License.
+##
+## A copy of this license is available in the file LICENSE in the
+## top-level directory of the distribution or, alternatively, at
+## <http://www.OpenLDAP.org/license.html>.
 
 LIBRARY = liblber.la
-XLIBRARY = ../liblber.a
 
-SRCS= assert.c decode.c encode.c io.c bprint.c options.c sockbuf.c
-OBJS= assert.lo decode.lo encode.lo io.lo bprint.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 = 
+NT_LINK_LIBS = $(AC_LIBS)
 
-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)
+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) $(libdir)
-	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(libdir)
+	-$(MKDIR) $(DESTDIR)$(libdir)
+	$(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+	$(LTFINISH) $(DESTDIR)$(libdir)