[cgma-dev] r1199 - cgm/trunk/itaps

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2007-07-12 10:14:38 -0500 (Thu, 12 Jul 2007)
New Revision: 1199

Modified:
   cgm/trunk/itaps/Makefile.am
Log:
fix build issues for iGeom w/ libcubiti

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2007-07-12 14:57:46 UTC (rev 1198)
+++ cgm/trunk/itaps/Makefile.am	2007-07-12 15:14:38 UTC (rev 1199)
@@ -25,13 +25,14 @@
                $(top_builddir)/geom/libcubit_geom.la \
                $(top_builddir)/util/libcubit_util.la
   TEST_XLDFLAGS = -R$(ACIS_LIB_DIR)
+  CGM_ACIS_SRCS = 
 else
-  TEST_XLDFLAGS = -L$(CUBIT_BIND_DIR) -R$(CUBIT_BIN_DIR) 
-  TEST_XLIBS = $(CUBIT_LINK)
+  TEST_XLDFLAGS = $(CUBIT_LDFLAGS) $(CUBIT_LTFLAGS)
+  TEST_XLIBS = $(CUBIT_LIBS)
+# If not building CGM, then have Cubit library w/ ACIS support
+  CGM_ACIS_SRCS = CGMA_ACIS.cc
 endif
 
-libiGeom_la_includedir = $(includedir)
-
 if build_ACIS
   ACIS_SRCS = CGMA_ACIS.cc
   ACIS_CGM_INCLUDES = -I$(top_srcdir)/geom/ACIS
@@ -40,6 +41,8 @@
   ACIS_CGM_INCLUDES =
 endif
 
+libiGeom_la_includedir = $(includedir)
+
 INCLUDES = -I$(top_srcdir)/util \
            -I$(top_srcdir)/geom \
            $(ACIS_CGM_INCLUDES ) \
@@ -52,7 +55,8 @@
 	iGeomError.cc \
 	iGeomError.h \
 	CGMA_ACIS.h \
-	$(ACIS_SRCS)
+	$(ACIS_SRCS) \
+        $(CGM_ACIS_SRCS)
 
 libiGeom_la_include_HEADERS = \
 	iBase.h \