Author: janehu Date: 2013-02-05 10:53:33 -0600 (Tue, 05 Feb 2013) New Revision: 5974 Modified: cgm/trunk/Makefile.am Log: Synch trunk with merge-cubit12.2 makefile for cubit parallel build and testing. Passed parallel test. Modified: cgm/trunk/Makefile.am =================================================================== --- cgm/trunk/Makefile.am 2013-02-04 21:13:13 UTC (rev 5973) +++ cgm/trunk/Makefile.am 2013-02-05 16:53:33 UTC (rev 5974) @@ -45,7 +45,7 @@ geom/libcubit_geom.la \ util/libcubit_util.la else - CORE_CGM_LIBS = $(CGM_ll_LIB) + CORE_CGM_LIBS = geom/libcubit_geom.la $(CGM_ll_LIB) endif SUBDIRS = compat amendment util geom init . $(igeom_DIR) test cgm_apps