Sync with HEAD

[openldap] / libraries / liblber / Makefile.in

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index c43adbd9f092afd298e3fa8c3d4910a7b0bb326c..eca79a80ae92de1f83dfa35b265aa43be7fbaa58 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -1,49 +1,52 @@
+# LIBLBER
 # $OpenLDAP$
-## Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
-## COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## LIBLBER
+## Copyright 1998-2003 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
 
 NT_SRCS = nt_err.c
 NT_OBJS = nt_err.lo
 
-SRCS= assert.c decode.c encode.c io.c bprint.c \
+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 \
+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)
 
-LINKAGE = @LT_LIB_LINKAGE@
-
-NT_DYN_TEST_DEFS = -DLBER_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
-       $(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) $(DESTDIR)$(libdir)
        $(LTINSTALL) $(INSTALLFLAGS) -m 644 $(LIBRARY) $(DESTDIR)$(libdir)
+       $(LTFINISH) $(DESTDIR)$(libdir)