From a761e3d65ec22573e86b0483797ec4ff9dae2de7 Mon Sep 17 00:00:00 2001
From: Danny Auble <da@schedmd.com>
Date: Wed, 24 Jul 2013 18:02:34 -0700
Subject: [PATCH] CRAY - Added more flags
---
src/plugins/switch/cray/Makefile.am | 4 ++--
src/plugins/switch/cray/Makefile.in | 9 +++++----
src/plugins/task/cray/Makefile.am | 7 ++-----
src/plugins/task/cray/Makefile.in | 7 ++++---
4 files changed, 13 insertions(+), 14 deletions(-)
diff --git a/src/plugins/switch/cray/Makefile.am b/src/plugins/switch/cray/Makefile.am
index 87e8ecc0d11..7eb070a0588 100644
--- a/src/plugins/switch/cray/Makefile.am
+++ b/src/plugins/switch/cray/Makefile.am
@@ -11,5 +11,5 @@ pkglib_LTLIBRARIES = switch_cray.la
# Null switch plugin.
switch_cray_la_SOURCES = switch_cray.c
-switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
- $(CRAY_LDFLAGS) $(CRAY_SWITCH_LDFLAGS)
+switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+switch_cray_la_LIBADD = $(CRAY_LDFLAGS) $(CRAY_SWITCH_LDFLAGS)
diff --git a/src/plugins/switch/cray/Makefile.in b/src/plugins/switch/cray/Makefile.in
index 71219cc9603..bcc30692ead 100644
--- a/src/plugins/switch/cray/Makefile.in
+++ b/src/plugins/switch/cray/Makefile.in
@@ -133,7 +133,9 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-switch_cray_la_LIBADD =
+am__DEPENDENCIES_1 =
+switch_cray_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ $(am__DEPENDENCIES_1)
am_switch_cray_la_OBJECTS = switch_cray.lo
switch_cray_la_OBJECTS = $(am_switch_cray_la_OBJECTS)
switch_cray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -404,9 +406,8 @@ pkglib_LTLIBRARIES = switch_cray.la
# Null switch plugin.
switch_cray_la_SOURCES = switch_cray.c
-switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS) \
- $(CRAY_LDFLAGS) $(CRAY_SWITCH_LDFLAGS)
-
+switch_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
+switch_cray_la_LIBADD = $(CRAY_LDFLAGS) $(CRAY_SWITCH_LDFLAGS)
all: all-am
.SUFFIXES:
diff --git a/src/plugins/task/cray/Makefile.am b/src/plugins/task/cray/Makefile.am
index d036ffb89b7..42b3cecd024 100644
--- a/src/plugins/task/cray/Makefile.am
+++ b/src/plugins/task/cray/Makefile.am
@@ -4,14 +4,11 @@ AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_CPPFLAGS)
pkglib_LTLIBRARIES = task_cray.la
# Null task plugin.
task_cray_la_SOURCES = task_cray.c
task_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-
-if HAVE_REAL_CRAY
- task_cray_la_LIBADD = -ljob
-endif
+task_cray_la_LIBADD = $(CRAY_LDFLAGS)
diff --git a/src/plugins/task/cray/Makefile.in b/src/plugins/task/cray/Makefile.in
index d5099fc9e42..7cbcca82a89 100644
--- a/src/plugins/task/cray/Makefile.in
+++ b/src/plugins/task/cray/Makefile.in
@@ -133,7 +133,8 @@ am__uninstall_files_from_dir = { \
}
am__installdirs = "$(DESTDIR)$(pkglibdir)"
LTLIBRARIES = $(pkglib_LTLIBRARIES)
-task_cray_la_DEPENDENCIES =
+am__DEPENDENCIES_1 =
+task_cray_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_task_cray_la_OBJECTS = task_cray.lo
task_cray_la_OBJECTS = $(am_task_cray_la_OBJECTS)
task_cray_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -397,13 +398,13 @@ top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
AUTOMAKE_OPTIONS = foreign
PLUGIN_FLAGS = -module -avoid-version --export-dynamic
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/src/common $(CRAY_CPPFLAGS)
pkglib_LTLIBRARIES = task_cray.la
# Null task plugin.
task_cray_la_SOURCES = task_cray.c
task_cray_la_LDFLAGS = $(SO_LDFLAGS) $(PLUGIN_FLAGS)
-@HAVE_REAL_CRAY_TRUE@task_cray_la_LIBADD = -ljob
+task_cray_la_LIBADD = $(CRAY_LDFLAGS)
all: all-am
.SUFFIXES:
--
GitLab