Fix LBER_ERROR vs. -1 confusion.

[openldap] / servers / slapd / back-monitor / Makefile.in

diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in
index d8bcbd0fb2a4710289beef47103772e3cb961d2b..78457c9433169f2a19719e0056ee8c1ac4f83e3a 100644 (file)
--- a/servers/slapd/back-monitor/Makefile.in
+++ b/servers/slapd/back-monitor/Makefile.in
@@ -1,35 +1,33 @@
 # $OpenLDAP$
 
-SRCS = init.c search.c compare.c abandon.c \
+SRCS = init.c search.c compare.c modify.c bind.c \
+       operational.c \
        cache.c entry.c \
-       backend.c database.c thread.c conn.c rww.c \
-       dummy.c
-OBJS = init.o search.o compare.o abandon.o \
-       cache.o entry.o \
-       backend.o database.o thread.o conn.o rww.o \
-       dummy.o
-
-LDAP_INCDIR= ../../../include       
+       backend.c database.c thread.c conn.c rww.c log.c \
+       operation.c sent.c listener.c time.c
+OBJS = init.lo search.lo compare.lo modify.lo bind.lo \
+       operational.lo \
+       cache.lo entry.lo \
+       backend.lo database.lo thread.lo conn.lo rww.lo log.lo \
+       operation.lo sent.lo listener.lo time.lo
+
+LDAP_INCDIR= ../../../include
 LDAP_LIBDIR= ../../../libraries
 
 BUILD_OPT = "--enable-monitor"
 BUILD_MOD = @BUILD_MONITOR@
-LINKAGE = @BUILD_MONITOR_DYNAMIC@
+BUILD_MOD_DYNAMIC = @BUILD_MONITOR_DYNAMIC@
 
-DYN_DEFS = -DLBER_DECL=dllimport -DLDAP_DECL=dllimport
+mod_DEFS = -DSLAPD_IMPORT
+MOD_DEFS = $(@BUILD_MONITOR@_DEFS)
 
-# TODO
-#NT_mod_DYN_MODDEFS    =
-#NT_mod_STAT_MODDEFS   =
-
-NT_yes_DYN_MODDEFS     = $(DYN_DEFS)
-NT_yes_STAT_MODDEFS    =
-
-MODDEFS = $(@PLAT@_@BUILD_MONITOR@_@LIB_LINKAGE@_MODDEFS)
+shared_LDAP_LIBS = $(LDAP_LIBLDAP_R_LA) $(LDAP_LIBLBER_LA)
+NT_LINK_LIBS = -L.. -lslapd $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
+UNIX_LINK_LIBS = $(@BUILD_LIBS_DYNAMIC@_LDAP_LIBS)
 
 LIBBASE = back_monitor
 
-XINCPATH = -I.. -I$(srcdir)/..
+XINCPATH = -I.. -I$(srcdir)/.. -I../slapi
 XDEFS = $(MODULES_CPPFLAGS)
 
 all-local-lib: ../.backend