Commit a46d48d6 authored by Jonathon Duerig's avatar Jonathon Duerig

Added a Makefile to ipassign and integrated into the testbed makefiles

parent c1dea645
......@@ -1420,6 +1420,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/plab/libdslice/GNUmakefile tbsetup/plab/etc/GNUmakefile \
tbsetup/plab/plabdist tbsetup/plab/plabhttpd \
tbsetup/plab/etc/netbed_files/GNUmakefile \
tbsetup/ipassign/GNUmakefile tbsetup/ipassign/src/GNUmakefile \
tip/GNUmakefile \
tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/openbsd/GNUmakefile \
tmcd/linux/GNUmakefile tmcd/ron/GNUmakefile tmcd/common/GNUmakefile \
......
......@@ -463,6 +463,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
tbsetup/plab/libdslice/GNUmakefile tbsetup/plab/etc/GNUmakefile \
tbsetup/plab/plabdist tbsetup/plab/plabhttpd \
tbsetup/plab/etc/netbed_files/GNUmakefile \
tbsetup/ipassign/GNUmakefile tbsetup/ipassign/src/GNUmakefile \
tip/GNUmakefile \
tmcd/GNUmakefile tmcd/freebsd/GNUmakefile tmcd/openbsd/GNUmakefile \
tmcd/linux/GNUmakefile tmcd/ron/GNUmakefile tmcd/common/GNUmakefile \
......
......@@ -13,7 +13,7 @@ PLABSUPPORT = @PLABSUPPORT@
include $(OBJDIR)/Makeconf
SUBDIRS = checkpass ns2ir
SUBDIRS = checkpass ns2ir ipassign
BIN_STUFF = power snmpit tbend tbprerun tbreport \
os_load startexp endexp batchexp swapexp \
......@@ -65,7 +65,7 @@ wanlinksolve: wanlinksolve.cc
routecalc: routecalc.cc
${CXX} $< ${CXXFLAGS} -o $@ ${LIBS} -lm -lstdc++ ${LDFLAGS}
.PHONY: checkpass ns2ir plab
.PHONY: checkpass ns2ir plab ipassign
checkpass:
@$(MAKE) -C checkpass all
......@@ -75,6 +75,9 @@ ns2ir:
plab:
@$(MAKE) -C plab all
ipassign:
@$(MAKE) -C ipassign all
install: all script-install subdir-install
@echo "Don't forget to do a post-install as root"
......@@ -96,6 +99,7 @@ subdir-install:
@$(MAKE) -C checkpass install
@$(MAKE) -C ns2ir install
$(PLAB_INSTALL)
@$(MAKE) -C ipassign install
script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
......@@ -106,6 +110,7 @@ script-install: $(addprefix $(INSTALL_BINDIR)/, $(BIN_STUFF)) \
post-install:
@$(MAKE) -C ns2ir post-install
$(PLAB_POST_INSTALL)
@$(MAKE) -C ipassign post-install
chmod 775 $(INSTALL_BINDIR)
chmod 775 $(INSTALL_SBINDIR)
chmod 775 $(INSTALL_LIBDIR)
......@@ -177,6 +182,7 @@ subdir-clean:
@$(MAKE) -C checkpass clean
@$(MAKE) -C ns2ir clean
# @$(MAKE) -C plab clean
@$(MAKE) -C ipassign clean
distclean: subdir-distclean
......@@ -184,7 +190,7 @@ subdir-distclean:
@$(MAKE) -C checkpass distclean
@$(MAKE) -C ns2ir distclean
@$(MAKE) -C plab distclean
@$(MAKE) -C ipassign distclean
#
# XXX Create non .tcl files.
#
......
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../..
SUBDIR = tbsetup/ipassign
UNIFIED = @UNIFIED_BOSS_AND_OPS@
include $(OBJDIR)/Makeconf
SUBDIRS = src
#
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
#
all: $(SUBDIRS)
include $(TESTBED_SRCDIR)/GNUmakerules
.PHONY: src
src:
@$(MAKE) -C src all
install: all subdir-install
#
# Automate this part at some point.
#
subdir-install:
@$(MAKE) -C src install
post-install:
@$(MAKE) -C src post-install
clean: subdir-clean
subdir-clean:
@$(MAKE) -C src clean
distclean: subdir-distclean
subdir-distclean:
@$(MAKE) -C src distclean
#
# EMULAB-COPYRIGHT
# Copyright (c) 2000-2003 University of Utah and the Flux Group.
# All rights reserved.
#
SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@
OBJDIR = ../../..
SUBDIR = tbsetup/ipassign/src
UNIFIED = @UNIFIED_BOSS_AND_OPS@
include $(OBJDIR)/Makeconf
LIBEXEC_STUFF = ipassign
IPASSIGN_OBJECTS = Graph.o ipassign.o
IPASSIGN_HEADERS = Exception.h Graph.h lib.h
#
# Force dependencies on the scripts so that they will be rerun through
# configure if the .in file is changed.
#
all: $(LIBEXEC_STUFF)
include $(TESTBED_SRCDIR)/GNUmakerules
install: all libexec-install
#
# Automate this part at some point.
#
libexec-install: $(addprefix $(INSTALL_LIBEXECDIR)/, $(LIBEXEC_STUFF))
ipassign: $(IPASSIGN_OBJECTS) $(IPASSIGN_HEADERS)
$(CC) $(CFLAGS) $(IPASSIGN_OBJECTS) -lm -lmetis -o ipassign
Graph.o: Graph.cc $(IPASSIGN_HEADERS)
$(CC) $(LDFLAGS) Graph.cc -o Graph.o
ipassign.o: ipassign.cc $(IPASSIGN_HEADERS)
$(CC) $(LDFLAGS) ipassign.cc -o ipassign.o
post-install:
chmod 775 $(INSTALL_LIBEXECDIR)
clean:
rm -f ipassign.o Graph.o ipassign
distclean:
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