From: Alexandre Oliva Date: Tue, 29 Sep 1998 04:52:17 +0000 (+0000) Subject: get away with dummy and .dummy files X-Git-Tag: prerelease-2-2-5pre1~5605 X-Git-Url: http://git.samba.org/samba.git/?p=tprouty%2Fsamba.git;a=commitdiff_plain;h=90a8a02484a0897b053fd6531b7fec5d23098b6f get away with dummy and .dummy files --- diff --git a/source/.cvsignore b/source/.cvsignore index 5104b86d5f..f68f2c2383 100644 --- a/source/.cvsignore +++ b/source/.cvsignore @@ -1,3 +1,4 @@ +.deps Makefile Makefile.RPM config diff --git a/source/Makefile.in b/source/Makefile.in index 53a79d332f..aa1956cb59 100644 --- a/source/Makefile.in +++ b/source/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/source/bin/.cvsignore b/source/bin/.cvsignore index 65115de4e0..0038aca110 100644 --- a/source/bin/.cvsignore +++ b/source/bin/.cvsignore @@ -1,4 +1,3 @@ -dummy make_printerdef make_smbcodepage nmbd diff --git a/source/client/.cvsignore b/source/client/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/client/.cvsignore +++ b/source/client/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/codepages/.cvsignore b/source/codepages/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/codepages/.cvsignore +++ b/source/codepages/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/configure b/source/configure index 4324e826a1..e4b5faa6a1 100755 --- a/source/configure +++ b/source/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 <> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then diff --git a/source/configure.in b/source/configure.in index 797a8f9407..30eb5d14d9 100644 --- a/source/configure.in +++ b/source/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/source/include/.cvsignore b/source/include/.cvsignore index 10c58ff061..0e56cf2f8c 100644 --- a/source/include/.cvsignore +++ b/source/include/.cvsignore @@ -1,2 +1 @@ config.h -dummy diff --git a/source/lib/.cvsignore b/source/lib/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/lib/.cvsignore +++ b/source/lib/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/libsmb/.cvsignore b/source/libsmb/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/libsmb/.cvsignore +++ b/source/libsmb/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/nmbd/.cvsignore b/source/nmbd/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/nmbd/.cvsignore +++ b/source/nmbd/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/param/.cvsignore b/source/param/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/param/.cvsignore +++ b/source/param/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/printing/.cvsignore b/source/printing/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/printing/.cvsignore +++ b/source/printing/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/rpc_parse/.cvsignore b/source/rpc_parse/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/rpc_parse/.cvsignore +++ b/source/rpc_parse/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/rpc_server/.cvsignore b/source/rpc_server/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/rpc_server/.cvsignore +++ b/source/rpc_server/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/script/.cvsignore b/source/script/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/script/.cvsignore +++ b/source/script/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/smbd/.cvsignore b/source/smbd/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/smbd/.cvsignore +++ b/source/smbd/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/tests/.cvsignore b/source/tests/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/tests/.cvsignore +++ b/source/tests/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/ubiqx/.cvsignore b/source/ubiqx/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/ubiqx/.cvsignore +++ b/source/ubiqx/.cvsignore @@ -1 +0,0 @@ -dummy diff --git a/source/web/.cvsignore b/source/web/.cvsignore index 421376db9e..e69de29bb2 100644 --- a/source/web/.cvsignore +++ b/source/web/.cvsignore @@ -1 +0,0 @@ -dummy