Commit 781299ea authored by Leigh Stoller's avatar Leigh Stoller

Cleanup and repair control-install target.

parent 76d7f149
......@@ -128,16 +128,13 @@ ops-install:
@$(MAKE) -C tbsetup control-install
@$(MAKE) -C security control-install
@$(MAKE) -C tip control-install
# @$(MAKE) -C os control-install
@$(MAKE) -C db control-install
@$(MAKE) -C tbsetup control-install
@$(MAKE) -C utils control-install
@$(MAKE) -C clientside control-install
ifeq ($(EVENTSYS),1)
@$(MAKE) -C event control-install
endif
@$(MAKE) -C sensors control-install
@$(MAKE) -C xmlrpc control-install
@$(MAKE) -C tmcd control-install
@$(MAKE) -C account control-install
ifeq ($(PELABSUPPORT),1)
@$(MAKE) -C pelab control-install
......
......@@ -34,6 +34,7 @@ $(OBJS): main.h $(TESTBED_LIBOBJDIR)/event/libevent.a
install:
boss-install:
control-install:
client: delay-agent
client-install: client
......
......@@ -54,6 +54,7 @@ $(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
${TESTBED_LIBSRCDIR}/event/event.h
boss-install:
control-install:
client: $(PROGRAMS)
client-install: client
......
......@@ -112,6 +112,7 @@ $(PROGRAMS): ${TESTBED_LIBOBJDIR}/event/libevent.a \
install:
boss-install:
control-install:
client: $(PROGRAMS)
client-install: client
......
......@@ -50,7 +50,7 @@ install: all
client: all
client-install:
boss-install:
control-install:
control-install: all
subboss-install:
client-install:
mfs:
......
......@@ -30,6 +30,7 @@ dijkstra-debug: Compressor.o TreeCompressor.o dijkstra.o \
OptimalIpTree.o bitmath.o $(LIBS) -o $@
boss-install:
control-install:
client: all
client-install: client
$(INSTALL_PROGRAM) dijkstra$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/dijkstra$(EXE)
......
......@@ -23,7 +23,7 @@ genhostsfile-debug: genhostsfile.o
wgraph.o: wgraph.cc wgraph.h
boss-install: $(INSTALL_LIBEXECDIR)/genhostsfile
control-install:
client: genhostsfile
client-install: client
$(INSTALL_PROGRAM) genhostsfile$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/genhostsfile$(EXE)
......
......@@ -37,6 +37,8 @@ boss-install:
$(INSTALL) -m 644 $(SRCDIR)/emulab-sync.1 \
$(INSTALL_DIR)/opsdir/man/man1/emulab-sync.1
control-install:
client: all
client-install: client
$(INSTALL_PROGRAM) emulab-syncd$(EXE) $(DESTDIR)$(CLIENT_BINDIR)/emulab-syncd$(EXE)
......
......@@ -115,6 +115,7 @@ pcapper-noevents.o: pcapper.c
client: pcapper
boss-install:
control-install:
client-install: client
$(INSTALL_PROGRAM) -s pcapper $(DESTDIR)$(CLIENT_BINDIR)/pcapper
......@@ -50,7 +50,6 @@ endif
@$(MAKE) -C proxy control-install
post-install:
@$(MAKE) -C linktest post-install
clean: clean-subdirs
distclean: distclean-subdirs
......
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