[cgma-dev] r5789 - in cgm/trunk/geom: . facet

[iulian at mcs.anl.gov]

Author: iulian
Date: 2012-10-11 18:10:10 -0500 (Thu, 11 Oct 2012)
New Revision: 5789

Modified:
   cgm/trunk/geom/Makefile.am
   cgm/trunk/geom/facet/Makefile.am
Log:
some fixes: facetbool needs to be build before facet, and
facet depends on facetbool
make check still does not pass for me :(
Jane, are these correct?



Modified: cgm/trunk/geom/Makefile.am
===================================================================
--- cgm/trunk/geom/Makefile.am	2012-10-11 19:41:14 UTC (rev 5788)
+++ cgm/trunk/geom/Makefile.am	2012-10-11 23:10:10 UTC (rev 5789)
@@ -4,7 +4,7 @@
 # Subdirectories
 # The values checked are defined in AM_CONDITIONAL statements
 # in configure.in
-SUBDIRS = . Cholla facet facetbool virtual
+SUBDIRS = . Cholla facetbool facet virtual
 if build_ACIS
   SUBDIRS += ACIS
 endif

Modified: cgm/trunk/geom/facet/Makefile.am
===================================================================
--- cgm/trunk/geom/facet/Makefile.am	2012-10-11 19:41:14 UTC (rev 5788)
+++ cgm/trunk/geom/facet/Makefile.am	2012-10-11 23:10:10 UTC (rev 5789)
@@ -6,7 +6,7 @@
 # The name of the library to build
 lib_LTLIBRARIES = libcubit_facet.la
 
-AM_LDFLAGS += -lcubit_facetbool
+AM_LDFLAGS += -lcubit_facetbool -L../facetbool
 
 # The directory where headers will be installed
 libcubit_facet_la_includedir = $(includedir)