All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 297019fb authored by Mike Hibler's avatar Mike Hibler

Cleanup Makefiles:

1. "make clean" will just remove stuff built in the process of a regular build
2. "make distclean" will also clean out configure generated files.

This is how it was always supposed to be, there was just some bitrot.
parent 56acaee5
......@@ -131,7 +131,7 @@ install-dbfillcheck:
clean: clean-subdirs
distclean: distclean-subdirs
rm -f Makeconf GNUmakefile config.status config.cache config.log
rm -f Makeconf GNUmakefile config.h config.status config.cache config.log
rm -f $(DISTCLEAN_FILES)
# How to recursively descend into subdirectories to make general
......
......@@ -1248,8 +1248,8 @@ else
event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated \
event/linktest/GNUmakefile \
event/linktest/linktest.h \
event/linktest/linktest.pl";
event/linktest/linktest.h event/linktest/linktest.pl \
event/linktest/run_linktest.pl";
optional_subdirs="$optional_subdirs event";
EVENTSYS=1;
......@@ -1388,6 +1388,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/sitevarscheck db/dbfillcheck \
db/grabron db/webnfree db/stategraph db/readycount \
db/idletimes db/idlemail db/webidlemail db/xmlconvert \
db/node_list db/webnewwanode \
ipod/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
......@@ -1418,15 +1419,15 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/snmpit tbsetup/ns2ir/GNUmakefile \
tbsetup/ns2ir/parse.tcl tbsetup/ns2ir/tb_compat.tcl \
tbsetup/ns2ir/parse-ns tbsetup/ns2ir/parse.proxy \
tbsetup/ns2ir/sim.tcl tbsetup/nseparse/GNUmakefile \
tbsetup/ns2ir/sim.tcl tbsetup/nseswap tbsetup/nseparse/GNUmakefile \
tbsetup/nseparse/nse.parse.proxy tbsetup/nseparse/parse-nse \
tbsetup/nseparse/nse.parse.tcl tbsetup/db2ns \
tbsetup/tbprerun tbsetup/tbswap tbsetup/tbend \
tbsetup/tbprerun tbsetup/tbswap tbsetup/tbend tbsetup/tbrestart \
tbsetup/tbreport tbsetup/named_setup tbsetup/exports_setup \
tbsetup/checkpass/GNUmakefile tbsetup/assign_wrapper tbsetup/ptopgen \
tbsetup/frisbeelauncher tbsetup/node_update tbsetup/webnodeupdate \
tbsetup/savelogs tbsetup/setgroups tbsetup/websetgroups \
tbsetup/rmgroup tbsetup/webrmgroup tbsetup/mkexpdir \
tbsetup/rmgroup tbsetup/webrmuser tbsetup/webrmgroup tbsetup/mkexpdir \
tbsetup/webnodecontrol tbsetup/node_control \
tbsetup/webmkgroup tbsetup/mkgroup tbsetup/eventsys_start \
tbsetup/eventsys_control \
......@@ -1434,6 +1435,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/portstats tbsetup/vnode_setup tbsetup/staticroutes \
tbsetup/console_setup.proxy tbsetup/exports_setup.proxy \
tbsetup/checkports tbsetup/webnodereboot tbsetup/libaudit.pm \
tbsetup/libreboot.pm tbsetup/libosload.pm \
tbsetup/sfskey_update tbsetup/sfskey_update.proxy \
tbsetup/idleswap tbsetup/webidleswap tbsetup/switchmac \
tbsetup/newnode_reboot \
......@@ -1466,9 +1468,9 @@ outfiles="$outfiles Makeconf GNUmakefile \
utils/nsgen/GNUmakefile utils/nsgen/webnsgen \
www/GNUmakefile www/defs.php3 www/dbdefs.php3 \
www/swish.conf www/websearch \
vis/GNUmakefile vis/webvistopology \
vis/dbvistopology \
vis/GNUmakefile vis/webvistopology vis/dbvistopology \
vis/prerender vis/prerender_all vis/render \
vis/floormap vis/webfloormap \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/2.elvind.sh rc.d/3.plab.sh \
tools/GNUmakefile \
......@@ -1479,6 +1481,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
xmlrpc/GNUmakefile xmlrpc/emulabclient.py xmlrpc/emulabserver.py \
xmlrpc/sshxmlrpc_client.py xmlrpc/sshxmlrpc_server.py \
xmlrpc/webxmlrpc \
xmlrpc/emulab xmlrpc/node xmlrpc/experiment xmlrpc/fs xmlrpc/user \
xmlrpc/imageid xmlrpc/osid \
install/ops-install install/boss-install \
install/newnode_sshkeys/GNUmakefile "
......
......@@ -363,8 +363,8 @@ else
event/stated/waitForState \
event/stated/GNUmakefile event/stated/stated \
event/linktest/GNUmakefile \
event/linktest/linktest.h \
event/linktest/linktest.pl";
event/linktest/linktest.h event/linktest/linktest.pl \
event/linktest/run_linktest.pl";
optional_subdirs="$optional_subdirs event";
EVENTSYS=1;
......@@ -433,6 +433,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
db/sitevarscheck db/dbfillcheck \
db/grabron db/webnfree db/stategraph db/readycount \
db/idletimes db/idlemail db/webidlemail db/xmlconvert \
db/node_list db/webnewwanode \
ipod/GNUmakefile \
lib/GNUmakefile lib/libtb/GNUmakefile \
os/GNUmakefile os/split-image.sh os/imagezip/GNUmakefile \
......@@ -463,15 +464,15 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/snmpit tbsetup/ns2ir/GNUmakefile \
tbsetup/ns2ir/parse.tcl tbsetup/ns2ir/tb_compat.tcl \
tbsetup/ns2ir/parse-ns tbsetup/ns2ir/parse.proxy \
tbsetup/ns2ir/sim.tcl tbsetup/nseparse/GNUmakefile \
tbsetup/ns2ir/sim.tcl tbsetup/nseswap tbsetup/nseparse/GNUmakefile \
tbsetup/nseparse/nse.parse.proxy tbsetup/nseparse/parse-nse \
tbsetup/nseparse/nse.parse.tcl tbsetup/db2ns \
tbsetup/tbprerun tbsetup/tbswap tbsetup/tbend \
tbsetup/tbprerun tbsetup/tbswap tbsetup/tbend tbsetup/tbrestart \
tbsetup/tbreport tbsetup/named_setup tbsetup/exports_setup \
tbsetup/checkpass/GNUmakefile tbsetup/assign_wrapper tbsetup/ptopgen \
tbsetup/frisbeelauncher tbsetup/node_update tbsetup/webnodeupdate \
tbsetup/savelogs tbsetup/setgroups tbsetup/websetgroups \
tbsetup/rmgroup tbsetup/webrmgroup tbsetup/mkexpdir \
tbsetup/rmgroup tbsetup/webrmuser tbsetup/webrmgroup tbsetup/mkexpdir \
tbsetup/webnodecontrol tbsetup/node_control \
tbsetup/webmkgroup tbsetup/mkgroup tbsetup/eventsys_start \
tbsetup/eventsys_control \
......@@ -479,6 +480,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/portstats tbsetup/vnode_setup tbsetup/staticroutes \
tbsetup/console_setup.proxy tbsetup/exports_setup.proxy \
tbsetup/checkports tbsetup/webnodereboot tbsetup/libaudit.pm \
tbsetup/libreboot.pm tbsetup/libosload.pm \
tbsetup/sfskey_update tbsetup/sfskey_update.proxy \
tbsetup/idleswap tbsetup/webidleswap tbsetup/switchmac \
tbsetup/newnode_reboot \
......@@ -511,9 +513,9 @@ outfiles="$outfiles Makeconf GNUmakefile \
utils/nsgen/GNUmakefile utils/nsgen/webnsgen \
www/GNUmakefile www/defs.php3 www/dbdefs.php3 \
www/swish.conf www/websearch \
vis/GNUmakefile vis/webvistopology \
vis/dbvistopology \
vis/GNUmakefile vis/webvistopology vis/dbvistopology \
vis/prerender vis/prerender_all vis/render \
vis/floormap vis/webfloormap \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/2.elvind.sh rc.d/3.plab.sh \
tools/GNUmakefile \
......@@ -524,6 +526,8 @@ outfiles="$outfiles Makeconf GNUmakefile \
xmlrpc/GNUmakefile xmlrpc/emulabclient.py xmlrpc/emulabserver.py \
xmlrpc/sshxmlrpc_client.py xmlrpc/sshxmlrpc_server.py \
xmlrpc/webxmlrpc \
xmlrpc/emulab xmlrpc/node xmlrpc/experiment xmlrpc/fs xmlrpc/user \
xmlrpc/imageid xmlrpc/osid \
install/ops-install install/boss-install \
install/newnode_sshkeys/GNUmakefile "
......
#
# This is the defaults definitions file for configure.
# See doc/setup.txt for an explanation of these variables.
#
# Use the --with-TBDEFS=filename to specify your own file.
# If you add a variable, be sure to go and update configure.in.
#
TBDBNAME=tbdb
TBADMINGROUP=tbadmin
TBOPSEMAIL=aerolab-ops@ops.outernet.aero.org
TBLOGSEMAIL=aerolab-logs@ops.outernet.aero.org
TBWWWEMAIL=aerolab-www@ops.outernet.aero.org
TBAPPROVALEMAIL=aerolab-approval@ops.outernet.aero.org
TBAUDITEMAIL=aerolab-audit@ops.outernet.aero.org
TBSTATEDEMAIL=aerolab-stated@ops.outernet.aero.org
TBTESTSUITEEMAIL=aerolab-testsuite@ops.outernet.aero.org
TBAUTOMAILEMAIL=aerolab-automail@ops.outernet.aero.org
TBACTIVEARCHIVE=aerolab-active-users-archive@ops.outernet.aero.org
TBUSERSARCHIVE=testbed-users-archive\@ops.outernet.aero.org
JAILIPBASE=172.16.0.0
JAILIPMASK=255.240.0.0
DELAYCAPACITY=2
BOSSNODE=boss.outernet.aero.org
USERNODE=users.outernet.aero.org
FSNODE=fs.outernet.aero.org
OURDOMAIN=outernet.aero.org
FSDIR_GROUPS=/Volumes/BAD/emulab/groups
FSDIR_PROJ=/Volumes/BAD/emulab/proj
FSDIR_USERS=/Volumes/BAD/emulab/users
FSDIR_SHARE=/Volumes/BAD/emulab/share
FS_WITH_QUOTAS=""
WWWHOST=www.outernet.aero.org
TBMAINSITE=1
THISHOMEBASE=Outernet.aero.org
PLABSUPPORT=0
SFSSUPPORT=0
DISABLE_NSE=1
DISABLE_NAMED_SETUP=1
DISABLE_EXPORTS_SETUP=1
......@@ -18,43 +18,14 @@ ifeq ($(SYSTEM),FreeBSD)
SUBDIRS += sched delay-agent nsetrafgen stated
endif
all: $(SUBDIRS)
all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
lib:
@$(MAKE) -C lib all
sched:
@$(MAKE) -C sched all
tbgen:
@$(MAKE) -C tbgen all
example:
@$(MAKE) -C example all
trafgen:
trafgen-fetch:
$(SRCDIR)/trafgen/tg-install $(SRCDIR)/trafgen
@$(MAKE) -C trafgen all
nsetrafgen:
@$(MAKE) -C nsetrafgen all
delay-agent:
@$(MAKE) -C delay-agent all
program-agent:
@$(MAKE) -C program-agent all
stated:
@$(MAKE) -C stated all
proxy:
@$(MAKE) -C proxy all
linktest:
@$(MAKE) -C linktest all
trafgen: trafgen-fetch
install:
@$(MAKE) -C lib install
......@@ -63,7 +34,7 @@ install:
@$(MAKE) -C stated install
@$(MAKE) -C linktest install
client-install: lib
client-install: lib/all.MAKE
ifeq ($(SYSTEM),FreeBSD)
@$(MAKE) -C delay-agent client-install
endif
......@@ -77,27 +48,13 @@ control-install:
@$(MAKE) -C lib control-install
@$(MAKE) -C tbgen control-install
clean: subdir-clean
clean: clean-subdirs
distclean: distclean-subdirs
subdir-clean:
@$(MAKE) -C lib clean
@$(MAKE) -C sched clean
@$(MAKE) -C tbgen clean
@$(MAKE) -C example clean
@$(MAKE) -C trafgen clean
@$(MAKE) -C delay-agent clean
@$(MAKE) -C program-agent clean
distclean: subdir-distclean
subdir-distclean:
@$(MAKE) -C lib distclean
@$(MAKE) -C sched distclean
@$(MAKE) -C tbgen distclean
@$(MAKE) -C example distclean
@$(MAKE) -C trafgen distclean
@$(MAKE) -C delay-agent distclean
@$(MAKE) -C program-agent distclean
# How to recursively descend into subdirectories to make general
# targets such as `all'.
%.MAKE:
@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
%-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
.PHONY: $(SUBDIRS)
......@@ -22,7 +22,7 @@ SYSTEM := $(shell uname -s)
include $(OBJDIR)/Makeconf
all: binaries $(SCRIPT) $(SCRIPT_RUN) $(SCRIPT_TBCOMPAT)
all: binaries $(SCRIPT) $(SCRIPT_RUN)
include $(TESTBED_SRCDIR)/GNUmakerules
......@@ -58,12 +58,13 @@ $(LIBEVENTDIR)/%.a:
binaries: $(LOCAL_BINDIR)/$(DAEMON) $(LOCAL_BINDIR)/$(LTEVENT)
$(LOCAL_BINDIR)/$(DAEMON): $(DAEMON_OBJS) $(LIBTB_OBJS)
$(LOCAL_BINDIR):
-mkdir -p $(LOCAL_BINDIR)
$(LOCAL_BINDIR)/$(DAEMON): $(LOCAL_BINDIR) $(DAEMON_OBJS) $(LIBTB_OBJS)
$(CC) $(LDFLAGS) $(DAEMON_OBJS) $(LIBTB_OBJS) $(LIBS) -o $@
$(LOCAL_BINDIR)/$(LTEVENT): $(LTEVENT_OBJS) $(LIBTB_OBJS)
-mkdir -p $(LOCAL_BINDIR)
$(LOCAL_BINDIR)/$(LTEVENT): $(LOCAL_BINDIR) $(LTEVENT_OBJS) $(LIBTB_OBJS)
$(CC) $(LDFLAGS) $(LTEVENT_OBJS) $(LIBTB_OBJS) $(LIBS) -o $@
$(DAEMON_OBJS): linktest.h ../lib/libevent.a ../lib/event.h
......@@ -86,7 +87,7 @@ client-install: all
$(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT)
$(INSTALL_PROGRAM) $(SCRIPT_RUN) \
$(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT_RUN)
$(INSTALL_PROGRAM) $(SCRIPT_TBCOMPAT) \
$(INSTALL_PROGRAM) $(SRCDIR)/$(SCRIPT_TBCOMPAT) \
$(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT_TBCOMPAT)
$(INSTALL_PROGRAM) $(NSTOIRDIR)/$(SCRIPT_NSTB_COMPAT) \
$(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT_NSTB_COMPAT)
......@@ -96,8 +97,5 @@ lt-install:
$(DESTDIR)$(CLIENT_BINDIR)/$(SCRIPT)
clean:
/bin/rm -f *.o $(TESTS)
/bin/rm -f $(LOCAL_BINDIR)/$(DAEMON)
/bin/rm -f $(LOCAL_BINDIR)/$(LTEVENT)
/bin/rm -f $(SCRIPT)
/bin/rm -f $(SCRIPT_RUN)
rm -f *.o $(TESTS)
rm -rf $(LOCAL_BINDIR)
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -58,4 +58,4 @@ client-install:
fi
clean:
/bin/rm -f $(INSTALL_NSE)
rm -f $(INSTALL_NSE)
......@@ -67,4 +67,4 @@ client-install: tevc
$(INSTALL_PROGRAM) -s tevc $(DESTDIR)$(CLIENT_BINDIR)/tevc
clean:
/bin/rm -f *.o $(PROGRAMS)
rm -f *.o $(PROGRAMS)
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -56,6 +56,8 @@ clean: subdir-clean
subdir-clean:
@$(MAKE) -C imagezip clean
@$(MAKE) -C frisbee.redux clean
@$(MAKE) -C growdisk clean
@$(MAKE) -C syncd clean
distclean: subdir-distclean
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -26,4 +26,4 @@ growdisk: growdisk.o
install:
clean:
/bin/rm -f *.o growdisk growdisk.debug
rm -f *.o growdisk growdisk.debug
......@@ -119,14 +119,21 @@ client-install: all
$(INSTALL_PROGRAM) imagedump $(DESTDIR)/usr/local/bin/imagedump
clean: subdir-clean
/bin/rm -f *.o imagezip imageunzip imagedump version.c
/bin/rm -f imagezip.tar imagezip.tar.gz
rm -f *.o imagezip imageunzip imagedump imagehash version.c
rm -f imagezip.tar imagezip.tar.gz
subdir-clean:
@list='$(SUBDIRS)'; for dir in $$list; do \
$(MAKE) -C $$dir clean; \
done;
distclean: subdir-distclean
subdir-distclean:
@list='$(SUBDIRS)'; for dir in $$list; do \
$(MAKE) -C $$dir distclean; \
done;
imagezip.tar.gz: imagezip.tar
gzip -c imagezip.tar > imagezip.tar.gz
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -47,6 +47,9 @@ liblocale/liblocale.a:
@$(MAKE) -C liblocale
clean:
-$(MAKE) -C libntfs clean
-$(MAKE) -C liblocale clean
@$(MAKE) -C libntfs clean
@$(MAKE) -C liblocale clean
/bin/rm -f libntfs.a liblocale.a ntfs_glue.o
distclean:
@$(MAKE) -C libntfs distclean
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -82,3 +82,6 @@ endif
clean:
-rm -f *.o *~ *.a config.* Makefile
-rm -rf $(NTFSDIR)
distclean:
-rm -rf *.gz *.spec *-h doc libtool include libntfs
......@@ -40,5 +40,5 @@ check:
sh $(SRCDIR)/syncd_test.sh
clean:
/bin/rm -f *.o emulab-syncd version.c
rm -f *.o emulab-syncd emulab-sync version.c
......@@ -78,4 +78,4 @@ install: $(INSTALL_SBINDIR)/bootinfo \
$(INSTALL_ETCDIR)/bootinfo.conf
clean:
rm -f *.o core bootinfo bootinfosend *.restart testmysql
rm -f *.o core bootinfo bootinfosend testmysql bootinfo_version.c
......@@ -9,6 +9,7 @@ SUBDIR = rc.d
include $(OBJDIR)/Makeconf
RC_SCRIPTS = 2.mysql-server.sh 3.testbed.sh 2.elvind.sh 1.named.sh
#
# Force dependencies to make sure configure regenerates if the .in file
# is changed.
......@@ -25,5 +26,3 @@ $(INSTALL_RCDIR)/%: %
install: $(addprefix $(INSTALL_RCDIR)/, $(RC_SCRIPTS))
clean:
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -55,4 +55,4 @@ post-install:
control-install: $(addprefix $(INSTALL_BINDIR)/, plasticwrap)
clean:
rm -f *.o $(BINS) $(SBINS) $(SCRIPTS) core
rm -f *.o genlastlog suexec core
......@@ -61,5 +61,5 @@ client-install: client
$(INSTALL_PROGRAM) -s $(SLOTHD_DIR)/slothd $(DESTDIR)$(CLIENT_BINDIR)
clean:
rm -f *.o $(SDPROGS) $(SBIN_SCRIPTS) *~ core *.core version.c
rm -f *.o $(SDPROGS) *~ core *.core version.c
rm -rf fbsdclient linuxclient
......@@ -182,14 +182,15 @@ control-install: $(addprefix $(INSTALL_SBINDIR)/, console_setup.proxy) \
#
tipserv-install: $(addprefix $(INSTALL_SBINDIR)/, console_setup.proxy)
clean: subdir-clean
rm -f *.o core
rm -f *.o core routecalc wanlinksolve
subdir-clean:
@$(MAKE) -C checkpass clean
@$(MAKE) -C ns2ir clean
@$(MAKE) -C nseparse clean
# @$(MAKE) -C plab clean
@$(MAKE) -C plab clean
@$(MAKE) -C ipassign clean
distclean: subdir-distclean
......
......@@ -30,6 +30,10 @@ TMLIBS += -lssl -lcrypto
SSLOBJ = ssl.o
ifeq ($(SYSTEM),Linux)
TMLIBS += -ldl
MDSUBDIR = linux
endif
ifeq ($(SYSTEM),FreeBSD)
MDSUBDIR = freebsd
endif
ifeq ($(EVENTSYS),1)
......@@ -71,16 +75,7 @@ install: $(INSTALL_SBINDIR)/tmcd \
client-install: tmcc-nossl findif
ifeq ($(SYSTEM),FreeBSD)
@$(MAKE) -C freebsd install
else
ifeq ($(SYSTEM),Linux)
@$(MAKE) -C linux install
else
@echo "unknown OS, nothing to install"
endif
endif
#endif
@$(MAKE) -C $(MDSUBDIR) install
$(INSTALL_BINDIR)/tmcd/%: %
@echo "Installing $<"
......@@ -96,5 +91,8 @@ ${OBJDIR}/event/lib/%:
${OBJDIR}/lib/libtb/%:
cd ${OBJDIR}/lib/tbdb && gmake $<
clean:
rm -f *.o core tmcd tmcd.restart tmcc tmcc-nossl findif version.c
clean: subdir-clean
rm -f *.o core tmcd tmcc tmcc-nossl findif version.c
subdir-clean:
@$(MAKE) -C $(MDSUBDIR) clean
......@@ -173,4 +173,4 @@ locrem-install:
$(BINDIR)/control_interface
clean:
/bin/rm -f injail
rm -f injail
......@@ -57,7 +57,7 @@ basefbsd-install: dir-install
(cd ../freebsd; $(MAKE) all install)
rm -f $(SYSETCDIR)/start_if.*
sup-install: dir-install
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
bin-install: dir-install
......@@ -84,6 +84,3 @@ jail-install: dir-install
$(INSTALL) -m 755 $(SRCDIR)/jail/jailsetup $(BINDIR)/jailsetup
$(INSTALL) -m 755 $(SRCDIR)/jail/mkjail.pl $(BINDIR)/mkjail.pl
$(INSTALL) -m 755 ./injail $(JAILDIR)/injail
clean:
/bin/rm -f supfile
......@@ -61,7 +61,7 @@ dir-install:
common-install: dir-install
(cd ../common; $(MAKE) local-install)
sup-install: dir-install
sup-install: dir-install supfile
$(INSTALL) -m 755 ./supfile $(ETCDIR)/supfile
$(INSTALL) -m 750 -o root -g wheel -d $(DESTDIR)/root/.cvsup
$(INSTALL) -m 600 $(SRCDIR)/cvsup.auth $(DESTDIR)/root/.cvsup/auth
......@@ -77,7 +77,7 @@ etc-install: dir-install sysetc-remove sysetc-install
$(INSTALL) -m 600 $(SRCDIR)/gshadow $(ETCDIR)/gshadow
$(INSTALL) -m 644 $(SRCDIR)/hosts $(ETCDIR)/hosts
sysetc-install: dir-install
sysetc-install: dir-install pump.conf
$(INSTALL) -m 644 ./pump.conf $(SYSETCDIR)/pump.conf
$(INSTALL) -m 755 $(SRCDIR)/dhclient-exit-hooks \
$(SYSETCDIR)/dhclient-exit-hooks
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2002 University of Utah and the Flux Group.
# Copyright (c) 2000-2002, 2004 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ..
SUBDIR = utils
SUBDIR = tools
include $(OBJDIR)/Makeconf
......@@ -17,10 +17,10 @@ all: all-subdirs
include $(TESTBED_SRCDIR)/GNUmakerules
clean: clean-subdirs
# How to recursively descend into subdirectories to make general
# targets such as `all'.
%.MAKE:
@$(MAKE) -C $(dir $@) $(basename $(notdir $@))
%-subdirs: $(addsuffix /%.MAKE,$(SUBDIRS)) ;
clean:
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# Copyright (c) 2000-2004 University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -58,4 +58,7 @@ control-install:
subdir-install:
@$(MAKE) -C nsgen install
clean:
clean: subdir-clean
subdir-clean:
@$(MAKE) -C nsgen clean
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