[MOAB-dev] r3149 - in MOAB/trunk: . tools/iMesh

[kraftche at cae.wisc.edu]

Author: kraftche
Date: 2009-09-18 14:39:36 -0500 (Fri, 18 Sep 2009)
New Revision: 3149

Added:
   MOAB/trunk/iBase_FCDefs.h.in
Removed:
   MOAB/trunk/MBCN_FCDefs.h.in
Modified:
   MOAB/trunk/Makefile.am
   MOAB/trunk/configure.ac
   MOAB/trunk/tools/iMesh/Makefile.am
   MOAB/trunk/tools/iMesh/mkprotos.sh
Log:
s/FC_DEFS_/IGEOM_FC_DEFS_/

Deleted: MOAB/trunk/MBCN_FCDefs.h.in
===================================================================
--- MOAB/trunk/MBCN_FCDefs.h.in	2009-09-18 19:38:55 UTC (rev 3148)
+++ MOAB/trunk/MBCN_FCDefs.h.in	2009-09-18 19:39:36 UTC (rev 3149)
@@ -1,7 +0,0 @@
-
-/* Define to a macro mangling the given C identifier (in lower and upper
-   case), which must not contain underscores, for linking with Fortran. */
-#undef FC_FUNC
-
-/* As FC_FUNC, but for C identifiers containing underscores. */
-#undef FC_FUNC_

Modified: MOAB/trunk/Makefile.am
===================================================================
--- MOAB/trunk/Makefile.am	2009-09-18 19:38:55 UTC (rev 3148)
+++ MOAB/trunk/Makefile.am	2009-09-18 19:39:36 UTC (rev 3149)
@@ -272,11 +272,15 @@
   MeshTopoUtil.hpp \
   ReadWriteDefines.h \
   WriteTemplate.hpp \
+  MBCN_FCDefs.h \
   $(MOAB_EXTRA_HDRS)
 
 MBCN_protos.h: MBCN.h tools/iMesh/mkprotos.sh
-	$(srcdir)/tools/iMesh/mkprotos.sh MBCN $< $@
+	$(srcdir)/tools/iMesh/mkprotos.sh MBCN MBCN $< $@ MBCN_FCDefs.h
 
+MBCN_FCDefs.h: iBase_FCDefs.h
+	./config.status MBCN_FCDefs.h
+
 CPPFLAGS += -DSRCDIR=$(srcdir)
 
 # Tests and such
@@ -366,6 +370,7 @@
 mbcn_test_LDADD = 
 
 # Other files to clean up (e.g. output from tests)
+DISTCLEANFILES = MBCN_FCDefs.h
 MOSTLYCLEANFILES = dumped_acis.sat tree.h5m
 
 test/mb_big_test.g: $(top_srcdir)/test/mb_big_test.g.gz

Modified: MOAB/trunk/configure.ac
===================================================================
--- MOAB/trunk/configure.ac	2009-09-18 19:38:55 UTC (rev 3148)
+++ MOAB/trunk/configure.ac	2009-09-18 19:39:36 UTC (rev 3149)
@@ -1048,7 +1048,7 @@
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_HEADERS([MBVersion.h])
 AC_CONFIG_HEADERS([MBEntityHandle.h])
-AC_CONFIG_HEADERS([MBCN_FCDefs.h])
+AC_CONFIG_HEADERS([iBase_FCDefs.h])
 AC_CONFIG_FILES([Makefile 
                  moab.make 
                  testdir.h
@@ -1077,6 +1077,8 @@
                  doc/Makefile
                  doxygen/Makefile
                  ])
+AC_CONFIG_COMMANDS([MBCN_FCDefs.h],
+  [sed -e "s/FC_FUNC/MBCN_FC_FUNC/" iBase_FCDefs.h >MBCN_FCDefs.h])
 
 AC_OUTPUT
 

Copied: MOAB/trunk/iBase_FCDefs.h.in (from rev 3137, MOAB/trunk/MBCN_FCDefs.h.in)
===================================================================
--- MOAB/trunk/iBase_FCDefs.h.in	                        (rev 0)
+++ MOAB/trunk/iBase_FCDefs.h.in	2009-09-18 19:39:36 UTC (rev 3149)
@@ -0,0 +1,7 @@
+
+/* Define to a macro mangling the given C identifier (in lower and upper
+   case), which must not contain underscores, for linking with Fortran. */
+#undef FC_FUNC
+
+/* As FC_FUNC, but for C identifiers containing underscores. */
+#undef FC_FUNC_


Property changes on: MOAB/trunk/iBase_FCDefs.h.in
___________________________________________________________________
Added: svn:mergeinfo
   + 

Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am	2009-09-18 19:38:55 UTC (rev 3148)
+++ MOAB/trunk/tools/iMesh/Makefile.am	2009-09-18 19:39:36 UTC (rev 3149)
@@ -83,10 +83,13 @@
 	echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 
 iMesh_protos.h: iMesh.h mkprotos.sh
-	$(srcdir)/mkprotos.sh iMesh $< $@
+	$(srcdir)/mkprotos.sh iMesh MBCN $< $@ MBCN_FCDefs.h
 
 iMesh_extensions_protos.h: iMesh_extensions.h mkprotos.sh
-	$(srcdir)/mkprotos.sh iMesh $< $@
+	$(srcdir)/mkprotos.sh iMesh MBCN $< $@ MBCN_FCDefs.h
 
 iMeshP_protos.h: iMeshP.h mkprotos.sh
-	$(srcdir)/mkprotos.sh iMeshP $< $@
+	$(srcdir)/mkprotos.sh iMeshP MBCN $< $@ MBCN_FCDefs.h
+
+iMesh_FCDefs.h: iBase_FCDefs.h
+	cd ../.. && ./config.status tools/iMesh/iMesh_FCDefs.h

Modified: MOAB/trunk/tools/iMesh/mkprotos.sh
===================================================================
--- MOAB/trunk/tools/iMesh/mkprotos.sh	2009-09-18 19:38:55 UTC (rev 3148)
+++ MOAB/trunk/tools/iMesh/mkprotos.sh	2009-09-18 19:39:36 UTC (rev 3149)
@@ -1,17 +1,18 @@
 #!/bin/sh
 
-default_fcdefs=MBCN_FCDefs.h
+default_fcdefs=iBase_FCDefs.h
 case "x$1" in
   x|x-*)
-    echo "Usage: $0 <PREFIX> <INPUT_FILE> <OUTPUT_FILE> [<FCDEFS>=${default_fcdefs}]"
+    echo "Usage: $0 <FUNC_PREFIX> <DEF_PREFIX> <INPUT_FILE> <OUTPUT_FILE> [<FCDEFS>=${default_fcdefs}]"
     ;;
 esac
 
 PFX="$1"
-INPUT="$2"
-OUTPUT="$3"
-if test "x" != "x$4"; then
-  FCDEFS="$4"
+DEF="$2"
+INPUT="$3"
+OUTPUT="$4"
+if test "x" != "x$5"; then
+  FCDEFS="$5"
 else
   FCDEFS="$default_fcdefs"
 fi
@@ -23,12 +24,12 @@
 EXPR="s/^[[:space:]]*void[[:space:]][[:space:]]*${PFX}_\([_a-zA-Z0-9][_a-zA-Z0-9]*\)[[:space:]]*(.*\$/${PFX}_\1/p"
 
 echo "#include \"$FCDEFS\"" > $OUTPUT
-echo '#ifdef FC_FUNC_' >> $OUTPUT
+echo "#ifdef ${DEF}_FC_FUNC_" >> $OUTPUT
 echo >> $OUTPUT
 for func in `$SED -n "$EXPR" $INPUT`; do
   lower=`echo $func | tr '[:upper:]' '[:lower:]'`
   upper=`echo $func | tr '[:lower:]' '[:upper:]'`
-  echo "#define $func FC_FUNC_( $lower, $upper )" >> $OUTPUT
+  echo "#define $func ${DEF}_FC_FUNC_( $lower, $upper )" >> $OUTPUT
 done
 echo >> $OUTPUT
 echo "#endif" >> $OUTPUT