Commit ecc68222 authored by Mike Hibler's avatar Mike Hibler

Add some files missed in the last commit (due to a Git Incident).

parent 94a79394
...@@ -2600,6 +2600,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -2600,6 +2600,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
sensors/and/GNUmakefile sensors/and/and-emulab.conf \ sensors/and/GNUmakefile sensors/and/and-emulab.conf \
sensors/powermon/GNUmakefile sensors/powermon/powermon \ sensors/powermon/GNUmakefile sensors/powermon/powermon \
sensors/nfstrace/GNUmakefile sensors/nfstrace/nfstrace.init \ sensors/nfstrace/GNUmakefile sensors/nfstrace/nfstrace.init \
sensors/nfstrace/nfsdump2/GNUmakefile \
account/GNUmakefile account/tbacct \ account/GNUmakefile account/tbacct \
account/addpubkey account/addsfskey account/genpubkeys \ account/addpubkey account/addsfskey account/genpubkeys \
account/quotamail account/mkusercert account/newproj account/newuser \ account/quotamail account/mkusercert account/newproj account/newuser \
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2000-2009 University of Utah and the Flux Group. # Copyright (c) 2000-2010 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
AC_PREREQ(2.13) AC_PREREQ(2.13)
...@@ -846,6 +846,7 @@ outfiles="$outfiles Makeconf GNUmakefile \ ...@@ -846,6 +846,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
sensors/and/GNUmakefile sensors/and/and-emulab.conf \ sensors/and/GNUmakefile sensors/and/and-emulab.conf \
sensors/powermon/GNUmakefile sensors/powermon/powermon \ sensors/powermon/GNUmakefile sensors/powermon/powermon \
sensors/nfstrace/GNUmakefile sensors/nfstrace/nfstrace.init \ sensors/nfstrace/GNUmakefile sensors/nfstrace/nfstrace.init \
sensors/nfstrace/nfsdump2/GNUmakefile \
account/GNUmakefile account/tbacct \ account/GNUmakefile account/tbacct \
account/addpubkey account/addsfskey account/genpubkeys \ account/addpubkey account/addsfskey account/genpubkeys \
account/quotamail account/mkusercert account/newproj account/newuser \ account/quotamail account/mkusercert account/newproj account/newuser \
......
# #
# EMULAB-COPYRIGHT # EMULAB-COPYRIGHT
# Copyright (c) 2005, 2006, 2007 University of Utah and the Flux Group. # Copyright (c) 2005, 2006, 2007, 2010 University of Utah and the Flux Group.
# All rights reserved. # All rights reserved.
# #
# This is the Emulab specific makefile. # This is the Emulab specific makefile.
...@@ -32,22 +32,9 @@ PW=/usr/sbin/pw ...@@ -32,22 +32,9 @@ PW=/usr/sbin/pw
NFSTRACE_HOME=/var/nfstrace NFSTRACE_HOME=/var/nfstrace
NFSTRACE_DBDIR=/var/db/nfstrace NFSTRACE_DBDIR=/var/db/nfstrace
$(SRCDIR)/nfsdump2/config.status: nfsdump:
cd $(SRCDIR)/nfsdump2 && ./configure cd nfsdump2 && $(MAKE)
cp nfsdump2/nfsdump2/nfsdump nfsdump
make.nfsdump:
cd $(SRCDIR)/nfsdump2/ && ./config.status
cd $(SRCDIR)/nfsdump2 && $(MAKE)
clean.nfsdump: $(SRCDIR)/nfsdump2/config.status
cd $(SRCDIR)/nfsdump2/ && ./config.status
cd $(SRCDIR)/nfsdump2 && $(MAKE) clean
cd $(SRCDIR)/nfsdump2 && rm -f config.status config.cache
$(SRCDIR)/nfsdump2/nfsdump: $(SRCDIR)/nfsdump2/config.status make.nfsdump
nfsdump: $(SRCDIR)/nfsdump2/nfsdump
cp $(SRCDIR)/nfsdump2/nfsdump .
client client-install control-install: client client-install control-install:
...@@ -149,4 +136,5 @@ fs-install install: ...@@ -149,4 +136,5 @@ fs-install install:
endif endif
clean: clean.nfsdump clean: clean.nfsdump
cd nfsdump2 && $(MAKE) clean
rm -f *.o core nfsdump nfstrace.init rm -f *.o core nfsdump nfstrace.init
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment