diff --git a/Makefile b/Makefile index 5282ec03..f51d33ed 100644 --- a/Makefile +++ b/Makefile @@ -144,13 +144,17 @@ uninstall: uninstall-exec uninstall-data uninstall-dev clean: +$(MAKE) -C plugins $@ +ifndef LIBITE +$(MAKE) -C libite $@ +endif +$(MAKE) -C libuev $@ -@$(RM) $(OBJS) $(DEPS) $(EXEC) 2>/dev/null distclean: clean +$(MAKE) -C plugins $@ +ifndef LIBITE +$(MAKE) -C libite $@ +endif +$(MAKE) -C libuev $@ -@$(RM) $(JUNK) config.mk config.h unittest *.o *.html 2>/dev/null diff --git a/configure b/configure index 67866505..0fa86654 100755 --- a/configure +++ b/configure @@ -325,7 +325,6 @@ done # If no arguments given to configure script, use defaults defaults -result ############################################################################## echo "# Generated by finit configure script." > config.mk @@ -449,3 +448,16 @@ echo "#define RUNLEVEL $runlevel" >> config.h echo >> config.h echo "#endif /* FINIT_CONFIG_H_ */" >> config.h + +# Call configure in local libite if --with-libite is not selected +if [ x"$libite" = x"" ]; then + set -e + cd libite + test -e Makefile && make distclean >/dev/null + ./autogen.sh + ./configure + set +e +fi + +# Show resulting config +result