Something funny is going on when --without-orte, so revert the orte/Makefile.am for now while we try to figure it out

Refs trac:4368

This commit was SVN r31011.

The following Trac tickets were found above:
  Ticket 4368 --> https://svn.open-mpi.org/trac/ompi/ticket/4368

orte/Makefile.am

@@ -10,7 +10,6 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2009-2010 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2014      Intel, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -19,22 +18,12 @@
 #
 
 SUBDIRS = \
-	include
+	include \
-
-if PROJECT_ORTE
-SUBDIRS += \
 	$(MCA_orte_FRAMEWORKS_SUBDIRS) \
-	$(MCA_orte_FRAMEWORK_COMPONENT_STATIC_SUBDIRS)
+	$(MCA_orte_FRAMEWORK_COMPONENT_STATIC_SUBDIRS) \
-endif
-
-SUBDIRS += \
 	etc \
-        .
+        . \
-
-if PROJECT_ORTE
-SUBDIRS += \
 	$(MCA_orte_FRAMEWORK_COMPONENT_DSO_SUBDIRS)
-endif
 
 DIST_SUBDIRS = \
 	include \
@@ -43,11 +32,8 @@ DIST_SUBDIRS = \
 	$(MCA_orte_FRAMEWORK_COMPONENT_ALL_SUBDIRS)
 
 # Build the main ORTE library
-lib_LTLIBRARIES =
-if PROJECT_ORTE
-lib_LTLIBRARIES += libopen-rte.la
-endif
 
+lib_LTLIBRARIES = libopen-rte.la
 libopen_rte_la_SOURCES =
 libopen_rte_la_LIBADD = \
 	$(MCA_orte_FRAMEWORK_LIBS) \