Move remainder of config/Makefile to Makefile

Everything except clean was already being handled by the top level
Makefile, so move the last bits there, and delete config/Makefile.

Signed-off-by: Rob Browning <rlb@defaultvalue.org>
Tested-by: Rob Browning <rlb@defaultvalue.org>

diff --git a/Makefile b/Makefile
index b2f337ab5602b64207217d636a6a0deb1c511cac..11f5881cc930ed5e99833674000cf4e7e837dd47 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -110,11 +110,6 @@ install: all
        $(INSTALL) -pm 0644 \
                lib/web/*.html \
                $(LIBDIR)/web/
-%/all:
-       $(MAKE) -C $* all
-
-%/clean:
-       $(MAKE) -C $* clean
 
 config/config.h: config/config.vars
 
@@ -256,7 +251,9 @@ import-docs: Documentation/clean
        $(pf); git archive origin/html | (cd Documentation && tar -xvf -)
        $(pf); git archive origin/man | (cd Documentation && tar -xvf -)
 
-clean: Documentation/clean config/clean
+clean: Documentation/clean
+       cd config && rm -f *~ .*~ \
+         ${CONFIGURE_DETRITUS} ${CONFIGURE_FILES} ${GENERATED_FILES}
        rm -f *.o lib/*/*.o *.so lib/*/*.so *.dll lib/*/*.dll *.exe \
                .*~ *~ */*~ lib/*/*~ lib/*/*/*~ \
                *.pyc */*.pyc lib/*/*.pyc lib/*/*/*.pyc \

diff --git a/config/Makefile b/config/Makefile
deleted file mode 100644 (file)
index b13891c..0000000
--- a/config/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
--include config.vars
-
-config.h: configure configure.inc $(wildcard *.in)
-       MAKE=${MAKE} ./configure
-
-clean:
-       rm -f ${CONFIGURE_FILES} ${CONFIGURE_DETRITUS} ${GENERATED_FILES}
-       rm -f *~ .*~