[cgma-dev] r1818 - in cgm/trunk: . cgm_apps/examples/driverc++ cgm_apps/examples/facetdriver itaps

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-05-15 16:40:24 -0500 (Thu, 15 May 2008)
New Revision: 1818

Modified:
   cgm/trunk/cgm_apps/examples/driverc++/Makefile.am
   cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
   cgm/trunk/configure.in
   cgm/trunk/itaps/Makefile.am
Log:
Fix issues detected by 'make distcheck':

 itaps/Makefile.am:
  - include header in tarball

 configure.in:
  - don't generate extra copies of files in build dir that already exist in SVN.
    (either generate files or include them in the repo, but not both because
     then there is no correct solution for 'make clean'.)

 cgm_apps/examples/facetdriver/Makefile.am: 
  - include test-running scripts in 'make dist'

 cgm_apps/examples/driverc++/Makefile.am: 
  - include test-running scripts in 'make dist'


'make distcheck' now succeeds for CGM w/ OCC support disabled.


Modified: cgm/trunk/cgm_apps/examples/driverc++/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/driverc++/Makefile.am	2008-05-15 21:22:52 UTC (rev 1817)
+++ cgm/trunk/cgm_apps/examples/driverc++/Makefile.am	2008-05-15 21:40:24 UTC (rev 1818)
@@ -1,9 +1,8 @@
-EXTRA_DIST = README merge.sat huge.sat
+TESTS = mergechk_merge mergechk_huge
+EXTRA_DIST = README merge.sat huge.sat $(TESTS)
 
 check_PROGRAMS = mergechk
 
-TESTS = mergechk_merge mergechk_huge
-
 CPPFLAGS += -I$(top_srcdir)/util \
             -I$(top_srcdir)/geom \
             -I$(top_srcdir)/geom/ACIS

Modified: cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am
===================================================================
--- cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2008-05-15 21:22:52 UTC (rev 1817)
+++ cgm/trunk/cgm_apps/examples/facetdriver/Makefile.am	2008-05-15 21:40:24 UTC (rev 1818)
@@ -1,11 +1,10 @@
-EXTRA_DIST = README
+TESTS = facets_90
+EXTRA_DIST = README $(TESTS)
 
 check_PROGRAMS = facets
 
 facets_SOURCES = facets.cpp
 
-TESTS = facets_90
-
 CPPFLAGS += -I$(top_srcdir)/util \
             -I$(top_srcdir)/geom \
             -I$(top_srcdir)/geom/Cholla \

Modified: cgm/trunk/configure.in
===================================================================
--- cgm/trunk/configure.in	2008-05-15 21:22:52 UTC (rev 1817)
+++ cgm/trunk/configure.in	2008-05-15 21:40:24 UTC (rev 1818)
@@ -323,8 +323,8 @@
 ################################################################################
 AC_SUBST(AM_CPPFLAGS)
 AC_MSG_RESULT([CXXFLAGS = $CXXFLAGS])
-AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi],
-                    [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] )
+dnl AC_OUTPUT_COMMANDS( [if test -f util/CubitUtilConfigure.h; then true; else echo "#define CUBIT_UTIL_EXPORT" > util/CubitUtilConfigure.h; fi],
+dnl                     [if test -f geom/CubitGeomConfigure.h; then true; else echo "#define CUBIT_GEOM_EXPORT" > geom/CubitGeomConfigure.h; fi] )
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_HEADERS(itaps/iBase_FCDefs.h)
 AC_CONFIG_FILES(Makefile 

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2008-05-15 21:22:52 UTC (rev 1817)
+++ cgm/trunk/itaps/Makefile.am	2008-05-15 21:40:24 UTC (rev 1818)
@@ -49,6 +49,7 @@
            -I.
 
 libiGeom_la_SOURCES = \
+        CGMAIterator.hpp \
         CATag.hpp \
 	CATag.cpp \
 	iGeom_CGMA.cc \