CRAY - Added more flags

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)

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:

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)

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: