From: gmorris Date: Tue, 12 Apr 2005 15:16:12 +0000 (+0000) Subject: Added TOP, as needed, for easier compile in subdirectories X-Git-Tag: nfs-utils-1-0-7-post1~8 X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=078f5d46ad34f36cce257b3b8a970471a4b2b68b;p=nfs-utils.git Added TOP, as needed, for easier compile in subdirectories --- diff --git a/support/Makefile b/support/Makefile index aa56fa7..f3013a9 100644 --- a/support/Makefile +++ b/support/Makefile @@ -2,6 +2,7 @@ # Makefile for linux-nfs/support # + TOP = ../ SUBDIRS = include nfs export lib misc rpc gssapi .DEFAULT: all diff --git a/support/export/Makefile b/support/export/Makefile index 43c2d32..353dd00 100644 --- a/support/export/Makefile +++ b/support/export/Makefile @@ -4,6 +4,7 @@ # of NFS volumes. # +TOP = ../../ 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 65271f0..bc14647 100644 --- a/support/gssapi/Makefile +++ b/support/gssapi/Makefile @@ -2,7 +2,7 @@ # 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 \ diff --git a/support/include/Makefile b/support/include/Makefile index e1cbfc4..5b3d221 100644 --- a/support/include/Makefile +++ b/support/include/Makefile @@ -2,6 +2,8 @@ # Makefile for linux-nfs/support # +TOP = ../../ + include $(TOP)rules.mk all install:: mount.h diff --git a/support/lib/Makefile b/support/lib/Makefile index 58c84f8..43a7ab7 100644 --- 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 diff --git a/support/misc/Makefile b/support/misc/Makefile index c738564..0a0e371 100644 --- a/support/misc/Makefile +++ b/support/misc/Makefile @@ -2,6 +2,7 @@ # linux-nfs/support/misc/Makefile # + TOP = ../../ LIBNAME = libmisc.a OBJS = tcpwrapper.o from_local.o mountpoint.o diff --git a/support/nfs/Makefile b/support/nfs/Makefile index 4e4a375..fb8f508 100644 --- a/support/nfs/Makefile +++ b/support/nfs/Makefile @@ -1,7 +1,7 @@ # # 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 \ diff --git a/support/rpc/Makefile b/support/rpc/Makefile index d678075..41a4e66 100644 --- a/support/rpc/Makefile +++ b/support/rpc/Makefile @@ -2,7 +2,7 @@ # 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 \ diff --git a/tools/Makefile b/tools/Makefile index 0324877..7bfd84b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -2,6 +2,7 @@ # Various debugging/testing tools # +TOP = ../ SUBDIRS = rpcgen getiversion getkversion rpcdebug locktest # nlmtest doesn't work diff --git a/tools/getiversion/Makefile b/tools/getiversion/Makefile index 46c7150..e6c3244 100644 --- a/tools/getiversion/Makefile +++ b/tools/getiversion/Makefile @@ -2,6 +2,7 @@ # knfsd tools # +TOP = ../../ TOOL = getiversion OBJS = getiversion.o diff --git a/tools/getkversion/Makefile b/tools/getkversion/Makefile index be813ad..c13f80e 100644 --- a/tools/getkversion/Makefile +++ b/tools/getkversion/Makefile @@ -3,6 +3,7 @@ # compiled. # +TOP = ../../ TOOL = getkversion OBJS = getkversion.o diff --git a/tools/locktest/Makefile b/tools/locktest/Makefile index e18f0b1..d597228 100644 --- a/tools/locktest/Makefile +++ b/tools/locktest/Makefile @@ -2,6 +2,7 @@ # testlk - lock a file to test client side locking. # +TOP = ../../ TOOL = testlk OBJS = testlk.o diff --git a/tools/nlmtest/Makefile b/tools/nlmtest/Makefile index 6f29afb..0df9f32 100644 --- a/tools/nlmtest/Makefile +++ b/tools/nlmtest/Makefile @@ -2,6 +2,7 @@ # nlmtest Exercise some NLM calls to test the lockd server. # +TOP = ../../ TOOL = nlmtest SRCS = $(RPCSRCS) nlmtest.c OBJS = $(SRCS:.c=.o) diff --git a/tools/rpcdebug/Makefile b/tools/rpcdebug/Makefile index 5dce56b..d313960 100644 --- a/tools/rpcdebug/Makefile +++ b/tools/rpcdebug/Makefile @@ -2,6 +2,7 @@ # knfsd tools # +TOP = ../../ TOOL = rpcdebug nfsdebug nfsddebug OBJS = rpcdebug.o diff --git a/tools/rpcgen/Makefile b/tools/rpcgen/Makefile index a4e4d17..7dc13d3 100644 --- a/tools/rpcgen/Makefile +++ b/tools/rpcgen/Makefile @@ -38,6 +38,7 @@ # 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 diff --git a/utils/Makefile.in b/utils/Makefile.in index 539632f..5b4114d 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -2,6 +2,7 @@ # Makefile for linux-nfs/support # +TOP = ../ SUBDIRS = exportfs mountd nfsd statd nfsstat @RQUOTAD@ showmount \ nhfsstone lockd @IDMAPD@ @GSSD@ @SVCGSSD@ diff --git a/utils/exportfs/Makefile b/utils/exportfs/Makefile index aa77540..79163bc 100644 --- a/utils/exportfs/Makefile +++ b/utils/exportfs/Makefile @@ -2,6 +2,7 @@ # dummy Makefile # +TOP = ../../ 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 6eba0f5..55c8516 100644 --- a/utils/gssd/Makefile +++ b/utils/gssd/Makefile @@ -2,6 +2,7 @@ # 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 \ diff --git a/utils/gssdestroycreds/Makefile b/utils/gssdestroycreds/Makefile index 266e9de..2747ca3 100644 --- a/utils/gssdestroycreds/Makefile +++ b/utils/gssdestroycreds/Makefile @@ -2,6 +2,7 @@ # gss context destruction tool # +TOP = ../../ PROGRAM = gss_clnt_send_err OBJS = gss_clnt_send_err.o diff --git a/utils/idmapd/Makefile b/utils/idmapd/Makefile index 14f6cc1..41314ef 100644 --- a/utils/idmapd/Makefile +++ b/utils/idmapd/Makefile @@ -1,7 +1,8 @@ # # Makefile for rpc.idmapd # - + +TOP = ../../ 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 4e47d54..99d4a26 100644 --- a/utils/lockd/Makefile +++ b/utils/lockd/Makefile @@ -1,7 +1,8 @@ # # Makefile for lockd # - + +TOP = ../../ PROGRAM = lockd PREFIX = rpc. OBJS = lockd.o diff --git a/utils/mountd/Makefile b/utils/mountd/Makefile index 34a2f4f..42d77e3 100644 --- a/utils/mountd/Makefile +++ b/utils/mountd/Makefile @@ -2,6 +2,7 @@ # Makefile for rpc.mountd # +TOP = ../../ 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 e178960..be74bb0 100644 --- a/utils/nfsd/Makefile +++ b/utils/nfsd/Makefile @@ -2,6 +2,7 @@ # Makefile for knfsd # +TOP = ../../ PROGRAM = nfsd PREFIX = rpc. OBJS = nfsd.o diff --git a/utils/nfsstat/Makefile b/utils/nfsstat/Makefile index e3a9428..31ffbd9 100644 --- a/utils/nfsstat/Makefile +++ b/utils/nfsstat/Makefile @@ -2,6 +2,7 @@ # dummy Makefile # +TOP = ../../ PROGRAM = nfsstat OBJS = nfsstat.o MAN8 = nfsstat diff --git a/utils/nhfsstone/Makefile b/utils/nhfsstone/Makefile index d96d316..ea41f5e 100644 --- a/utils/nhfsstone/Makefile +++ b/utils/nhfsstone/Makefile @@ -4,6 +4,7 @@ SCRIPTS = nhfsrun nhfsnums nhfsgraph +TOP = ../../ PROGRAM = nhfsstone OBJS = nhfsstone.o MAN8 = nhfsstone $(SCRIPTS) diff --git a/utils/rquotad/Makefile b/utils/rquotad/Makefile index aaf5762..668e095 100644 --- a/utils/rquotad/Makefile +++ b/utils/rquotad/Makefile @@ -2,6 +2,7 @@ # Makefile for rpc.rquotad # +TOP = ../../ 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 c8aa34d..88186d9 100644 --- a/utils/showmount/Makefile +++ b/utils/showmount/Makefile @@ -2,6 +2,7 @@ # dummy Makefile # +TOP = ../../ PROGRAM = showmount OBJS = showmount.o LIBDEPS = $(TOP)support/lib/libexport.a diff --git a/utils/statd/Makefile b/utils/statd/Makefile index 444932f..6301d27 100644 --- a/utils/statd/Makefile +++ b/utils/statd/Makefile @@ -3,6 +3,7 @@ # # NSM for Linux. +TOP = ../../ # Uncomment for embedded client-side simulation functions. #SIMUL = -DSIMULATIONS diff --git a/utils/svcgssd/Makefile b/utils/svcgssd/Makefile index a864de0..6d1405b 100644 --- a/utils/svcgssd/Makefile +++ b/utils/svcgssd/Makefile @@ -2,6 +2,7 @@ # 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 \