X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2FMakefile.in;h=03b0f38bc90a4ea4a87566bd212466aaf7699fa8;hb=a720011c8a05d610c737c4e7e299b03506ce810f;hp=003706cfa2dfc063cd8ef150cb7e792518f395be;hpb=464fc6b68abab64cd09430b4b8fd3c7034452330;p=openldap

diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in
index 003706cfa2..03b0f38bc9 100644
--- a/servers/slapd/Makefile.in
+++ b/servers/slapd/Makefile.in
@@ -2,7 +2,7 @@
 # $OpenLDAP$
 ## This work is part of OpenLDAP Software <http://www.openldap.org/>.
 ##
-## Copyright 1998-2005 The OpenLDAP Foundation.
+## Copyright 1998-2006 The OpenLDAP Foundation.
 ## All rights reserved.
 ##
 ## Redistribution and use in source and binary forms, with or without
@@ -38,7 +38,7 @@ SRCS	= main.c globals.c bconfig.c config.c daemon.c \
 		backglue.c backover.c ctxcsn.c ldapsync.c frontend.c \
 		slapadd.c slapcat.c slapcommon.c slapdn.c slapindex.c \
 		slappasswd.c slaptest.c slapauth.c slapacl.c component.c \
-		aci.c alock.c \
+		aci.c alock.c txn.c \
 		$(@PLAT@_SRCS)
 
 OBJS	= main.o globals.o bconfig.o config.o daemon.o \
@@ -56,7 +56,7 @@ OBJS	= main.o globals.o bconfig.o config.o daemon.o \
 		backglue.o backover.o ctxcsn.o ldapsync.o frontend.o \
 		slapadd.o slapcat.o slapcommon.o slapdn.o slapindex.o \
 		slappasswd.o slaptest.o slapauth.o slapacl.o component.o \
-		aci.o alock.o \
+		aci.o alock.o txn.o \
 		$(@PLAT@_OBJS)
 
 LDAP_INCDIR= ../../include -I$(srcdir) -I$(srcdir)/slapi -I.
@@ -103,7 +103,7 @@ SLAPD_OBJECTS = $(@PLAT@_SLAPD_OBJECTS)
 # we want to export EVERY global symbol that it knows about (NOT including
 # symbols that are imported from other DLLs). The set of symbols to
 # export INCLUDES symbols from all static libraries that slapd gets
-# linked with, e.g. avl, ldbm, lunicode, lutil, etc. This list
+# linked with, e.g. avl, lunicode, lutil, etc. This list
 # will also include liblber and libldap_r if they were built as static
 # libraries. ALSO included will be symbols from other STATIC libraries
 # outside the domain of the OpenLDAP source tree, e.g. regex, ltdl,
@@ -168,7 +168,7 @@ slapd.def: libbackends.a liboverlays.a version.o
 		    done="" ;\
 		    base=`expr "$$i" : "-l\(.*\)"`; \
 		    for p in $$paths ; do \
-			for ext in la dll a ; do \
+			for ext in la dll dll.a a ; do \
 			    path=$$p/lib$$base.$$ext; \
 			    test ! -f $$path && continue; \
 			    if test $$ext = la ; then \
@@ -192,12 +192,14 @@ slapd.def: libbackends.a liboverlays.a version.o
 		    test -z "$$obj" && continue; \
 		    ;; \
 		*.la) \
-		    if test -n "$LTSTATIC"; then \
+		    if test -n "$(LTSTATIC)"; then \
 			    base=`expr "$$i" : ".*/\(.*\).la"`; \
 			    path=`expr "$$i" : "\(.*/\).*"`; \
 			    obj=$$path.libs/$$base.a; \
 		    fi; \
 		    ;; \
+		*.dll.a) \
+		    ;; \
 		*.o | *.a) \
 		    obj=$$i; \
 	    esac; \
@@ -335,7 +337,7 @@ backends.o: backends.c $(srcdir)/slap.h
 
 depend-local-srv: FORCE
 	@for i in $(SUBDIRS); do \
-		if test -d $$i -a -f $$i/Makefile ; then \
+		if test -d $$i && test -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) depend"; \
 			( cd $$i; $(MAKE) $(MFLAGS) depend ); \
 			if test $$? != 0 ; then exit 1; fi ; \
@@ -351,7 +353,7 @@ veryclean-local:
 
 clean-local-srv: FORCE
 	@for i in $(SUBDIRS); do \
-		if test -d $$i -a -f $$i/Makefile ; then \
+		if test -d $$i && test -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) clean ); \
 			if test $$? != 0 ; then exit 1; fi ; \
@@ -361,7 +363,7 @@ clean-local-srv: FORCE
 
 veryclean-local-srv: FORCE
 	@for i in $(SUBDIRS); do \
-		if test -d $$i -a -f $$i/Makefile ; then \
+		if test -d $$i && test -f $$i/Makefile ; then \
 			echo; echo "  cd $$i; $(MAKE) $(MFLAGS) clean"; \
 			( cd $$i; $(MAKE) $(MFLAGS) veryclean ); \
 		fi; \
@@ -376,7 +378,7 @@ install-slapd: FORCE
 	$(LTINSTALL) $(INSTALLFLAGS) $(STRIP) -m 755 \
 		slapd$(EXEEXT) $(DESTDIR)$(libexecdir)
 	@for i in $(SUBDIRS); do \
-	    if test -d $$i -a -f $$i/Makefile ; then \
+	    if test -d $$i && test -f $$i/Makefile ; then \
 		echo; echo "  cd $$i; $(MAKE) $(MFLAGS) install"; \
 		( cd $$i; $(MAKE) $(MFLAGS) install ); \
 		if test $$? != 0 ; then exit 1; fi ; \