Move some more rules to rules.mk

(This used to be commit 2ff3f72fd2559051000c34da9fcd5602514595e4)

diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in
index ceadc3d9d6cebb56e102ba6015aa6853e76cfc37..a8555d992fe74422a8de5b137f8169a63cfcc379 100644 (file)
--- a/source4/lib/ldb/Makefile.in
+++ b/source4/lib/ldb/Makefile.in
@@ -19,6 +19,8 @@ SWIG = swig
 EXTRA_OBJ=@EXTRA_OBJ@
 TESTS=test-tdb.sh @TESTS@
 PACKAGE_VERSION = @PACKAGE_VERSION@
+tdbdir = @tdbdir@
+tallocdir = @tallocdir@
 
 TALLOC_LIBS = @TALLOC_LIBS@
 TALLOC_CFLAGS = @TALLOC_CFLAGS@
@@ -65,6 +67,8 @@ DIRS = lib bin common ldb_tdb ldb_ldap ldb_sqlite3 modules tools examples
 
 default: all
 
+include rules.mk
+
 nss: nssdir all $(NSS_LIB)
 
 nssdir:
@@ -108,7 +112,6 @@ clean::
        rm -rf tests/schema/
 
 distclean:: clean
-       rm -f *~ */*~
        rm -rf bin lib
        rm -f config.log config.status config.cache include/config.h
        rm -f ldb.pc
@@ -117,15 +120,15 @@ distclean:: clean
 realdistclean:: distclean
        rm -f configure.in include/config.h.in
 
-check:: test check-soloading
+check:: test
 
 check-soloading: sample_module.$(SHLIBEXT)
        LDB_MODULES_PATH=$(builddir) $(srcdir)/tests/test-soloading.sh
 
-test: all check-soloading
+test:: all check-soloading
        for t in $(TESTS); do echo STARTING $${t}; $(srcdir)/tests/$${t} || exit 1; done
 
-valgrindtest: all
+valgrindtest:: all
        for t in $(TESTS); do echo STARTING $${t}; VALGRIND="valgrind -q --db-attach=yes --num-callers=30" $(srcdir)/tests/$${t} || exit 1; done
 
 installcheck:: install test
@@ -158,4 +161,3 @@ gcov::
        $(GCOV) -po tools $(srcdir)/tools/*.c 2| tee tools.report.gcov
 
 include ldb.mk
-include rules.mk

diff --git a/source4/lib/ldb/rules.mk b/source4/lib/ldb/rules.mk
index 3e5b3b652f5c04f37ddd1aa3ad4a0f67f59890d2..534ba016ab7df25ab58a157816ac427441e8e7e2 100644 (file)
--- a/source4/lib/ldb/rules.mk
+++ b/source4/lib/ldb/rules.mk
@@ -26,4 +26,5 @@ showflags::
        @echo '  CFLAGS = $(CFLAGS)'
        @echo '  LIBS = $(LIBS)'
 
-
+distclean::
+       rm -f *~ */*~