automated generation of .dummy files for each subdirectory;

dummy.in files are no longer needed, and new directories will be taken
care of automatically, at configure (or config.status --recheck) time
(This used to be commit 237a8e5fe62d757c04b8207cbbee4df1470cfe4e)

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 75b6d0a9ff3a41989d4dca46b61e159e026f2175..b3d047b1d14835e6e0ddf9b9d067cfd54d5d3f62 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -320,7 +320,7 @@ uninstallcp:
        @$(SHELL) $(srcdir)/script/uninstallcp.sh $(CODEPAGEDIR) $(CODEPAGELIST)
 
 clean: 
-       -rm -f core */*~ *~ */*.o $(PROGS) $(SPROGS)
+       -rm -f core */*~ *~ */*.o
 
 proto:
        @echo rebuilding include/proto.h
@@ -336,7 +336,7 @@ realclean: clean
        -rm -f config.log $(PROGS) $(SPROGS)
 
 distclean: realclean
-       -rm -f include/config.h include/stamp-h */dummy Makefile
+       -rm -f include/config.h include/stamp-h Makefile */.dummy
        -rm -f config.status config.cache
        -rm -rf .deps
 
@@ -378,6 +378,13 @@ $(srcdir)/include/stamp-h.in: @MAINT@ $(srcdir)/acconfig.h $(srcdir)/configure.i
        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
+
 # automatic dependency tracking rules
 .deps/.dummy:
        @-if test ! -d .deps; then rm -rf .deps; mkdir .deps; fi

diff --git a/source3/bin/dummy.in b/source3/bin/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/bin/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/client/dummy.in b/source3/client/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/client/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/codepages/dummy.in b/source3/codepages/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/codepages/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/configure b/source3/configure
index 9cac348e429e5ced7c5e65ed1ff8da2d0ae040b2..bea4852b2360213669fe687dc4e2b943c40c48fb 100755 (executable)
--- a/source3/configure
+++ b/source3/configure
@@ -5632,6 +5632,13 @@ 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
@@ -5733,11 +5740,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy
-web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy
-rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy
-script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy
-utils/dummy printing/dummy include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "$DUMMY_GEN Makefile include/stamp-h include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -5792,6 +5795,8 @@ 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
@@ -5833,11 +5838,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy
-web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy
-rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy
-script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy
-utils/dummy printing/dummy include/stamp-h"}
+CONFIG_FILES=\${CONFIG_FILES-"$DUMMY_GEN Makefile include/stamp-h"}
 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 37fd7db841e63330f8abcf14b634559f1283f9ae..f6483c6d3023e5798cdcd4b85f4e9ad6ad5afbdd 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -837,8 +837,11 @@ AC_TRY_RUN([#include "${srcdir-.}/tests/summary.c"],
            echo "configure OK";,
           AC_MSG_ERROR([summary failure. Aborting config]),:)
 
-AC_OUTPUT(Makefile tests/dummy client/dummy lib/dummy ubiqx/dummy
-web/dummy param/dummy nmbd/dummy smbd/dummy rpc_server/dummy
-rpc_client/dummy rpc_parse/dummy locking/dummy passdb/dummy
-script/dummy include/dummy codepages/dummy libsmb/dummy bin/dummy
-utils/dummy printing/dummy include/stamp-h)
+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)

diff --git a/source3/include/dummy.in b/source3/include/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/include/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/include/stamp-h.in b/source3/include/stamp-h.in
index 75ac9344846b4ad8fa1823c08abe96c533ce5a11..8b137891791fe96927ad78e64b0aad7bded08bdc 100644 (file)
--- a/source3/include/stamp-h.in
+++ b/source3/include/stamp-h.in
@@ -1,2 +1 @@
--rw-r--r--   1 oliva    pos          1394 Sep 21 08:00 acconfig.h
--rw-r--r--   1 oliva    pos         24688 Sep 21 08:11 configure.in
+

diff --git a/source3/lib/dummy.in b/source3/lib/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/lib/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/libsmb/dummy.in b/source3/libsmb/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/libsmb/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/locking/dummy.in b/source3/locking/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/locking/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/nmbd/dummy.in b/source3/nmbd/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/nmbd/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/param/dummy.in b/source3/param/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/param/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/passdb/dummy.in b/source3/passdb/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/passdb/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/printing/dummy.in b/source3/printing/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/printing/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/rpc_client/dummy.in b/source3/rpc_client/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/rpc_client/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/rpc_parse/dummy.in b/source3/rpc_parse/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/rpc_parse/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/rpc_server/dummy.in b/source3/rpc_server/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/rpc_server/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/script/dummy.in b/source3/script/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/script/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/smbd/dummy.in b/source3/smbd/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/smbd/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/tests/dummy.in b/source3/tests/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/tests/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/ubiqx/dummy.in b/source3/ubiqx/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/ubiqx/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/utils/dummy.in b/source3/utils/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/utils/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-

diff --git a/source3/web/dummy.in b/source3/web/dummy.in
deleted file mode 100644 (file)
index 8b13789..0000000
--- a/source3/web/dummy.in
+++ /dev/null
@@ -1 +0,0 @@
-