Commit fa33d45c authored by Sascha Schumann's avatar Sascha Schumann
Browse files

Move the generating empty deps stuff into fastgen.sh. The .deps files 

are only used by Makefiles which are created by fastgen.sh, so fastgen
is the natural place to create them.

The "portable dirname" regex has been changed to remove any number of
trailing slashes. Just in case. :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85139 13f79535-47bb-0310-9956-ffa450edef68
parent f5e77430

build/fastgen.sh

+3 −2
Original line number Original line Diff line number Diff line
@@ -72,8 +72,7 @@ fi 




for makefile in $@; do

for makefile in $@; do

  echo "creating $makefile"

  echo "creating $makefile"

# portable dirname

  dir=`echo $makefile|sed 's%/*[^/][^/]*$%%'`

  dir=`echo $makefile|sed -e 's%[^/][^/]*$%%' -e 's%/$%%'`

  test -d "$dir/" || $mkdir_p "$dir/"

  test -d "$dir/" || $mkdir_p "$dir/"





  (cat <<EOF

  (cat <<EOF
@@ -85,4 +84,6 @@ VPATH = $top_srcdir/$dir 
EOF

EOF

)| cat - $top_srcdir/$makefile.in > $makefile

)| cat - $top_srcdir/$makefile.in > $makefile





  touch "$top_builddir/$dir/.deps"



done
 
done

build/rules.mk

+1 −2
Original line number Original line Diff line number Diff line
@@ -113,7 +113,6 @@ distclean-recursive depend-recursive clean-recursive all-recursive install-recur 
			ok=yes; \

			ok=yes; \

			target="$$target-p"; \

			target="$$target-p"; \

		fi; \

		fi; \

		if test ! -f $$i/.deps; then touch $$i/.deps; fi; \

		(cd $$i && $(MAKE) $$target) || exit 1; \

		(cd $$i && $(MAKE) $$target) || exit 1; \

	done; \

	done; \

	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi;\

	if test "$$otarget" = "all" && test -z '$(targets)'; then ok=yes; fi;\
@@ -131,7 +130,7 @@ install-p: $(targets) $(install_targets) 
distclean-p depend-p clean-p:

distclean-p depend-p clean-p:





depend: depend-recursive

depend: depend-recursive

	gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c > $(builddir)/.deps

	gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c > $(builddir)/.deps || true

#	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps

#	test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps





clean: clean-recursive clean-x

clean: clean-recursive clean-x