The previous hack to deal with Libtool not speaking Objective C stopped

working with Automake 1.10.  This is a new hack, which should be much
more flexible.  The ras doesn't contain any Objective C, so remove the
hack entirely from that Makefile.am.

This commit was SVN r16269.

orte/mca/pls/xgrid/Makefile.am

@@ -26,13 +26,8 @@ AM_OBJCFLAGS = $(pls_xgrid_OBJCFLAGS)
 # to be C instead of ObjC for libtool and it works well enough.  If CC
 # and OBJC aren't the same, Libtool doesn't automatically infer that
 # we're using C and Automake doesn't add the --tag, so we need to
-# explicitly list these two rules so that the --tag=CC line is passed
+# explicitly pass the --tag=CC flag to libtool.
-# to libtool.
+AM_LIBTOOLFLAGS = --tag=CC
-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile  --tag=CC $(OBJC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_OBJCFLAGS) $(OBJCFLAGS)
-OBJCLINK = $(LIBTOOL) --mode=link --tag=CC $(OBJCLD) $(AM_OBJCFLAGS) \
-	$(OBJCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
 
 xgrid_sources = \
     src/pls_xgrid.h \

orte/mca/ras/xgrid/Makefile.am

@@ -21,19 +21,6 @@
 AM_CPPFLAGS = -I$(top_ompi_builddir)/include
 AM_OBJCFLAGS = $(ras_xgrid_OBJCFLAGS)
 
-# Automake and Libtool don't completely speak Objective C.  Since the
-# only Objective C we'll be using is GCC on Mac OS X, we can pretend
-# to be C instead of ObjC for libtool and it works well enough.  If CC
-# and OBJC aren't the same, Libtool doesn't automatically infer that
-# we're using C and Automake doesn't add the --tag, so we need to
-# explicitly list these two rules so that the --tag=CC line is passed
-# to libtool.
-LTOBJCCOMPILE = $(LIBTOOL) --mode=compile  --tag=CC $(OBJC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_OBJCFLAGS) $(OBJCFLAGS)
-OBJCLINK = $(LIBTOOL) --mode=link --tag=CC $(OBJCLD) $(AM_OBJCFLAGS) \
-	$(OBJCFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
-
 xgrid_sources = \
 	src/ras_xgrid.h \
         src/ras_xgrid_component.c \