summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--Makefile9
-rw-r--r--rules.mk5
-rw-r--r--support/export/Makefile3
-rw-r--r--tools/rpcgen/Makefile2
-rw-r--r--utils/statd/Makefile2
6 files changed, 26 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 365a4a4..1aeb025 100644
--- 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 dcc6b36..6ea2767 100644
--- 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 27b81bc..7d0fc31 100644
--- 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 1243305..43c2d32 100644
--- 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 44d5dda..a4e4d17 100644
--- 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 03e97e0..444932f 100644
--- a/utils/statd/Makefile
+++ b/utils/statd/Makefile
@@ -56,3 +56,5 @@ clean::
distclean::
$(RM) $(RPCHDRS) $(RPCSRCS) $(SIMHDRS) $(SIMSRCS)
+
+predep:: $(RPCHDRS) $(RPCSRCS)