Fix include, clean up .o files in ../lib and ../libcli

Conflicts:

	source4/Makefile

diff --git a/source4/Makefile b/source4/Makefile
index 273be11e7cc6b23c9830318b568dc564180a100f..abb010e7608c1b04d70352939a541c85d4ffdd92 100644 (file)
--- a/source4/Makefile
+++ b/source4/Makefile
@@ -136,14 +136,13 @@ ifneq ($(SKIP_DEP_FILES),yes)
 clean::
        @echo Removing dependency files
        @find . -name '*.d' -o -name '*.hd' | xargs rm -f
-       @find ../lib -name '*.d' -o -name '*.hd' | xargs rm -f
 endif
 else
 include $(srcdir)/static_deps.mk
 endif
 
 clean::
-       @find ../lib ../libcli -name '*.o' -o -name '*.hd' | xargs rm -f
+       @find ../lib ../libcli -name '*.o' -o -name '*.ho' | xargs rm -f
 
 DEFAULT_HEADERS = $(srcdir)/../lib/util/dlinklist.h \
                  $(srcdir)/version.h

diff --git a/source4/include/includes.h b/source4/include/includes.h
index 1386ea510b9aa4992c125090b7a2c20a5c7e377f..7b623120a92e681fd084ad15a90207cf96aa7ce4 100644 (file)
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -43,6 +43,7 @@
 #define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
 #endif
 #include "../lib/util/util.h"
+#include "../lib/util/debug.h"
 
 #include "libcli/util/error.h"