Commit 6e910597 authored by Mike Hibler's avatar Mike Hibler

Make subboss install do the right thing.

parent 74e493e8
...@@ -49,13 +49,13 @@ endif ...@@ -49,13 +49,13 @@ endif
$(MAKE) -C frisbee.redux client-install $(MAKE) -C frisbee.redux client-install
subboss: client subboss: client
$(MAKE) -C frisbee.redux all $(MAKE) -C frisbee.redux subboss
subboss-install: subboss client-install subboss-install: subboss client-install
ifeq ($(SYSTEM),FreeBSD) ifeq ($(SYSTEM),FreeBSD)
CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux install CLIENT_BINDIR=/etc/testbed $(MAKE) -e -C frisbee.redux subboss-install
else else
CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux install CLIENT_BINDIR=/usr/local/bin $(MAKE) -e -C frisbee.redux subboss-install
endif endif
mfs: mfs:
......
...@@ -42,13 +42,20 @@ endif ...@@ -42,13 +42,20 @@ endif
endif endif
endif endif
#ifndef WITH_MSERVER_NULL
WITH_MSERVER_NULL = 1 WITH_MSERVER_NULL = 1
#endif
#ifndef WITH_MSERVER_EMULAB
WITH_MSERVER_EMULAB = 1 WITH_MSERVER_EMULAB = 1
#endif
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
all: frisbee frisbeed mfrisbeed frisupload frisuploadd all: frisbee frisbeed mfrisbeed frisupload frisuploadd
subboss:
$(MAKE) WITH_MSERVER_EMULAB=0 all
include $(TESTBED_SRCDIR)/GNUmakerules include $(TESTBED_SRCDIR)/GNUmakerules
FRISBEEDIR = $(OBJDIR)/os/imagezip FRISBEEDIR = $(OBJDIR)/os/imagezip
...@@ -188,10 +195,8 @@ frisuploadd-debug: $(UPLOADDOBJS) ...@@ -188,10 +195,8 @@ frisuploadd-debug: $(UPLOADDOBJS)
# cp frisuploadd frisuploadd.debug # cp frisuploadd frisuploadd.debug
# strip frisuploadd # strip frisuploadd
mfrisbeed: $(MSERVEROBJS) mfrisbeed-debug: $(MSERVEROBJS)
$(CC) $(LDFLAGS) $(MSERVERFLAGS) $(MSERVEROBJS) $(MSERVERLIBS) -o mfrisbeed $(CC) $(LDFLAGS) $(MSERVERFLAGS) $(MSERVEROBJS) $(MSERVERLIBS) -o $@
cp mfrisbeed mfrisbeed.debug
strip mfrisbeed
frisuploader.o: $(SRCDIR)/frisuploader.c decls.h uploadio.h frisuploader.o: $(SRCDIR)/frisuploader.c decls.h uploadio.h
$(CC) -c $(UPLOADDFLAGS) $(SRCDIR)/frisuploader.c $(CC) -c $(UPLOADDFLAGS) $(SRCDIR)/frisuploader.c
...@@ -234,6 +239,9 @@ trace.o: decls.h trace.h log.h ...@@ -234,6 +239,9 @@ trace.o: decls.h trace.h log.h
install: $(INSTALL_SBINDIR)/mfrisbeed $(INSTALL_SBINDIR)/frisbeed $(INSTALL_SBINDIR)/frisbee $(INSTALL_SBINDIR)/frisuploadd install: $(INSTALL_SBINDIR)/mfrisbeed $(INSTALL_SBINDIR)/frisbeed $(INSTALL_SBINDIR)/frisbee $(INSTALL_SBINDIR)/frisuploadd
subboss-install: subboss
$(MAKE) WITH_MSERVER_EMULAB=0 install
client: frisbee frisupload client: frisbee frisupload
client-install: client client-install: client
......
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