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

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-09-18 14:38:55 -0500 (Fri, 18 Sep 2009)
New Revision: 3148

Modified:
   cgm/trunk/configure.ac
   cgm/trunk/itaps/Makefile.am
Log:
s/FC_DEFS_/IGEOM_FC_DEFS_/

Modified: cgm/trunk/configure.ac
===================================================================
--- cgm/trunk/configure.ac	2009-09-18 19:27:44 UTC (rev 3147)
+++ cgm/trunk/configure.ac	2009-09-18 19:38:55 UTC (rev 3148)
@@ -29,6 +29,7 @@
 fi
 
 
+
 ################################################################################
 #                              Extract libtool config
 ################################################################################
@@ -435,8 +436,13 @@
            cgm_apps/examples/driverc++/Makefile
            cgm_apps/examples/facetdriver/Makefile
 	   )
+# Generate iGeom_FCDefs.h from iBase_FCDefs.h
+AC_CONFIG_COMMANDS([itaps/iGeom_FCDefs.h],
+  [sed -e "s/FC_FUNC/IGEOM_FC_FUNC/" itaps/iBase_FCDefs.h >itaps/iGeom_FCDefs.h])
+# Remove iGeom_protos.h if old format
+AC_CONFIG_COMMANDS_POST([grep IGEOM_FC_FUNC itaps/iGeom_protos.h >/dev/null 2>&1 || rm -f itaps/iGeom_protos.h])
+AC_OUTPUT
 
-AC_OUTPUT
 if test "x$CUBIT_DIR" != "xno" && test "x$CUBIT_DIR" != "x"; then
    AC_MSG_WARN([Linking against Cubit-based CGM; you'll need to add Cubit's 'bin' directory
                 to your LD_LIBRARY_PATH before linking, or add -R (linux) or equivalent (non-linux)

Modified: cgm/trunk/itaps/Makefile.am
===================================================================
--- cgm/trunk/itaps/Makefile.am	2009-09-18 19:27:44 UTC (rev 3147)
+++ cgm/trunk/itaps/Makefile.am	2009-09-18 19:38:55 UTC (rev 3148)
@@ -53,7 +53,7 @@
 libiGeom_la_include_HEADERS = \
 	iBase.h \
 	iGeom.h \
-	iBase_FCDefs.h \
+	iGeom_FCDefs.h \
 	iGeom_protos.h \
 	iBase_f.h \
 	iGeom_f.h
@@ -104,17 +104,22 @@
 EXTRA_DIST = testgeom.sat size.sat
 
 CLEANFILES = iGeom-Defs.inc
+DISTCLEANFILES = iGeom_FCDefs.h
 
 FPFX=iGeom
 SEDEXPR = 's/^[[:space:]]*void[[:space:]][[:space:]]*$(FPFX)_\([a-z][_a-zA-Z0-9]*\)[[:space:]]*(.*$$/$(FPFX)_\1/p'
 iGeom_protos.h: iGeom.h
-	echo '#include "iBase_FCDefs.h"' > $@
-	echo '#ifdef FC_FUNC_' >> $@
+	echo '#include "iGeom_FCDefs.h"' > $@
+	echo '#ifdef IGEOM_FC_FUNC_' >> $@
 	echo >> $@
 	for func in `$(SED) -n $(SEDEXPR) $<`; do \
 	  lower=`echo $$func | tr '[:upper:]' '[:lower:]'`; \
           upper=`echo $$func | tr '[:lower:]' '[:upper:]'`; \
-	  echo "#define $$func FC_FUNC_( $$lower, $$upper )" >> $@; \
+	  echo "#define $$func IGEOM_FC_FUNC_( $$lower, $$upper )" >> $@; \
         done
 	echo >> $@
 	echo "#endif" >> $@
+
+iGeom_FCDefs.h: iBase_FCDefs.h
+	cd .. && ./config.status itaps/iGeom_FCDefs.h
+