All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 997dc57a authored by Ryan Jackson's avatar Ryan Jackson

BUG FIX: Only build new event scheduler for Utah

parent d071fefb
...@@ -8,6 +8,7 @@ SRCDIR = @srcdir@ ...@@ -8,6 +8,7 @@ SRCDIR = @srcdir@
TESTBED_SRCDIR = @top_srcdir@ TESTBED_SRCDIR = @top_srcdir@
OBJDIR = .. OBJDIR = ..
SUBDIR = event SUBDIR = event
ISMAINSITE = @TBMAINSITE@
include $(OBJDIR)/Makeconf include $(OBJDIR)/Makeconf
...@@ -20,7 +21,10 @@ endif ...@@ -20,7 +21,10 @@ endif
ifeq ($(SYSTEM),FreeBSD) ifeq ($(SYSTEM),FreeBSD)
FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/') FBSDREL := $(shell uname -r | sed -e 's/\([^-][^-]*\)-.*/\1/')
FBSDMAJ := $(basename $(FBSDREL)) FBSDMAJ := $(basename $(FBSDREL))
SUBDIRS += sched new_sched stated SUBDIRS += sched stated
ifeq ($(ISMAINSITE),1)
SUBDIRS += new_sched
endif
ifneq ($(FBSDMAJ),8) ifneq ($(FBSDMAJ),8)
# doesn't build right now due to API changes # doesn't build right now due to API changes
SUBDIRS += delay-agent SUBDIRS += delay-agent
...@@ -44,7 +48,9 @@ etc-subdir: ...@@ -44,7 +48,9 @@ etc-subdir:
install: install:
@$(MAKE) -C lib install @$(MAKE) -C lib install
@$(MAKE) -C sched install @$(MAKE) -C sched install
ifeq ($(ISMAINSITE),1)
@$(MAKE) -C new_sched install @$(MAKE) -C new_sched install
endif
@$(MAKE) -C tbgen install @$(MAKE) -C tbgen install
@$(MAKE) -C stated install @$(MAKE) -C stated install
@$(MAKE) -C linktest install @$(MAKE) -C linktest install
...@@ -58,7 +64,9 @@ control-install: ...@@ -58,7 +64,9 @@ control-install:
@$(MAKE) -C lib control-install @$(MAKE) -C lib control-install
@$(MAKE) -C tbgen control-install @$(MAKE) -C tbgen control-install
@$(MAKE) -C sched control-install @$(MAKE) -C sched control-install
ifeq ($(ISMAINSITE),1)
@$(MAKE) -C new_sched control-install @$(MAKE) -C new_sched control-install
endif
@$(MAKE) -C linktest control-install @$(MAKE) -C linktest control-install
@$(MAKE) -C program-agent control-install @$(MAKE) -C program-agent control-install
@$(MAKE) -C proxy control-install @$(MAKE) -C proxy control-install
......
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