Fix make depend for the whole server

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

diff --git a/CHANGES b/CHANGES
index 337d4721d31cadb074ef2d14fba6edf5cfe69e2c..08ab175c8db43176d804c4f6b893108181fa756f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,9 @@
 Changes with Apache 2.0b1
 
+  *) Do not try to run make depend if there are no .c files in the
+     current directory, doing so makes `make depend` fail.
+     [Ryan Bloom]
+
    *) Update highperformance.conf to work with either prefork or
       pthreads mpms.  [Greg Ames] 
 

diff --git a/build/rules.mk b/build/rules.mk
index 9c3b4e1d33794752ca8b27b12731b3435654f0b4..561cf5873b35c4e4e743f8a9299ef18295e8aa07 100644 (file)
--- a/build/rules.mk
+++ b/build/rules.mk
@@ -176,8 +176,10 @@ install-p: $(targets) $(install_targets)
 distclean-p depend-p clean-p:
 
 depend: depend-recursive
-       gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > $(builddir)/.deps || true
-#      test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps
+       if test "`find . -name "*.c" -maxdepth 1 -print`" != ""; then \
+           gcc -MM $(INCLUDES) $(EXTRA_INCLUDES) $(DEFS) $(CPPFLAGS) $(srcdir)/*.c | sed 's/\.o:/.lo:/' > $(builddir)/.deps || true;           \
+       fi
+#          test "`echo *.c`" = '*.c' || perl $(top_srcdir)/build/mkdep.perl $(CPP) $(INCLUDES) $(EXTRA_INCLUDES) *.c > .deps
 
 clean: clean-recursive clean-x