From 7869402f5f4356584e934e142c558803f72aa944 Mon Sep 17 00:00:00 2001
From: Ralph Castain <rhc@open-mpi.org>
Date: Wed, 12 Mar 2014 02:10:35 +0000
Subject: [PATCH] Sigh - looks like I did too good a job of turning things off.
 Back some of it out in favor of trying again when more time is available

Refs trac:4368

This commit was SVN r31017.

The following Trac tickets were found above:
  Ticket 4368 --> https://svn.open-mpi.org/trac/ompi/ticket/4368
---
 orte/tools/Makefile.am            | 2 --
 orte/tools/wrappers/Makefile.am   | 2 --
 oshmem/Makefile.am                | 6 ------
 oshmem/tools/Makefile.am          | 2 --
 oshmem/tools/wrappers/Makefile.am | 2 --
 5 files changed, 14 deletions(-)

diff --git a/orte/tools/Makefile.am b/orte/tools/Makefile.am
index fcbe10a712..8ddebc8387 100644
--- a/orte/tools/Makefile.am
+++ b/orte/tools/Makefile.am
@@ -24,7 +24,6 @@
 # This makefile.am does not stand on its own - it is included from
 # orte/Makefile.am
 
-if PROJECT_ORTE
 SUBDIRS += \
 	tools/orte-checkpoint \
 	tools/orte-clean \
@@ -37,7 +36,6 @@ SUBDIRS += \
         tools/orte-info \
         tools/orte-migrate \
         tools/orte-server
-endif
 
 DIST_SUBDIRS += \
 	tools/orte-checkpoint \
diff --git a/orte/tools/wrappers/Makefile.am b/orte/tools/wrappers/Makefile.am
index 148e909751..ed01690b17 100644
--- a/orte/tools/wrappers/Makefile.am
+++ b/orte/tools/wrappers/Makefile.am
@@ -26,14 +26,12 @@ nodist_ompidata_DATA = ortecc-wrapper-data.txt
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = orte.pc
 
-if PROJECT_ORTE
 install-exec-hook:
 	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	(cd $(DESTDIR)$(bindir); rm -f ortecc$(EXEEXT); $(LN_S) opal_wrapper ortecc)
 
 uninstall-local:
 	rm -f $(DESTDIR)$(bindir)/ortecc$(EXEEXT)
-endif
 
 endif # OMPI_INSTALL_BINARIES
 
diff --git a/oshmem/Makefile.am b/oshmem/Makefile.am
index b824ec5ed8..fde2be5e5d 100644
--- a/oshmem/Makefile.am
+++ b/oshmem/Makefile.am
@@ -29,21 +29,17 @@ SUBDIRS = \
 	shmem/c \
 	shmem/fortran
 
-if PROJECT_OSHMEM
 SUBDIRS += \
 	$(EXT_oshmem_FRAMEWORKS_SUBDIRS) \
 	$(EXT_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
 	$(MCA_oshmem_FRAMEWORKS_SUBDIRS) \
 	$(MCA_oshmem_FRAMEWORK_COMPONENT_STATIC_SUBDIRS)
-endif
 
 SUBDIRS += \
 	.
 
-if PROJECT_OSHMEM
 SUBDIRS += \
 	$(MCA_oshmem_FRAMEWORK_COMPONENT_DSO_SUBDIRS) 
-endif
 
 DIST_SUBDIRS = \
 	include \
@@ -56,9 +52,7 @@ DIST_SUBDIRS = \
 
 #Build The main OSHMEM library
 lib_LTLIBRARIES =
-if PROJECT_OSHMEM
 lib_LTLIBRARIES += liboshmem.la
-endif
 
 liboshmem_la_SOURCES =
 liboshmem_la_LIBADD = \
diff --git a/oshmem/tools/Makefile.am b/oshmem/tools/Makefile.am
index 4004674053..e768ee0c0c 100644
--- a/oshmem/tools/Makefile.am
+++ b/oshmem/tools/Makefile.am
@@ -11,11 +11,9 @@
 
 # This makefile.am does not stand on its own - it is included from oshmem/Makefile.am
 
-if PROJECT_OSHMEM
 SUBDIRS += \
 	tools/oshmem_info \
 	tools/wrappers
-endif
 
 DIST_SUBDIRS += \
 	tools/oshmem_info \
diff --git a/oshmem/tools/wrappers/Makefile.am b/oshmem/tools/wrappers/Makefile.am
index ad802c0ba4..8aaac933a7 100644
--- a/oshmem/tools/wrappers/Makefile.am
+++ b/oshmem/tools/wrappers/Makefile.am
@@ -18,7 +18,6 @@ dist_ompidata_DATA =  \
 	shmemcc-wrapper-data.txt \
 	shmemfort-wrapper-data.txt
 
-if PROJECT_OSHMEM
 install-exec-hook:
 	test -z "$(bindir)" || $(mkdir_p) "$(DESTDIR)$(bindir)"
 	(cd $(DESTDIR)$(bindir); rm -f shmemrun$(EXEEXT); $(LN_S) mpirun shmemrun)
@@ -43,4 +42,3 @@ uninstall-local:
 	$(DESTDIR)$(pkgdatadir)/oshcc-wrapper-data.txt \
 	$(DESTDIR)$(pkgdatadir)/shmemfort-wrapper-data.txt \
 	$(DESTDIR)$(pkgdatadir)/oshfort-wrapper-data.txt
-endif