[MOAB-dev] r1783 - MOAB/trunk/tools/iMesh/SIDL

[tautges at mcs.anl.gov]

Author: tautges
Date: 2008-04-29 08:55:13 -0500 (Tue, 29 Apr 2008)
New Revision: 1783

Modified:
   MOAB/trunk/tools/iMesh/SIDL/Makefile.in
   MOAB/trunk/tools/iMesh/SIDL/common.make.in
   MOAB/trunk/tools/iMesh/SIDL/iMesh_protos.h
Log:
Should fix autotest failures from last night, forgot to remove iMesh_FCDefs everywhere I needed to.


Modified: MOAB/trunk/tools/iMesh/SIDL/Makefile.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.in	2008-04-28 18:09:47 UTC (rev 1782)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.in	2008-04-29 13:55:13 UTC (rev 1783)
@@ -14,7 +14,7 @@
 SOURCE_FILES = $(SIDL_FILES) $(SERVER_FILES) iBase_SIDL_defs.h
 DIST_FILES = $(SOURCE_FILES) testcxx.cpp \
              mserver.make Cclient.make Fclient.make
-INCLUDES =  -I$(BABEL_DIR)/include -Imserver
+INCLUDES =  -I$(BABEL_DIR)/include -Imserver -I$(top_srcdir)
 
 CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
 	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)

Modified: MOAB/trunk/tools/iMesh/SIDL/common.make.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/common.make.in	2008-04-28 18:09:47 UTC (rev 1782)
+++ MOAB/trunk/tools/iMesh/SIDL/common.make.in	2008-04-29 13:55:13 UTC (rev 1783)
@@ -224,7 +224,6 @@
 # server implementation files also depend on the C interface
 IMESH_C_INC = $(imesh_srcdir)/iBase.h \
               $(imesh_srcdir)/iMesh.h \
-              $(imesh_builddir)/iBase_FCDefs.h \
 	      $(imesh_srcdir)/iMesh_protos.h
 
 IMPLOBJS = $(IMPLSRCS:.cc=.lo)

Modified: MOAB/trunk/tools/iMesh/SIDL/iMesh_protos.h
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh_protos.h	2008-04-28 18:09:47 UTC (rev 1782)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh_protos.h	2008-04-29 13:55:13 UTC (rev 1783)
@@ -1,4 +1,4 @@
-#include "iMesh_FCDefs.h"
+#include "MBCN_FCDefs.h"
 #ifdef FC_FUNC_
 
 #define iMesh_getErrorType FC_FUNC_(imesh_geterrortype, IMESH_GETERRORTYPE)