Makefile changes.

diff --git a/ChangeLog b/ChangeLog
index 365a4a4508826c5722373600f9ac0b115808fd06..1aeb0254bd42a81a907238aca6389911658cb945 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
        Release 1.0.6
 
+       * rules.mk: Add dep: rule when no OBJS, so "make dep" works in
+       support/include, and depend in "predep"
+       * support/export/Makefile, tools/rpcgen/Makefile,
+       utils/statd/Makefile: add "predep" rule so that "make dep" works.
+       * Makefile: allow a simple "make" to run ./configure and "make dep"
+       if needed.
        * configure.in, nfs-utils.spec: Update version to 1.0.4
        * run autoconf
        

diff --git a/Makefile b/Makefile
index dcc6b361eeeb357f65fd1dadc9e598e8d69130eb..6ea27671d07156a8e463ee9d5d39f60ed59c13a2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,17 @@
 SUBDIRS        = tools support utils
 TOP    = 
 
+all:: config.mk utils/statd/.depend
+
 include $(TOP)rules.mk
 
+
+config.mk:
+       ./configure
+
+utils/statd/.depend:
+       $(MAKE) $(MFLAGS) dep
+
 distclean clean::
        rm -f postscript/*.ps
        rm -f LOG make.log

diff --git a/rules.mk b/rules.mk
index 27b81bc68e96fd355a5eb496c3ce3bc2bd2df1e8..7d0fc31ffb85f8b399b979a7ec8b79f7a9274db1 100644 (file)
--- a/rules.mk
+++ b/rules.mk
@@ -118,8 +118,11 @@ endif
 # Handling of dependencies
 ##################################################################
 ifneq ($(OBJS),)
-depend dep::
+predep::
+depend dep:: predep
        $(CC) $(CFLAGS) -M $(OBJS:.o=.c) > .depend
+else
+depend dep::
 endif
 
 ifeq (.depend,$(wildcard .depend))

diff --git a/support/export/Makefile b/support/export/Makefile
index 1243305eab62d4f38038a0ba54ff52bb54d08f15..43c2d3277bf7dc39c25aba1a3e0a9833c4d3c1d8 100644 (file)
--- a/support/export/Makefile
+++ b/support/export/Makefile
@@ -25,3 +25,6 @@ clean distclean::
 
 install::
        @:
+
+predep:: $(RPCHDRS) $(RPCSRCS)
+       $(LN_S) ../export/mount.h ../include/mount.h

diff --git a/tools/rpcgen/Makefile b/tools/rpcgen/Makefile
index 44d5dda50d0e23ece7da522b66e06b6be3ba39e6..a4e4d1722f61eaea424119e15e1bd88bc93bbad6 100644 (file)
--- a/tools/rpcgen/Makefile
+++ b/tools/rpcgen/Makefile
@@ -55,3 +55,5 @@ all:: $(TOOL)
 
 install::
        @:
+
+predep::all

diff --git a/utils/statd/Makefile b/utils/statd/Makefile
index 03e97e038c5d578c35b77dae86a5ed86a7841763..444932f6c9a7c487fffd81982339700db9c1a3f1 100644 (file)
--- a/utils/statd/Makefile
+++ b/utils/statd/Makefile
@@ -56,3 +56,5 @@ clean::
 
 distclean::
        $(RM) $(RPCHDRS) $(RPCSRCS) $(SIMHDRS) $(SIMSRCS)
+
+predep:: $(RPCHDRS) $(RPCSRCS)