More Makefile hacking.

tbsetup/GNUmakefile

@@ -4,13 +4,19 @@
 include ../Makeconf
 include ../GNUmakerules
 
+SUBDIRS		= checkpass
 SCRIPTS		= mkprojdir_wrapper tbdoit tbstopit mkexpdir \
 		  mkacct rmacct delay_setup ifc_setup ifc_filegen \
 		  ir2ifc power resetvlans savevlans snmpit tbend \
-		  tbprerun tbreport vpower vsnmpit
+		  tbprerun tbreport vpower vsnmpit killtip
+DATAFILES	= default.ifc
 SUSCRIPTS	= mkprojdir
 
-all:	$(BINS)
+all:	$(BINS) $(SUBDIRS)
+
+.PHONY:	checkpass
+checkpass:
+	@$(MAKE) -C checkpass all
 
 #
 # Currently, all the stuff that gets installed in the bin directory
@@ -21,9 +27,18 @@ INSTALL_LIBTBDIR = $(INSTALL_LIBDIR)/tbsetup
 install: $(addprefix $(INSTALL_BINDIR)/, $(SCRIPTS)) \
 	 $(addprefix $(INSTALL_BINDIR)/, $(SUSCRIPTS)) \
 	 $(addprefix $(INSTALL_LIBTBDIR)/, $(SCRIPTS)) \
-	 $(addprefix $(INSTALL_LIBTBDIR)/, $(SUSCRIPTS))
+	 $(addprefix $(INSTALL_LIBTBDIR)/, $(DATAFILES)) \
+	 subdir-install
 	@echo "Don't forget to do a post-install as root"
 
+#
+# Automate this part at some point.
+# 
+subdir-install:
+	@$(MAKE) -C checkpass install	
+	@$(MAKE) -C ir install	
+	@$(MAKE) -C ns2ir install	
+
 #
 # Leave these rules here. They should be flushed when we no longer
 # dup this stuff.

tbsetup/checkpass/Makefile

-CC=/usr/gnu/bin/gcc 
-# Pick one of the two below.
+include ../../Makeconf
+include ../../GNUmakerules
 
 all: checkpass cracklib
 
@@ -9,8 +9,7 @@ checkpass: cracklib
 cracklib:
 	gmake -C cracklib,2.7 all
 
-install:
-	install -c checkpass /usr/testbed/bin
+install:	$(INSTALL_BINDIR)/checkpass
 
 clean:
 	gmake -C cracklib,2.7 clean

tbsetup/ir/GNUmakefile

+#
+# Insert Copyright Here.
+#
+include ../../Makeconf
+include ../../GNUmakerules
+
+#
+# These get installed with .tcl extensions.
+# 
+SCRIPTS		= assign.tcl handle_os.tcl extract_tb.tcl libir.tcl \
+		  handle_ip.tcl
+
+all:
+
+#
+# Currently, all the stuff that gets installed in the bin directory
+# gets duplicated in lib/tbsetup.
+#
+INSTALL_LIBTBDIR = $(INSTALL_LIBDIR)/tbsetup/ir
+
+install: $(addprefix $(INSTALL_LIBTBDIR)/, $(SCRIPTS))
+
+#
+# Leave these rules here. They should be flushed when we no longer
+# dup this stuff.
+# 
+$(INSTALL_LIBTBDIR)/%: %
+	@echo "Installing $<"
+	-mkdir -p $(INSTALL_LIBTBDIR)
+	$(INSTALL) $< $@
+
+clean:
+

tbsetup/ns2ir/GNUmakefile

+#
+# Insert Copyright Here.
+#
+include ../../Makeconf
+include ../../GNUmakerules
+
+#
+# These get installed with .tcl extensions.
+# 
+SCRIPTS		= event.tcl parse.tcl stubs.tcl link.tcl postparse.tcl \
+		  tcl-object.tcl node.tcl sim.tcl
+
+all:
+
+#
+# Currently, all the stuff that gets installed in the bin directory
+# gets duplicated in lib/tbsetup.
+#
+INSTALL_LIBTBDIR = $(INSTALL_LIBDIR)/tbsetup/ns2ir
+
+install: $(addprefix $(INSTALL_LIBTBDIR)/, $(SCRIPTS))
+
+#
+# Leave these rules here. They should be flushed when we no longer
+# dup this stuff.
+# 
+$(INSTALL_LIBTBDIR)/%: %
+	@echo "Installing $<"
+	-mkdir -p $(INSTALL_LIBTBDIR)
+	$(INSTALL) $< $@
+
+clean: