Small typos for LSF compilation and update Makefile.am

This commit was SVN r18998.

orte/mca/plm/lsf/Makefile.am

@@ -2,7 +2,7 @@
 # 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
+# Copyright (c) 2004-2008 The University of Tennessee and The University
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
 # Copyright (c) 2004-2005 High Performance Computing Center Stuttgart, 
@@ -10,6 +10,8 @@
 # Copyright (c) 2004-2005 The Regents of the University of California.
 #                         All rights reserved.
 # Copyright (c) 2007      Cisco, Inc.  All rights reserved.
+# Copyright (c) 2008      Institut National de Recherche en Informatique
+#                         et Automatique. All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
@@ -31,23 +33,20 @@ sources = \
 # (for static builds).
 
 if OMPI_BUILD_plm_lsf_DSO
-lib =
-lib_sources = 
-component = mca_plm_lsf.la
-component_sources = $(sources)
+component_noinst = 
+component_install = mca_plm_lsf.la
 else
-lib = libmca_plm_lsf.la
-lib_sources = $(sources)
-component =
-component_sources =
+component_noinst = libmca_plm_lsf.la
+component_install =
 endif
 
 mcacomponentdir = $(pkglibdir)
-mcacomponent_LTLIBRARIES = $(component)
-mca_plm_lsf_la_SOURCES = $(component_sources)
+mcacomponent_LTLIBRARIES = $(component_install)
+mca_plm_lsf_la_SOURCES = $(sources)
 mca_plm_lsf_la_LDFLAGS = -module -avoid-version $(plm_lsf_LDFLAGS)
+mca_plm_lsf_la_LIBADD = $(plm_lsf_LIBS)
 
-noinst_LTLIBRARIES = $(lib)
-libmca_plm_lsf_la_SOURCES = $(lib_sources)
+noinst_LTLIBRARIES = $(component_noinst)
+libmca_plm_lsf_la_SOURCES = $(sources)
 libmca_plm_lsf_la_LDFLAGS = -module -avoid-version $(plm_lsf_LDFLAGS)
 libmca_plm_lsf_la_LIBADD = $(plm_lsf_LIBS)

orte/mca/plm/lsf/plm_lsf_component.c

@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006-2007 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2008      Institut National de Recherche en Informatique
+ *                         et Automatique. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -124,7 +126,7 @@ static int orte_plm_lsf_component_query(mca_base_module_t **module, int *priorit
         opal_output_verbose(10, orte_plm_globals.output,
                             "plm:lsf: NOT available for selection");
         *module = NULL;
-        return ORTE_ERROR:
+        return ORTE_ERROR;
     }
     
     *priority = mca_plm_lsf_component.priority;