Skip to content

GitLab

Commit 781299ea authored by Leigh B Stoller's avatar Leigh B Stoller
Browse files
Options

Cleanup and repair control-install target.

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