Makefile changes.
authorneilbrown <neilbrown>
Sun, 14 Sep 2003 23:45:21 +0000 (23:45 +0000)
committerneilbrown <neilbrown>
Sun, 14 Sep 2003 23:45:21 +0000 (23:45 +0000)
ChangeLog
Makefile
rules.mk
support/export/Makefile
tools/rpcgen/Makefile
utils/statd/Makefile

index 365a4a4..1aeb025 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
        
index dcc6b36..6ea2767 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
index 27b81bc..7d0fc31 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))
index 1243305..43c2d32 100644 (file)
@@ -25,3 +25,6 @@ clean distclean::
 
 install::
        @:
+
+predep:: $(RPCHDRS) $(RPCSRCS)
+       $(LN_S) ../export/mount.h ../include/mount.h
index 44d5dda..a4e4d17 100644 (file)
@@ -55,3 +55,5 @@ all:: $(TOOL)
 
 install::
        @:
+
+predep::all
index 03e97e0..444932f 100644 (file)
@@ -56,3 +56,5 @@ clean::
 
 distclean::
        $(RM) $(RPCHDRS) $(RPCSRCS) $(SIMHDRS) $(SIMSRCS)
+
+predep:: $(RPCHDRS) $(RPCSRCS)