From 25e4bf515467b5c22a4f8387d4f8a6d56b85e299 Mon Sep 17 00:00:00 2001 From: Danny Auble <da@schedmd.com> Date: Thu, 18 Apr 2013 11:30:15 -0700 Subject: [PATCH] Modification to recent patch to not build launch/slurm on a BGQ system (It is good on that system) --- src/plugins/launch/Makefile.am | 19 ++++++++++--------- src/plugins/launch/Makefile.in | 16 +++++++++------- 2 files changed, 19 insertions(+), 16 deletions(-) diff --git a/src/plugins/launch/Makefile.am b/src/plugins/launch/Makefile.am index c9ec2861075..256ae2a895c 100644 --- a/src/plugins/launch/Makefile.am +++ b/src/plugins/launch/Makefile.am @@ -1,16 +1,17 @@ # Makefile for launch plugins -# launch/slurm can be useful for testing on any system type -SUBDIRS = slurm - if REAL_BGQ_LOADED -SUBDIRS += runjob +SUBDIRS = runjob +else +# launch/slurm can be useful for testing on any system other type +SUBDIRS = slurm +if HAVE_NRT +SUBDIRS += poe endif - -if HAVE_CRAY +if HAVE_REAL_CRAY +SUBDIRS += aprun +endif +if HAVE_ALPS_EMULATION SUBDIRS += aprun endif - -if HAVE_NRT -SUBDIRS += poe endif diff --git a/src/plugins/launch/Makefile.in b/src/plugins/launch/Makefile.in index 7d9dc1374c3..ea9e372a4ed 100644 --- a/src/plugins/launch/Makefile.in +++ b/src/plugins/launch/Makefile.in @@ -53,9 +53,9 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ target_triplet = @target@ -@REAL_BGQ_LOADED_TRUE@am__append_1 = runjob -@HAVE_CRAY_TRUE@am__append_2 = aprun -@HAVE_NRT_TRUE@am__append_3 = poe +@HAVE_NRT_TRUE@@REAL_BGQ_LOADED_FALSE@am__append_1 = poe +@HAVE_REAL_CRAY_TRUE@@REAL_BGQ_LOADED_FALSE@am__append_2 = aprun +@HAVE_ALPS_EMULATION_TRUE@@REAL_BGQ_LOADED_FALSE@am__append_3 = aprun subdir = src/plugins/launch DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -123,7 +123,7 @@ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ distdir ETAGS = etags CTAGS = ctags -DIST_SUBDIRS = slurm runjob aprun poe +DIST_SUBDIRS = slurm poe aprun runjob DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) am__relativize = \ dir0=`pwd`; \ @@ -357,9 +357,11 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ - -# launch/slurm can be useful for testing on any system type -SUBDIRS = slurm $(am__append_1) $(am__append_2) $(am__append_3) +# launch/slurm can be useful for testing on any system other type +@REAL_BGQ_LOADED_FALSE@SUBDIRS = slurm $(am__append_1) $(am__append_2) \ +@REAL_BGQ_LOADED_FALSE@ $(am__append_3) +@REAL_BGQ_LOADED_TRUE@SUBDIRS = runjob $(am__append_1) $(am__append_2) \ +@REAL_BGQ_LOADED_TRUE@ $(am__append_3) all: all-recursive .SUFFIXES: -- GitLab