get away with dummy and .dummy files

(This used to be commit 90a8a02484a0897b053fd6531b7fec5d23098b6f)

20 files changed, 14 insertions, 45 deletions

diff --git a/source3/.cvsignore b/source3/.cvsignore
index 5104b86d5f..f68f2c2383 100644
--- a/source3/.cvsignore
+++ b/source3/.cvsignore
@@ -1,3 +1,4 @@
+.deps
 Makefile
 Makefile.RPM
 config
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 53a79d332f..aa1956cb59 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -222,9 +222,15 @@ all : CHECK $(SPROGS) $(PROGS)
 CHECK:
 	@echo "Using FLAGS = $(FLAGS)"
 	@echo "Using LIBS = $(LIBS)"
+	@(cd $(srcdir) && ls -1d */*.c) | sed 's,/[^/]*$$,,;s,^$$,.,' | \
+	 while read dir; do \
+	   if test ! -d "$$dir"; then mkdir "$$dir" || true; else true; fi; \
+	 done
 
 .c.o: @MAINT@ .deps/.dummy
 	@echo Compiling $*.c
+	@dir=`echo $@ | sed 's,/[^/]*$$,,;s,^$$,.,'` && \
+	   if test ! -d "$$dir"; then mkdir "$$dir" || true; else true; fi
 	@$(CC) -I. -I$(srcdir) $(FLAGS) -c $< -o $@ \
 	@MAINT@ -Wp,-MD,.deps/`echo $* | sed s,/,_,g`.P && : >.deps/.stamp
 # the line above is for atomatic dependency tracking
@@ -358,7 +364,7 @@ realclean: clean
 	-rm -f config.log $(PROGS) $(SPROGS)
 
 distclean: realclean
-	-rm -f include/config.h include/stamp-h Makefile */.dummy
+	-rm -f include/config.h include/stamp-h Makefile
 	-rm -f config.status config.cache
 	-rm -rf .deps
 
@@ -381,7 +387,8 @@ $(srcdir)/configure: @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4
 config.status: $(srcdir)/configure
 	$(SHELL) ./config.status --recheck
 
-Makefile: $(srcdir)/Makefile.in config.status
+Makefile: $(srcdir)/Makefile.in config.status \
+	  include/stamp-h # just to ensure that config.h is up-to-date
 	CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 # note that nothing depends on config.h, so will probably be rebuilt
@@ -398,14 +405,7 @@ $(srcdir)/include/config.h.in: $(srcdir)/include/stamp-h.in
 
 $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.in
 	cd $(srcdir) && $(AUTOHEADER)
-	@cd $(srcdir) && echo > include/stamp-h.in
-
-DUMMY_FILES = @DUMMY_FILES@
-DUMMY_BASE = @DUMMY_BASE@
-
-Makefile: $(DUMMY_FILES)
-$(DUMMY_FILES):
-	CONFIG_FILES=$@$(DUMMY_BASE) CONFIG_HEADERS= $(SHELL) ./config.status
+	@date -u > $@
 
 # automatic dependency tracking rules
 .deps/.dummy:
diff --git a/source3/bin/.cvsignore b/source3/bin/.cvsignore
index 65115de4e0..0038aca110 100644
--- a/source3/bin/.cvsignore
+++ b/source3/bin/.cvsignore
@@ -1,4 +1,3 @@
-dummy
 make_printerdef
 make_smbcodepage
 nmbd
diff --git a/source3/client/.cvsignore b/source3/client/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/client/.cvsignore
+++ b/source3/client/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/codepages/.cvsignore b/source3/codepages/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/codepages/.cvsignore
+++ b/source3/codepages/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/configure b/source3/configure
index 4324e826a1..e4b5faa6a1 100755
--- a/source3/configure
+++ b/source3/configure
@@ -5668,13 +5668,6 @@ rm -fr conftest*
 fi
 
 
-DUMMY_FILES=`cd ${srcdir-.} >/dev/null &&
-	     echo */. | sed 's, ,dummy ,g;s,$,dummy,'`
-
-DUMMY_BASE=:include/stamp-h.in
-
-
-DUMMY_GEN=`echo "$DUMMY_FILES" | sed "s, ,$DUMMY_BASE ,g;s,\$,$DUMMY_BASE,"`
 trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -5776,7 +5769,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "$DUMMY_GEN Makefile include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "include/stamp-h Makefile include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -5832,8 +5825,6 @@ s%@AUTOCONF@%$AUTOCONF%g
 s%@AUTOHEADER@%$AUTOHEADER%g
 s%@CPP@%$CPP%g
 s%@LIBOBJS@%$LIBOBJS%g
-s%@DUMMY_FILES@%$DUMMY_FILES%g
-s%@DUMMY_BASE@%$DUMMY_BASE%g
 
 CEOF
 EOF
@@ -5875,7 +5866,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"$DUMMY_GEN Makefile include/stamp-h"}
+CONFIG_FILES=\${CONFIG_FILES-"include/stamp-h Makefile"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
diff --git a/source3/configure.in b/source3/configure.in
index 797a8f9407..30eb5d14d9 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -860,11 +860,4 @@ AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"],
            echo "configure OK";,
 	   AC_MSG_ERROR([summary failure. Aborting config]),:)
 
-DUMMY_FILES=`cd ${srcdir-.} >/dev/null &&
-	     echo */. | sed 's, ,dummy ,g;s,$,dummy,'`
-AC_SUBST(DUMMY_FILES)
-DUMMY_BASE=:include/stamp-h.in
-AC_SUBST(DUMMY_BASE)
-
-DUMMY_GEN=`echo "$DUMMY_FILES" | sed "s, ,$DUMMY_BASE ,g;s,\$,$DUMMY_BASE,"`
-AC_OUTPUT($DUMMY_GEN Makefile include/stamp-h)
+AC_OUTPUT(include/stamp-h Makefile)
diff --git a/source3/include/.cvsignore b/source3/include/.cvsignore
index 10c58ff061..0e56cf2f8c 100644
--- a/source3/include/.cvsignore
+++ b/source3/include/.cvsignore
@@ -1,2 +1 @@
 config.h
-dummy
diff --git a/source3/lib/.cvsignore b/source3/lib/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/lib/.cvsignore
+++ b/source3/lib/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/libsmb/.cvsignore b/source3/libsmb/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/libsmb/.cvsignore
+++ b/source3/libsmb/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/nmbd/.cvsignore b/source3/nmbd/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/nmbd/.cvsignore
+++ b/source3/nmbd/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/param/.cvsignore b/source3/param/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/param/.cvsignore
+++ b/source3/param/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/printing/.cvsignore b/source3/printing/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/printing/.cvsignore
+++ b/source3/printing/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/rpc_parse/.cvsignore b/source3/rpc_parse/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/rpc_parse/.cvsignore
+++ b/source3/rpc_parse/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/rpc_server/.cvsignore b/source3/rpc_server/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/rpc_server/.cvsignore
+++ b/source3/rpc_server/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/script/.cvsignore b/source3/script/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/script/.cvsignore
+++ b/source3/script/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/smbd/.cvsignore b/source3/smbd/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/smbd/.cvsignore
+++ b/source3/smbd/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/tests/.cvsignore b/source3/tests/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/tests/.cvsignore
+++ b/source3/tests/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/ubiqx/.cvsignore b/source3/ubiqx/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/ubiqx/.cvsignore
+++ b/source3/ubiqx/.cvsignore
@@ -1 +0,0 @@
-dummy
diff --git a/source3/web/.cvsignore b/source3/web/.cvsignore
index 421376db9e..e69de29bb2 100644
--- a/source3/web/.cvsignore
+++ b/source3/web/.cvsignore
@@ -1 +0,0 @@
-dummy