ompi/include: Remove Makefile.include which is a duplicate of Makefile.am. This will make ompi consistent with opal and orte.

This commit was SVN r28220.

ompi/include/Makefile.am

@@ -54,7 +54,7 @@ nodist_include_HEADERS += \
         mpif-config.h
 endif
 
-include ompi/Makefile.include
+include ompi/Makefile.am
 
 # This is complicated, but mpif-values.pl generates
 # several mpif-*.h files in this directory (during autogen.pl).

ompi/include/ompi/Makefile.am

@@ -1,3 +1,4 @@
+# -*- makefile -*-
 #
 # Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
 #                         University Research and Technology
@@ -9,6 +10,7 @@
 #                         University of Stuttgart.  All rights reserved.
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
+# Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -22,7 +24,7 @@
 headers += \
 	ompi/constants.h \
 	ompi/types.h \
-    ompi/memchecker.h \
+	ompi/memchecker.h \
 	ompi/totalview.h
 
 nodist_headers += \

ompi/include/ompi/Makefile.include

@@ -1,31 +0,0 @@
-# -*- makefile -*-
-#
-# Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
-#                         University Research and Technology
-#                         Corporation.  All rights reserved.
-# Copyright (c) 2004-2005 The University of Tennessee and The University
-#                         of Tennessee Research Foundation.  All rights
-#                         reserved.
-# Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
-#                         University of Stuttgart.  All rights reserved.
-# Copyright (c) 2004-2005 The Regents of the University of California.
-#                         All rights reserved.
-# Copyright (c) 2012 Cisco Systems, Inc.  All rights reserved.
-# $COPYRIGHT$
-# 
-# Additional copyrights may follow
-# 
-# $HEADER$
-#
-
-# This makefile.include does not stand on its own - it is included from
-# ompi/include//Makefile.am
-
-headers += \
-    ompi/constants.h \
-    ompi/types.h \
-    ompi/memchecker.h \
-    ompi/totalview.h
-
-nodist_headers += \
-    ompi/version.h