diff --git a/build/mod.mk b/build/mod.mk index a50918a184..f616f3f192 100644 --- a/build/mod.mk +++ b/build/mod.mk @@ -17,7 +17,7 @@ # LIBRARY = $(LIBBASE).la -LIBSTAT = lib$(LIBBASE).a +LIBSTAT = libobj.a MKDEPFLAG = -l diff --git a/servers/slapd/Makefile.in b/servers/slapd/Makefile.in index ffd0aba861..d21ff84309 100644 --- a/servers/slapd/Makefile.in +++ b/servers/slapd/Makefile.in @@ -15,7 +15,7 @@ SLAPTOOLS=slapadd slapcat slapdn slapindex slapmodify slappasswd slaptest slapauth slapacl slapschema PROGRAMS=slapd $(SLAPTOOLS) -XPROGRAMS=sslapd libbackends.a .backend liboverlays.a +XPROGRAMS=sslapd libbackends.a liboverlays.a XSRCS=version.c SUBDIRS=back-* slapi overlays pwmods @@ -66,6 +66,7 @@ SLAP_DIR= SLAPD_STATIC_DEPENDS=@SLAPD_NO_STATIC@ libbackends.a liboverlays.a SLAPD_STATIC_BACKENDS=@SLAPD_STATIC_BACKENDS@ SLAPD_DYNAMIC_BACKENDS=@SLAPD_DYNAMIC_BACKENDS@ +SLAPD_STATIC_TARGETS:=$(SLAPD_STATIC_BACKENDS:%=%/libobj.a) SLAPI_LIBS=@LIBSLAPI@ @SLAPI_LIBS@ @@ -273,9 +274,11 @@ slapd: $(SLAPD_DEPENDS) @LIBSLAPI@ sslapd: version.o $(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS) $(WRAP_LIBS) -dummy $(SLAPD_DYNAMIC_BACKENDS): slapd +dummy $(SLAPD_DYNAMIC_BACKENDS): slapd FORCE cd $@ && $(MAKE) $(MFLAGS) all - @touch $@ + +$(SLAPD_STATIC_TARGETS): FORCE + cd $(@D) && $(MAKE) $(MFLAGS) all dynamic_overlays: slapd cd overlays && $(MAKE) $(MFLAGS) dynamic @@ -287,23 +290,10 @@ dynamic_pwmods: slapd # In Windows, dynamic backends have to be built after slapd. For this # reason, we only build static backends now and dynamic backends later. # -.backend: FORCE - @if test -n "$(SLAPD_STATIC_BACKENDS)"; then \ - echo "building static backends..."; \ - for i in XX $(SLAPD_STATIC_BACKENDS); do \ - if test $$i != XX; then \ - echo " "; echo " cd $$i && $(MAKE) $(MFLAGS) all"; \ - ( cd $$i && $(MAKE) $(MFLAGS) all ); \ - if test $$? != 0; then exit 1; fi; \ - fi; \ - done; \ - echo " "; \ - fi - -libbackends.a: .backend +libbackends.a: $(SLAPD_STATIC_TARGETS) @$(RM) -r tmp @$(MKDIR) tmp - @-for i in back-*/*.a; do \ + @-for i in $?; do \ ( \ cd tmp; \ $(AR) x ../$$i; \ @@ -311,13 +301,12 @@ libbackends.a: .backend for j in *.o; do \ mv $$j $${pre}$$j; \ done; \ - $(AR) ruv libbackends.a *.o 2>&1 | grep -v truncated; \ + $(AR) ruv ../libbackends.a *.o 2>&1 | grep -v truncated; \ $(RM) *.o __.SYMDEF ________64ELEL_ ; \ echo "added backend library $$i"; \ echo ""; \ ); \ done - @mv -f tmp/libbackends.a ./libbackends.a @$(RM) -r tmp @if test ! -z "$(RANLIB)" ; then \ $(RANLIB) libbackends.a; \ diff --git a/servers/slapd/back-asyncmeta/Makefile.in b/servers/slapd/back-asyncmeta/Makefile.in index ee35d4611b..7c8ae3e56d 100644 --- a/servers/slapd/back-asyncmeta/Makefile.in +++ b/servers/slapd/back-asyncmeta/Makefile.in @@ -44,7 +44,5 @@ LIBBASE = back_asyncmeta XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend +all-local-lib: libobj.a -../.backend: lib$(LIBBASE).a - @touch $@ diff --git a/servers/slapd/back-dnssrv/Makefile.in b/servers/slapd/back-dnssrv/Makefile.in index 0e2211ceb8..1dfd9c8ea1 100644 --- a/servers/slapd/back-dnssrv/Makefile.in +++ b/servers/slapd/back-dnssrv/Makefile.in @@ -39,8 +39,5 @@ LIBBASE = back_dnssrv XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-ldap/Makefile.in b/servers/slapd/back-ldap/Makefile.in index 1c2cc98fec..d0a1915155 100644 --- a/servers/slapd/back-ldap/Makefile.in +++ b/servers/slapd/back-ldap/Makefile.in @@ -38,8 +38,5 @@ LIBBASE = back_ldap XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-ldif/Makefile.in b/servers/slapd/back-ldif/Makefile.in index 8879c2b40c..aa952cdf68 100644 --- a/servers/slapd/back-ldif/Makefile.in +++ b/servers/slapd/back-ldif/Makefile.in @@ -34,8 +34,5 @@ LIBBASE = back_ldif XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-mdb/Makefile.in b/servers/slapd/back-mdb/Makefile.in index 8bece419e7..a1193c9844 100644 --- a/servers/slapd/back-mdb/Makefile.in +++ b/servers/slapd/back-mdb/Makefile.in @@ -47,10 +47,7 @@ LIBBASE = back_mdb XINCPATH = -I.. -I$(srcdir)/.. -I$(MDB_SUBDIR) XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a mdb.lo: $(MDB_SUBDIR)/mdb.c $(LTCOMPILE_MOD) $(MDB_SUBDIR)/mdb.c diff --git a/servers/slapd/back-meta/Makefile.in b/servers/slapd/back-meta/Makefile.in index 5c68d6ed86..6894c06c13 100644 --- a/servers/slapd/back-meta/Makefile.in +++ b/servers/slapd/back-meta/Makefile.in @@ -38,8 +38,5 @@ LIBBASE = back_meta XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-monitor/Makefile.in b/servers/slapd/back-monitor/Makefile.in index 8d2d4f6ae2..cfdcf22fd9 100644 --- a/servers/slapd/back-monitor/Makefile.in +++ b/servers/slapd/back-monitor/Makefile.in @@ -42,8 +42,5 @@ LIBBASE = back_monitor XINCPATH = -I.. -I$(srcdir)/.. -I$(srcdir)/../slapi XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-null/Makefile.in b/servers/slapd/back-null/Makefile.in index da73a42946..d048efa143 100644 --- a/servers/slapd/back-null/Makefile.in +++ b/servers/slapd/back-null/Makefile.in @@ -34,8 +34,5 @@ LIBBASE = back_null XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-passwd/Makefile.in b/servers/slapd/back-passwd/Makefile.in index 0c61ef8819..e3d66a5057 100644 --- a/servers/slapd/back-passwd/Makefile.in +++ b/servers/slapd/back-passwd/Makefile.in @@ -34,8 +34,5 @@ LIBBASE = back_passwd XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-relay/Makefile.in b/servers/slapd/back-relay/Makefile.in index 0bb40b91e2..29a19437b4 100644 --- a/servers/slapd/back-relay/Makefile.in +++ b/servers/slapd/back-relay/Makefile.in @@ -34,8 +34,5 @@ LIBBASE = back_relay XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-sock/Makefile.in b/servers/slapd/back-sock/Makefile.in index 1b74639e18..0ab413aac8 100644 --- a/servers/slapd/back-sock/Makefile.in +++ b/servers/slapd/back-sock/Makefile.in @@ -40,8 +40,5 @@ LIBBASE = back_sock XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-sql/Makefile.in b/servers/slapd/back-sql/Makefile.in index 930ba2cca1..fdd3cb68d8 100644 --- a/servers/slapd/back-sql/Makefile.in +++ b/servers/slapd/back-sql/Makefile.in @@ -38,8 +38,5 @@ LIBBASE = back_sql XINCPATH = -I.. -I$(srcdir)/.. $(SLAPD_SQL_INCLUDES) XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a diff --git a/servers/slapd/back-wt/Makefile.in b/servers/slapd/back-wt/Makefile.in index b0d02ebb1e..b88e15e064 100644 --- a/servers/slapd/back-wt/Makefile.in +++ b/servers/slapd/back-wt/Makefile.in @@ -47,8 +47,5 @@ LIBBASE = back_wt XINCPATH = -I.. -I$(srcdir)/.. XDEFS = $(MODULES_CPPFLAGS) -all-local-lib: ../.backend - -../.backend: lib$(LIBBASE).a - @touch $@ +all-local-lib: libobj.a