Commit b9764fff authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Back out paralyzing changes.

parent 5692be1f
......@@ -13,10 +13,6 @@ SUBDIRS= include libraries clients servers tests doc
CLEANDIRS= contrib
INSTALLDIRS=
libraries: include
clients servers: libraries
tests: clients servers
makefiles: FORCE
./config.status
......
......@@ -7,11 +7,12 @@
##
all-common install-common clean-common veryclean-common depend-common: FORCE
@T=`echo $@ | cut -d- -f1`; echo "Making $$T in `$(PWD)`"; \
$(MAKE) $(MFLAGS) $(SUBDIRS) TARG=$$T
$(SUBDIRS): FORCE
@echo " Entering subdirectory $@"; cd $@; $(MAKE) $(MFLAGS) $(TARG); \
echo ""
@t=`echo $@ | cut -d- -f1`; \
echo "Making $$t in `$(PWD)`"; \
for i in $(SUBDIRS); do \
echo " Entering subdirectory $$i to execute:"; \
echo " $(MAKE) $(MFLAGS) $$t"; \
( cd $$i; $(MAKE) $(MFLAGS) $$t ); \
done
Makefile: $(top_srcdir)/build/dir.mk
......@@ -5,4 +5,3 @@
SUBDIRS= liblutil libldif liblber libldap libavl libldbm libldap_r
libldap libldap_r: liblber
......@@ -36,27 +36,29 @@ XXXLIBS = $(LTHREAD_LIBS)
BUILD_OPT = "--enable-slapd"
BUILD_SRV = @BUILD_SLAPD@
BACKENDS=back-*
all-local-srv: FORCE
$(MAKE) $(MFLAGS) backendslib
$(MAKE) $(MFLAGS) slapd
(cd tools; $(MAKE) $(MFLAGS) all)
$(MAKE) $(MFLAGS) all-cffiles
all-local-srv: slapd all-cffiles tools
tools: libbackends.a
slapd: version.o libbackends.a
slapd: version.o
$(LTLINK) -o $@ $(OBJS) version.o $(LIBS)
sslapd: version.o libbackends.a
sslapd: version.o
$(LTLINK) -static -o $@ $(OBJS) version.o $(LIBS)
$(BACKENDS) tools: FORCE
@ if [ -d $@ ]; then \
echo " "; echo " cd $@; $(MAKE) $(MFLAGS) all"; \
cd $@; $(MAKE) $(MFLAGS) all ; \
fi
.backend:
backendslib: FORCE
@for i in back-*; do \
if [ -d $$i ]; then \
echo " "; echo " cd $$i; $(MAKE) $(MFLAGS) all"; \
( cd $$i; $(MAKE) $(MFLAGS) all ); \
fi; \
done; \
echo " "; \
$(MAKE) $(MFLAGS) libbackends.a
libbackends.a: .backend $(BACKENDS)
libbackends.a: .backend
@$(RM) -r tmp
@$(MKDIR) tmp
@-for i in back-*/*.a; do \
......@@ -148,3 +150,15 @@ install-conf: FORCE
install-tools: FORCE
@-$(MKDIR) $(sbindir)
(cd tools; $(MAKE) $(MFLAGS) install)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment