makefile fixes

Signed-off-by: Howard Pritchard <howardp@lanl.gov>

Author: hppritcha

ompi/mpi/c/Makefile.am

@@ -500,6 +500,8 @@ if BUILD_MPI_BINDINGS_LAYER
 libmpi_c_la_LIBADD += libmpi_c_noprofile.la
 endif
 
+nobase_include_HEADERS = abi.h standard_abi/mpi.h
+
 #
 # List of all C files that have profile versions (*_generated.c files were
 # generated from prototype_sources above).
@@ -557,8 +559,38 @@ if OMPI_GENERATE_BINDINGS
 	    source \
 	    ompi \
 	    $<
+abi.h: $(prototype_sources)
+	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
+	    --builddir $(abs_top_builddir) \
+	    --srcdir $(abs_top_srcdir) \
+	    --output $@ \
+	    c \
+	    header \
+	    --srcdir $(srcdir) \
+	    $(prototype_sources)
+standard_abi/mpi.h: $(prototype_sources)
+	mkdir -p standard_abi
+	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
+	    --builddir $(abs_top_builddir) \
+	    --srcdir $(abs_top_srcdir) \
+	    --output $@ \
+	    c \
+	    header \
+            --srcdir $(srcdir) \
+	    --external \
+            $(prototype_sources)
+%_abi_generated.c: %.c.in
+	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
+	    --builddir $(abs_top_builddir) \
+	    --srcdir $(abs_top_srcdir) \
+	    --output $@ \
+	    c \
+	    source \
+	    standard \
+	    $<
 endif
 
+MAINTAINERCLEANFILES = *_generated.c abi.h
 if OMPI_STANDARD_ABI
 include Makefile_abi.include
 endif

ompi/mpi/c/Makefile_abi.include

@@ -29,14 +29,15 @@
 
 # ABI specific make components
 
+if OMPI_STANDARD_ABI
+
 noinst_LTLIBRARIES += libmpi_c_abi.la libmpi_c_abi_profile.la
 if BUILD_MPI_BINDINGS_LAYER
 noinst_LTLIBRARIES += libmpi_c_abi_noprofile.la
 endif
 
 BUILT_SOURCES = abi.h standard_abi/mpi.h
 
-
 libmpi_c_abi_la_SOURCES = \
         attr_fn.c \
         abi_details.c \
@@ -57,38 +58,4 @@ libmpi_c_abi_profile_la_CPPFLAGS = -DOMPI_NO_MPI_PROTOTYPES -DOMPI_BUILD_MPI_PRO
 libmpi_c_abi_noprofile_la_SOURCES = $(abi_interface_profile_sources)
 libmpi_c_abi_noprofile_la_CPPFLAGS = -DOMPI_NO_MPI_PROTOTYPES -DOMPI_BUILD_MPI_PROFILING=0
 
-nobase_include_HEADERS = abi.h standard_abi/mpi.h
-
-if OMPI_GENERATE_BINDINGS
-%_abi_generated.c: %.c.in
-	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
-	    --builddir $(abs_top_builddir) \
-	    --srcdir $(abs_top_srcdir) \
-	    --output $@ \
-	    c \
-	    source \
-	    standard \
-            $<
-abi.h: $(prototype_sources)
-	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
-	    --builddir $(abs_top_builddir) \
-	    --srcdir $(abs_top_srcdir) \
-	    --output $@ \
-	    c \
-	    header \
-            --srcdir $(srcdir) \
-            $(prototype_sources)
-standard_abi/mpi.h: $(prototype_sources)
-	mkdir -p standard_abi
-	$(OMPI_V_GEN) $(PYTHON) $(top_srcdir)/ompi/mpi/bindings/bindings.py \
-	    --builddir $(abs_top_builddir) \
-	    --srcdir $(abs_top_srcdir) \
-	    --output $@ \
-	    c \
-	    header \
-            --srcdir $(srcdir) \
-	    --external \
-            $(prototype_sources)
 endif
-# Delete generated files on maintainer-clean
-MAINTAINERCLEANFILES = *_generated.c abi.h standard_abi/