Fix common ugni Makefile.am for non-DSO builds.

This commit was SVN r29571.

ompi/mca/common/ugni/Makefile.am

@@ -1,6 +1,6 @@
 # -*- indent-tabs-mode:nil -*-
 #
-# Copyright (c) 2011      Los Alamos National Security, LLC. All rights
+# Copyright (c) 2011-2013 Los Alamos National Security, LLC. All rights
 #                         reserved.
 # Copyright (c) 2011      UT-Battelle, LLC. All rights reserved.
 # 
@@ -15,12 +15,13 @@
 
 AM_CPPFLAGS = $(common_ugni_CPPFLAGS)
 
-if MCA_BUILD_ompi_common_ugni_DSO
-component_noinst =
-component_install = libmca_common_ugni.la
-else
 component_noinst = libmca_common_ugni_noinst.la
-component_install =
+component_install = libmca_common_ugni.la
+
+if MCA_BUILD_ompi_common_ugni_DSO
+mcacomponent_LTLIBRARIES = $(component_install)
+else
+noinst_LTLIBRARIES = $(component_noinst)
 endif
 
 headers = common_ugni.h \
@@ -30,7 +31,6 @@ ugni_SOURCES = common_ugni.c \
                common_ugni_ep.c
 
 mcacomponentdir = $(pkglibdir)
-mcacomponent_LTLIBRARIES = $(component_install)
 libmca_common_ugni_la_SOURCES = $(headers) $(ugni_SOURCES)
 nodist_libmca_common_ugni_la_SOURCES = $(ugni_nodist_SOURCES)
 libmca_common_ugni_la_LIBADD = $(common_ugni_LIBS) 
@@ -38,8 +38,22 @@ libmca_common_ugni_la_LDFLAGS = \
         -version-info $(libmca_common_ugni_so_version) \
         $(common_ugni_LDFLAGS)
 
-noinst_LTLIBRARIES = $(component_noinst)
 libmca_common_ugni_noinst_la_SOURCES = $(headers) $(ugni_SOURCES)
 nodist_libmca_common_ugni_noinst_la_SOURCES = $(ugni_nodist_SOURCES)
 libmca_common_ugni_noinst_la_LIBADD = $(common_ugni_LIBS)
 libmca_common_ugni_noinst_la_LDFLAGS = -module -avoid-version $(common_ugni_LDFLAGS)
+
+# These two rules will sym link the "noinst" libtool library filename
+# to the installable libtool library filename in the case where we are
+# compiling this component statically (case 2), described above).
+
+all-local:
+	if test -z "$(mcacomponent_LTLIBRARIES)"; then \
+	  rm -f "$(component_install)"; \
+	  $(LN_S) "$(component_noinst)" "$(component_install)"; \
+	fi
+
+clean-local:
+	if test -z "$(mcacomponent_LTLIBRARIES)"; then \
+	  rm -f "$(component_install)"; \
+	fi