diff --git a/src/plugins/task/cgroup/Makefile.in b/src/plugins/task/cgroup/Makefile.in
index aca824253561e068cb0204ef98875f2432885a7f..8b5e5423bf13cdc5f48227f82b02a1ec6e68e220 100644
--- a/src/plugins/task/cgroup/Makefile.in
+++ b/src/plugins/task/cgroup/Makefile.in
@@ -418,8 +418,8 @@ distclean-compile:
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cgroup_la-task_cgroup.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cgroup_la-task_cgroup_cpuset.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cgroup_la-task_cgroup_memory.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cgroup_la-task_cgroup_devices.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/task_cgroup_la-task_cgroup_memory.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
diff --git a/src/smap/Makefile.in b/src/smap/Makefile.in
index 363e737e64bea46cd765b17d32b2d8c279b5b751..6e27caa8d485a10d4c75118039ed20c845407323 100644
--- a/src/smap/Makefile.in
+++ b/src/smap/Makefile.in
@@ -43,6 +43,8 @@ build_triplet = @build@
 host_triplet = @host@
 target_triplet = @target@
 @HAVE_SOME_CURSES_TRUE@bin_PROGRAMS = smap$(EXEEXT)
+@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@am__append_1 = $(bg_dir)/bg_read_config.o $(bg_dir)/libba_common.la $(ba_lib_dir)/libblock_allocator.la
+@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@am__append_2 = configure_functions.c
 subdir = src/smap
 DIST_COMMON = $(am__noinst_HEADERS_DIST) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
@@ -93,21 +95,22 @@ CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
 am__smap_SOURCES_DIST = smap.c job_functions.c partition_functions.c \
-	configure_functions.c grid_functions.c reservation_functions.c \
-	opts.c
+	grid_functions.c reservation_functions.c opts.c \
+	configure_functions.c
+@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@am__objects_1 = configure_functions.$(OBJEXT)
 @HAVE_SOME_CURSES_TRUE@am_smap_OBJECTS = smap.$(OBJEXT) \
 @HAVE_SOME_CURSES_TRUE@	job_functions.$(OBJEXT) \
 @HAVE_SOME_CURSES_TRUE@	partition_functions.$(OBJEXT) \
-@HAVE_SOME_CURSES_TRUE@	configure_functions.$(OBJEXT) \
 @HAVE_SOME_CURSES_TRUE@	grid_functions.$(OBJEXT) \
 @HAVE_SOME_CURSES_TRUE@	reservation_functions.$(OBJEXT) \
-@HAVE_SOME_CURSES_TRUE@	opts.$(OBJEXT)
+@HAVE_SOME_CURSES_TRUE@	opts.$(OBJEXT) $(am__objects_1)
 am__EXTRA_smap_SOURCES_DIST = smap.h smap.c job_functions.c \
 	partition_functions.c configure_functions.c grid_functions.c \
 	reservation_functions.c opts.c
 smap_OBJECTS = $(am_smap_OBJECTS)
 @HAVE_SOME_CURSES_TRUE@smap_DEPENDENCIES =  \
-@HAVE_SOME_CURSES_TRUE@	$(top_builddir)/src/api/libslurm.o
+@HAVE_SOME_CURSES_TRUE@	$(top_builddir)/src/api/libslurm.o \
+@HAVE_SOME_CURSES_TRUE@	$(am__append_1)
 smap_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
 	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(smap_LDFLAGS) \
 	$(LDFLAGS) -o $@
@@ -329,13 +332,17 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 AUTOMAKE_OPTIONS = foreign
 INCLUDES = -I$(top_srcdir) $(BG_INCLUDES)
-@HAVE_SOME_CURSES_TRUE@smap_LDADD = $(top_builddir)/src/api/libslurm.o -ldl
 @HAVE_SOME_CURSES_TRUE@noinst_HEADERS = smap.h
-@HAVE_SOME_CURSES_TRUE@smap_SOURCES = smap.c \
-@HAVE_SOME_CURSES_TRUE@	job_functions.c partition_functions.c \
-@HAVE_SOME_CURSES_TRUE@	configure_functions.c grid_functions.c \
-@HAVE_SOME_CURSES_TRUE@	reservation_functions.c opts.c
-
+@HAVE_SOME_CURSES_TRUE@smap_SOURCES = smap.c job_functions.c \
+@HAVE_SOME_CURSES_TRUE@	partition_functions.c grid_functions.c \
+@HAVE_SOME_CURSES_TRUE@	reservation_functions.c opts.c \
+@HAVE_SOME_CURSES_TRUE@	$(am__append_2)
+@HAVE_SOME_CURSES_TRUE@smap_LDADD =  \
+@HAVE_SOME_CURSES_TRUE@	$(top_builddir)/src/api/libslurm.o -ldl \
+@HAVE_SOME_CURSES_TRUE@	$(am__append_1)
+@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@bg_dir = $(top_builddir)/src/plugins/select/bluegene
+@BG_L_P_LOADED_FALSE@@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@ba_lib_dir = $(bg_dir)/ba_bgq
+@BG_L_P_LOADED_TRUE@@BLUEGENE_LOADED_TRUE@@HAVE_SOME_CURSES_TRUE@ba_lib_dir = $(bg_dir)/ba
 @HAVE_SOME_CURSES_TRUE@smap_LDFLAGS = -export-dynamic $(CMD_LDFLAGS)
 @HAVE_SOME_CURSES_FALSE@EXTRA_smap_SOURCES = smap.h smap.c \
 @HAVE_SOME_CURSES_FALSE@	job_functions.c partition_functions.c \