[cgma-dev] r2183 - in cgm/trunk: . itaps

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-10-29 14:44:57 -0500 (Wed, 29 Oct 2008)
New Revision: 2183

Modified:
   cgm/trunk/Makefile.am
   cgm/trunk/configure.in
   cgm/trunk/itaps/Makefile.am
Log:
fix test build issues

Modified: cgm/trunk/Makefile.am
===================================================================
--- cgm/trunk/Makefile.am	2008-10-29 19:22:27 UTC (rev 2182)
+++ cgm/trunk/Makefile.am	2008-10-29 19:44:57 UTC (rev 2183)
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = util geom init itaps . test cgm_apps
+SUBDIRS = util geom init . itaps test cgm_apps
 # Don't loose the autoconf include path
 ACLOCAL_AMFLAGS = -I m4
 
@@ -59,7 +59,6 @@
 
 
 libcgm_la_LIBADD = init/libcgma_init.la \
-                   itaps/libiGeom.la \
                    $(CORE_CGM_LIBS) \
                    $(EXT_LINK_FLAGS) \
                    $(EXT_LIBS)

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-10-29 19:22:27 UTC (rev 2182)
+++ cgm/trunk/configure.in	2008-10-29 19:44:57 UTC (rev 2183)
@@ -125,7 +125,7 @@
   fi
   CGM_LIBS_LINK='$(CUBIT_LDFLAGS) $(CUBIT_LIBS)'
   CGM_LIBS_FILES='$(CUBIT_FILE)'
-  CGM_LIBS_LTFLAGS='$(CUBIT_LTFLAGS)'
+  CGM_LIBS_LTFLAGS="$CGM_LIBS_LTFLAGS $CUBIT_LTFLAGS"
   CUBIT_CGM="-DCUBIT_CGM"
 dnl  AC_DEFINE( HAVE_ACIS, "Have CGM ACIS Implementation" )
   HAVE_ACIS_DEF=-DHAVE_ACIS
@@ -199,6 +199,8 @@
   ACIS_LINK_FLAGS='-L$(ACIS_LIB_DIR)'
   ACIS_HEALER="-DACIS_HEALER"
   ACIS_INCLUDES="-I$ACIS_DIR/include"
+  ACIS_LTFLAGS="-R$ACIC_LIB_DIR"
+  CGM_LIBS_LTFLAGS="$CGM_LIBS_LTFLAGS $ACIS_LTFLAGS"
   if test "x$GXX" = "xyes"; then
     CPPFLAGS="$CPPFLAGS -isystem $ACIS_DIR/include"
   fi

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-10-29 19:22:27 UTC (rev 2182)
+++ cgm/trunk/itaps/Makefile.am	2008-10-29 19:44:57 UTC (rev 2183)
@@ -10,14 +10,8 @@
 
 SUBDIRS = . $(SIDL_DIR)
 
-noinst_LTLIBRARIES = libiGeom.la
+lib_LTLIBRARIES = libiGeom.la
 
-if build_ACIS
-  TEST_ACISPATH = -R$(ACIS_LIB_DIR)
-else
-  TEST_ACISPATH =
-endif
-
 libiGeom_la_includedir = $(includedir)
 
 libiGeom_la_LIBADD = ../libcgm.la
@@ -49,9 +43,9 @@
 check_PROGRAMS = $(TESTS)
 
 testgeom_SOURCES = testgeom.cc
-testgeom_LDADD = ../libcgm.la
+testgeom_LDADD = libiGeom.la
 testgeom_CPPFLAGS = $(CPPFLAGS) -DSRCDIR=$(srcdir)
-testgeom_LDFLAGS = $(TEST_ACISPATH)
+testgeom_LDFLAGS = $(CGM_LIBS_LTFLAGS)
 
 # Automake doesn't seem to have a directory defined for
 # platform-dependent data (or include) files. So put