[cgma-dev] r6011 - in cgm/trunk: cgm_apps/examples/facetdriver geom/facet geom/parallel init test

[iulian at mcs.anl.gov]

Author: iulian
Date: 2013-02-19 09:13:27 -0600 (Tue, 19 Feb 2013)
New Revision: 6011

Modified:
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
   cgm/trunk/geom/facet/Makefile.am
   cgm/trunk/geom/parallel/Makefile.am
   cgm/trunk/init/Makefile.am
   cgm/trunk/test/Makefile.am
Log:
fix out of source build, by adding -I$(top_srcdir)/amendment  where necessary 


Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2013-02-18 18:26:18 UTC (rev 6010)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2013-02-19 15:13:27 UTC (rev 6011)
@@ -11,7 +11,8 @@
                -I$(top_srcdir)/geom \
                -I$(top_srcdir)/geom/Cholla \
                -I$(top_srcdir)/geom/facet \
-               -I$(top_srcdir)/geom/facetbool
+               -I$(top_srcdir)/geom/facetbool \
+               -I$(top_srcdir)/amendment 
 
 if BUILD_CGM
   LDADD = $(top_builddir)/libcgm.la $(CGM_EXT_LIBS) $(CGM_EXT_LDFLAGS) $(CGM_EXT_LTFLAGS) $(top_builddir)/geom/Cholla/libCholla.la $(top_builddir)/geom/facet/libcubit_facet.la $(top_builddir)/geom/facetbool/libcubit_facetbool.la $(top_builddir)/geom/libcubit_geom.la $(top_builddir)/util/libcubit_util.la 

Modified: cgm/trunk/geom/facet/Makefile.am
===================================================================
--- cgm/trunk/geom/facet/Makefile.am	2013-02-18 18:26:18 UTC (rev 6010)
+++ cgm/trunk/geom/facet/Makefile.am	2013-02-19 15:13:27 UTC (rev 6011)
@@ -1,6 +1,7 @@
 AM_CPPFLAGS += -I$(top_srcdir)/util \
                -I$(top_srcdir)/geom \
                -I$(top_srcdir)/geom/Cholla \
+               -I$(top_srcdir)/amendment \
                -I$(top_srcdir)/geom/facetbool 
 
 # The name of the library to build

Modified: cgm/trunk/geom/parallel/Makefile.am
===================================================================
--- cgm/trunk/geom/parallel/Makefile.am	2013-02-18 18:26:18 UTC (rev 6010)
+++ cgm/trunk/geom/parallel/Makefile.am	2013-02-19 15:13:27 UTC (rev 6011)
@@ -3,6 +3,7 @@
                -I$(top_srcdir)/geom/ACIS \
 	       -I$(ACIS_DIR)/include \
                -I$(ACIS_DIR)/amendment \
+               -I$(top_srcdir)/amendment \
                $(MPI_INCLUDE) \
 	       $(HAVE_OCC_DEF)
 

Modified: cgm/trunk/init/Makefile.am
===================================================================
--- cgm/trunk/init/Makefile.am	2013-02-18 18:26:18 UTC (rev 6010)
+++ cgm/trunk/init/Makefile.am	2013-02-19 15:13:27 UTC (rev 6011)
@@ -6,6 +6,7 @@
                -I$(top_srcdir)/geom/virtual \
                -I$(top_srcdir)/geom/facet \
                -I$(top_srcdir)/geom/cholla \
+               -I$(top_srcdir)/amendment \
                -I$(srcdir) \