diff --git a/Makefile b/Makefile index 9799798c..03ddb924 100644 --- a/Makefile +++ b/Makefile @@ -147,7 +147,9 @@ clean: ifndef LIBITE +$(MAKE) -C libite $@ endif +ifndef LIBUEV +$(MAKE) -C libuev $@ +endif -@$(RM) $(OBJS) $(DEPS) $(EXEC) 2>/dev/null distclean: clean @@ -155,7 +157,9 @@ distclean: clean ifndef LIBITE +$(MAKE) -C libite $@ endif +ifndef LIBUEV +$(MAKE) -C libuev $@ +endif -@$(RM) $(JUNK) config.mk config.h unittest *.o *.html 2>/dev/null check: diff --git a/configure b/configure index 0fa86654..03f257a7 100755 --- a/configure +++ b/configure @@ -456,6 +456,18 @@ if [ x"$libite" = x"" ]; then test -e Makefile && make distclean >/dev/null ./autogen.sh ./configure + cd - + set +e +fi + +# Call configure in local libuev if --with-libuev is not selected +if [ x"$libuev" = x"" ]; then + set -e + cd libuev + test -e Makefile && make distclean >/dev/null + ./autogen.sh + ./configure + cd - set +e fi