From 2911b792ca979dd9c9715e55f92097791b4ce837 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 11 Oct 2008 21:33:55 +0200
Subject: Fix include, clean up .o files in ../lib and ../libcli

Conflicts:

	source4/Makefile
---
 source4/Makefile           | 3 +--
 source4/include/includes.h | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4')

diff --git a/source4/Makefile b/source4/Makefile
index 273be11e7c..abb010e760 100644
--- 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 1386ea510b..7b623120a9 100644
--- 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"
 
-- 
cgit