Added TOP, as needed, for easier compile in subdirectories

diff --git a/support/Makefile b/support/Makefile
index aa56fa7fc4c66fff18b4d33f3557da61385d3367..f3013a9f04dd8599431c11843dac1c1c50c75044 100644 (file)
--- a/support/Makefile
+++ b/support/Makefile
@@ -2,6 +2,7 @@
 # Makefile for linux-nfs/support
 #
 
 # Makefile for linux-nfs/support
 #
 

+    TOP = ../

 SUBDIRS        = include nfs export lib misc rpc gssapi
 .DEFAULT: all
 
 SUBDIRS        = include nfs export lib misc rpc gssapi
 .DEFAULT: all
 

diff --git a/support/export/Makefile b/support/export/Makefile
index 43c2d3277bf7dc39c25aba1a3e0a9833c4d3c1d8..353dd00bebad0dfd9ca4c4978e94875b38e3cf54 100644 (file)
--- a/support/export/Makefile
+++ b/support/export/Makefile
@@ -4,6 +4,7 @@
 # of NFS volumes.
 #
 
 # of NFS volumes.
 #
 

+TOP    = ../../

 LIBNAME        = libexport.a
 SRCS   = $(RPCSRCS) client.c export.c hostname.c nfsctl.c rmtab.c \
          xtab.c
 LIBNAME        = libexport.a
 SRCS   = $(RPCSRCS) client.c export.c hostname.c nfsctl.c rmtab.c \
          xtab.c

diff --git a/support/gssapi/Makefile b/support/gssapi/Makefile
index 65271f0a377519c7ef88908bdc43508189fa2263..bc1464741ecf90a3739b2bef6ebda47628db4f89 100644 (file)
--- a/support/gssapi/Makefile
+++ b/support/gssapi/Makefile
@@ -2,7 +2,7 @@
 # libgssapi.a
 # gssapi mechanism-switching layer
 #
 # libgssapi.a
 # gssapi mechanism-switching layer
 #

-
+TOP    = ../../

 LIBNAME        = libgssapi.a
 SRCS   = g_accept_sec_context.c g_acquire_cred.c g_compare_name.c \
        g_context_time.c g_delete_sec_context.c g_dsp_name.c g_dsp_status.c \
 LIBNAME        = libgssapi.a
 SRCS   = g_accept_sec_context.c g_acquire_cred.c g_compare_name.c \
        g_context_time.c g_delete_sec_context.c g_dsp_name.c g_dsp_status.c \

diff --git a/support/include/Makefile b/support/include/Makefile
index e1cbfc4a04a0b286e2b77075205253d1bf8fbfa5..5b3d221bf21bc6d5e4c378f08ffceba742719d55 100644 (file)
--- a/support/include/Makefile
+++ b/support/include/Makefile
@@ -2,6 +2,8 @@
 # Makefile for linux-nfs/support
 #
 
 # Makefile for linux-nfs/support
 #
 

+TOP     = ../../
+

 include $(TOP)rules.mk
 
 all install::  mount.h
 include $(TOP)rules.mk
 
 all install::  mount.h

diff --git a/support/lib/Makefile b/support/lib/Makefile
index 58c84f80632eb3861a1d4f52135e0ef41a9470dd..43a7ab7c6dc848c042967c11099c52a7be9771fa 100644 (file)
--- a/support/lib/Makefile
+++ b/support/lib/Makefile
@@ -1,4 +1,5 @@
 
 

+TOP    = ../../

 include        $(TOP)rules.mk
 
 LIBS   = libnfs.a libexport.a libmisc.a librpc.a libgssapi.a
 include        $(TOP)rules.mk
 
 LIBS   = libnfs.a libexport.a libmisc.a librpc.a libgssapi.a

diff --git a/support/misc/Makefile b/support/misc/Makefile
index c738564130e5b5339068434baadcedf6a5da6598..0a0e371ec9768a2826f39e7e38d753dd1c9b66e2 100644 (file)
--- a/support/misc/Makefile
+++ b/support/misc/Makefile
@@ -2,6 +2,7 @@
 # linux-nfs/support/misc/Makefile
 #
 
 # linux-nfs/support/misc/Makefile
 #
 

+    TOP = ../../

 LIBNAME        = libmisc.a
 OBJS   = tcpwrapper.o from_local.o mountpoint.o
 
 LIBNAME        = libmisc.a
 OBJS   = tcpwrapper.o from_local.o mountpoint.o
 

diff --git a/support/nfs/Makefile b/support/nfs/Makefile
index 4e4a375fba704d66ca3e955949822bd1b399ac66..fb8f50838546accc28a930edbb23a32f405d37c1 100644 (file)
--- a/support/nfs/Makefile
+++ b/support/nfs/Makefile
@@ -1,7 +1,7 @@
 #
 # linux-nfs/support/nfs/Makefile
 #
 #
 # linux-nfs/support/nfs/Makefile
 #

-
+TOP    = ../../

 LIBNAME        = libnfs.a
 OBJS   = exports.o rmtab.o xio.o \
          rpcmisc.o rpcdispatch.o xlog.o xmalloc.o wildmat.o \
 LIBNAME        = libnfs.a
 OBJS   = exports.o rmtab.o xio.o \
          rpcmisc.o rpcdispatch.o xlog.o xmalloc.o wildmat.o \

diff --git a/support/rpc/Makefile b/support/rpc/Makefile
index d678075f504611f01521815c59d4df03e6f95c17..41a4e66c81695b8c36be890576f13b15394ea262 100644 (file)
--- a/support/rpc/Makefile
+++ b/support/rpc/Makefile
@@ -2,7 +2,7 @@
 # librpc.a
 # rpc library with rpcsec_gss
 #
 # librpc.a
 # rpc library with rpcsec_gss
 #

-
+TOP    = ../../

 LIBNAME        = librpc.a
 SRCS   = auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \
          svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \
 LIBNAME        = librpc.a
 SRCS   = auth_gss.c authgss_prot.c svc.c svc_run.c svc_auth.c \
          svc_auth_none.c svc_auth_unix.c svc_auth_gss.c \

diff --git a/tools/Makefile b/tools/Makefile
index 03248770cad70ace958ec8b17cb46f82bfecfbf1..7bfd84bae78779e906c76b385d6008dc76264b8b 100644 (file)
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -2,6 +2,7 @@
 # Various debugging/testing tools
 #
 
 # Various debugging/testing tools
 #
 

+TOP    = ../

 SUBDIRS        = rpcgen getiversion getkversion  rpcdebug locktest
 # nlmtest doesn't work 
 
 SUBDIRS        = rpcgen getiversion getkversion  rpcdebug locktest
 # nlmtest doesn't work 
 

diff --git a/tools/getiversion/Makefile b/tools/getiversion/Makefile
index 46c7150e151bd54de27e05d32e5474087361f75b..e6c324464d0362922325903f25a36b5e48e239af 100644 (file)
--- a/tools/getiversion/Makefile
+++ b/tools/getiversion/Makefile
@@ -2,6 +2,7 @@
 # knfsd tools
 #
 
 # knfsd tools
 #
 

+TOP    = ../../

 TOOL   = getiversion
 OBJS   = getiversion.o
 
 TOOL   = getiversion
 OBJS   = getiversion.o
 

diff --git a/tools/getkversion/Makefile b/tools/getkversion/Makefile
index be813adbab0cc403271b7d2662df0e3d0ba4e5c7..c13f80e1046f8bdd20899b304cb7bc89878a606e 100644 (file)
--- a/tools/getkversion/Makefile
+++ b/tools/getkversion/Makefile
@@ -3,6 +3,7 @@
 #              compiled.
 #
 
 #              compiled.
 #
 

+TOP    = ../../

 TOOL   = getkversion
 OBJS   = getkversion.o
 
 TOOL   = getkversion
 OBJS   = getkversion.o
 

diff --git a/tools/locktest/Makefile b/tools/locktest/Makefile
index e18f0b175e8f24fb8770713776d256e2d7cd2382..d597228beb3d8fb3d579be04cfdb14660803ae00 100644 (file)
--- a/tools/locktest/Makefile
+++ b/tools/locktest/Makefile
@@ -2,6 +2,7 @@
 # testlk -     lock a file to test client side locking.
 #
 
 # testlk -     lock a file to test client side locking.
 #
 

+TOP    = ../../

 TOOL   = testlk
 OBJS   = testlk.o
 
 TOOL   = testlk
 OBJS   = testlk.o
 

diff --git a/tools/nlmtest/Makefile b/tools/nlmtest/Makefile
index 6f29afb3d11b731559a7c2a555b7e09c871050fe..0df9f321d89b0132fed2aa8e70cf58aa15766a4d 100644 (file)
--- a/tools/nlmtest/Makefile
+++ b/tools/nlmtest/Makefile
@@ -2,6 +2,7 @@
 # nlmtest      Exercise some NLM calls to test the lockd server.
 #
 
 # nlmtest      Exercise some NLM calls to test the lockd server.
 #
 

+TOP    = ../../

 TOOL   = nlmtest
 SRCS   = $(RPCSRCS) nlmtest.c
 OBJS   = $(SRCS:.c=.o)
 TOOL   = nlmtest
 SRCS   = $(RPCSRCS) nlmtest.c
 OBJS   = $(SRCS:.c=.o)

diff --git a/tools/rpcdebug/Makefile b/tools/rpcdebug/Makefile
index 5dce56b2a543360669f6b42c9b0ab534dff96e87..d313960c759f66f02a8b038621d36e74e0161ae6 100644 (file)
--- a/tools/rpcdebug/Makefile
+++ b/tools/rpcdebug/Makefile
@@ -2,6 +2,7 @@
 # knfsd tools
 #
 
 # knfsd tools
 #
 

+TOP    = ../../

 TOOL   = rpcdebug nfsdebug nfsddebug
 OBJS   = rpcdebug.o
 
 TOOL   = rpcdebug nfsdebug nfsddebug
 OBJS   = rpcdebug.o
 

diff --git a/tools/rpcgen/Makefile b/tools/rpcgen/Makefile
index a4e4d1722f61eaea424119e15e1bd88bc93bbad6..7dc13d3e5d6795e03b32a1c0486f8ec5f9c88650 100644 (file)
--- a/tools/rpcgen/Makefile
+++ b/tools/rpcgen/Makefile
@@ -38,6 +38,7 @@
 # Copyright (C) 1987, Sun Microsystems, Inc.
 #
 
 # Copyright (C) 1987, Sun Microsystems, Inc.
 #
 

+TOP    = ../../

 TOOL   = rpcgen
 OBJS   = rpc_clntout.o rpc_cout.o rpc_hout.o rpc_main.o rpc_parse.o \
          rpc_scan.o rpc_svcout.o rpc_tblout.o rpc_util.o rpc_sample.o
 TOOL   = rpcgen
 OBJS   = rpc_clntout.o rpc_cout.o rpc_hout.o rpc_main.o rpc_parse.o \
          rpc_scan.o rpc_svcout.o rpc_tblout.o rpc_util.o rpc_sample.o

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 539632fdeef7ea5dff09a7ddc07b509c0be8ba63..5b4114dfee47e4a1591777f6adb01cadbb7865ff 100644 (file)
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -2,6 +2,7 @@
 # Makefile for linux-nfs/support
 #
 
 # Makefile for linux-nfs/support
 #
 

+TOP    = ../

 SUBDIRS        = exportfs mountd nfsd statd nfsstat @RQUOTAD@ showmount \
          nhfsstone lockd @IDMAPD@ @GSSD@ @SVCGSSD@
 
 SUBDIRS        = exportfs mountd nfsd statd nfsstat @RQUOTAD@ showmount \
          nhfsstone lockd @IDMAPD@ @GSSD@ @SVCGSSD@
 

diff --git a/utils/exportfs/Makefile b/utils/exportfs/Makefile
index aa77540318b165b4e2352040f33ed16c592f5801..79163bc91a0096a8cabaac60c928612f4a34783e 100644 (file)
--- a/utils/exportfs/Makefile
+++ b/utils/exportfs/Makefile
@@ -2,6 +2,7 @@
 # dummy Makefile
 #
 
 # dummy Makefile
 #
 

+TOP    = ../../

 PROGRAM        = exportfs
 OBJS   = exportfs.o
 LIBDEPS        = $(TOP)support/lib/libexport.a $(TOP)/support/lib/libnfs.a
 PROGRAM        = exportfs
 OBJS   = exportfs.o
 LIBDEPS        = $(TOP)support/lib/libexport.a $(TOP)/support/lib/libnfs.a

diff --git a/utils/gssd/Makefile b/utils/gssd/Makefile
index 6eba0f522f122d571a18321e56297e4543e3834b..55c85165da319de88adbd1cc529d91dd88b701e3 100644 (file)
--- a/utils/gssd/Makefile
+++ b/utils/gssd/Makefile
@@ -2,6 +2,7 @@
 # Makefile for rpc.gssd
 #
 
 # Makefile for rpc.gssd
 #
 

+TOP    = ../../

 PROGRAM        = gssd
 PREFIX = rpc.
 OBJS   = gssd.o gssd_main_loop.o gssd_proc.o err_util.o gss_util.o \
 PROGRAM        = gssd
 PREFIX = rpc.
 OBJS   = gssd.o gssd_main_loop.o gssd_proc.o err_util.o gss_util.o \

diff --git a/utils/gssdestroycreds/Makefile b/utils/gssdestroycreds/Makefile
index 266e9def8b06d9fd0169be39ab57f75a4e259845..2747ca3e42500bfc9edb8dd9e17913f872327868 100644 (file)
--- a/utils/gssdestroycreds/Makefile
+++ b/utils/gssdestroycreds/Makefile
@@ -2,6 +2,7 @@
 # gss context destruction tool
 #
 
 # gss context destruction tool
 #
 

+TOP    = ../../     

 PROGRAM        = gss_clnt_send_err
 OBJS   = gss_clnt_send_err.o
 
 PROGRAM        = gss_clnt_send_err
 OBJS   = gss_clnt_send_err.o
 

diff --git a/utils/idmapd/Makefile b/utils/idmapd/Makefile
index 14f6cc1ba7bdbf81d2d15961ede107f887481995..41314efe88687eebbfeb0a3e24a2999c49464005 100644 (file)
--- a/utils/idmapd/Makefile
+++ b/utils/idmapd/Makefile
@@ -1,7 +1,8 @@
 #
 # Makefile for rpc.idmapd
 #
 #
 # Makefile for rpc.idmapd
 #

-
+ 
+TOP    = ../../

 PROGRAM        = idmapd
 PREFIX = rpc.
 OBJS   = atomicio.o cfg.o idmapd.o setproctitle.o strlcat.o strlcpy.o
 PROGRAM        = idmapd
 PREFIX = rpc.
 OBJS   = atomicio.o cfg.o idmapd.o setproctitle.o strlcat.o strlcpy.o

diff --git a/utils/lockd/Makefile b/utils/lockd/Makefile
index 4e47d54d91337b7345f4239102e872d30ad4cbe4..99d4a26c43b5f03edf66ec6044999bb748604130 100644 (file)
--- a/utils/lockd/Makefile
+++ b/utils/lockd/Makefile
@@ -1,7 +1,8 @@
 #
 # Makefile for lockd
 #
 #
 # Makefile for lockd
 #

-
+ 
+TOP    = ../../

 PROGRAM        = lockd
 PREFIX = rpc.
 OBJS   = lockd.o
 PROGRAM        = lockd
 PREFIX = rpc.
 OBJS   = lockd.o

diff --git a/utils/mountd/Makefile b/utils/mountd/Makefile
index 34a2f4f9f51d9eb35a433831f384192034dcb267..42d77e3dd7cfa0525b721dbab9024067a6a8ff90 100644 (file)
--- a/utils/mountd/Makefile
+++ b/utils/mountd/Makefile
@@ -2,6 +2,7 @@
 # Makefile for rpc.mountd
 #
 
 # Makefile for rpc.mountd
 #
 

+TOP    = ../../

 PROGRAM        = mountd
 PREFIX = rpc.
 OBJS   = mountd.o mount_dispatch.o auth.o rmtab.o cache.o svc_run.o
 PROGRAM        = mountd
 PREFIX = rpc.
 OBJS   = mountd.o mount_dispatch.o auth.o rmtab.o cache.o svc_run.o

diff --git a/utils/nfsd/Makefile b/utils/nfsd/Makefile
index e178960e299f0587cc938ff0ab21daebbfc737ed..be74bb01d53c2b34a4d2ae31c317de2721214041 100644 (file)
--- a/utils/nfsd/Makefile
+++ b/utils/nfsd/Makefile
@@ -2,6 +2,7 @@
 # Makefile for knfsd
 #
 
 # Makefile for knfsd
 #
 

+TOP    = ../../

 PROGRAM        = nfsd
 PREFIX = rpc.
 OBJS   = nfsd.o
 PROGRAM        = nfsd
 PREFIX = rpc.
 OBJS   = nfsd.o

diff --git a/utils/nfsstat/Makefile b/utils/nfsstat/Makefile
index e3a9428434b55993ad753054a23c5407ff01c628..31ffbd96ed35578303238c9d8a8b5faf0d8b3fc1 100644 (file)
--- a/utils/nfsstat/Makefile
+++ b/utils/nfsstat/Makefile
@@ -2,6 +2,7 @@
 # dummy Makefile
 #
 
 # dummy Makefile
 #
 

+TOP    = ../../

 PROGRAM        = nfsstat
 OBJS   = nfsstat.o
 MAN8   = nfsstat
 PROGRAM        = nfsstat
 OBJS   = nfsstat.o
 MAN8   = nfsstat

diff --git a/utils/nhfsstone/Makefile b/utils/nhfsstone/Makefile
index d96d3160257c4ef56f761c676fb694a288191e34..ea41f5e8be0e1c61ce318462fcc8ae48bfdbdb37 100644 (file)
--- a/utils/nhfsstone/Makefile
+++ b/utils/nhfsstone/Makefile
@@ -4,6 +4,7 @@
 
 SCRIPTS        = nhfsrun nhfsnums nhfsgraph
 
 
 SCRIPTS        = nhfsrun nhfsnums nhfsgraph
 

+TOP    = ../../

 PROGRAM        = nhfsstone
 OBJS   = nhfsstone.o
 MAN8   = nhfsstone $(SCRIPTS)
 PROGRAM        = nhfsstone
 OBJS   = nhfsstone.o
 MAN8   = nhfsstone $(SCRIPTS)

diff --git a/utils/rquotad/Makefile b/utils/rquotad/Makefile
index aaf5762493b48cfd50ff9fa8663e69f0b9a691c3..668e0950dead6cb2cddd98a6e7eb01cfc23d2fa8 100644 (file)
--- a/utils/rquotad/Makefile
+++ b/utils/rquotad/Makefile
@@ -2,6 +2,7 @@
 # Makefile for rpc.rquotad
 #
 
 # Makefile for rpc.rquotad
 #
 

+TOP    = ../../

 PROGRAM        = rquotad
 PREFIX = rpc.
 OBJS   = rquota_server.o rquota_svc.o rquota_xdr.o quotactl.o hasquota.o
 PROGRAM        = rquotad
 PREFIX = rpc.
 OBJS   = rquota_server.o rquota_svc.o rquota_xdr.o quotactl.o hasquota.o

diff --git a/utils/showmount/Makefile b/utils/showmount/Makefile
index c8aa34d5cb4f4fe890d2269b0261893a9e3bb657..88186d944e9a025e5552a0b835386092bd680447 100644 (file)
--- a/utils/showmount/Makefile
+++ b/utils/showmount/Makefile
@@ -2,6 +2,7 @@
 # dummy Makefile
 #
 
 # dummy Makefile
 #
 

+TOP    = ../../

 PROGRAM        = showmount
 OBJS   = showmount.o
 LIBDEPS        = $(TOP)support/lib/libexport.a
 PROGRAM        = showmount
 OBJS   = showmount.o
 LIBDEPS        = $(TOP)support/lib/libexport.a

diff --git a/utils/statd/Makefile b/utils/statd/Makefile
index 444932f6c9a7c487fffd81982339700db9c1a3f1..6301d27c12506f26f61b34a99f2d64bbe969738c 100644 (file)
--- a/utils/statd/Makefile
+++ b/utils/statd/Makefile
@@ -3,6 +3,7 @@
 #
 # NSM for Linux.
 
 #
 # NSM for Linux.
 

+TOP    = ../../

 # Uncomment for embedded client-side simulation functions.
 #SIMUL = -DSIMULATIONS
 
 # Uncomment for embedded client-side simulation functions.
 #SIMUL = -DSIMULATIONS
 

diff --git a/utils/svcgssd/Makefile b/utils/svcgssd/Makefile
index a864de0dac662fbd0b3c61f0825bce2451b09dbe..6d1405b9d1b7b29fb488a83a72e816904d489956 100644 (file)
--- a/utils/svcgssd/Makefile
+++ b/utils/svcgssd/Makefile
@@ -2,6 +2,7 @@
 # Makefile for rpc.gssd
 #
 
 # Makefile for rpc.gssd
 #
 

+TOP    = ../../

 PROGRAM        = svcgssd
 PREFIX = rpc.
 OBJS   = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \
 PROGRAM        = svcgssd
 PREFIX = rpc.
 OBJS   = svcgssd.o svcgssd_main_loop.o svcgssd_proc.o err_util.o gss_util.o \