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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2007-06-24 18:39:59 -0500 (Sun, 24 Jun 2007)
New Revision: 1131

Modified:
   MOAB/trunk/tools/iMesh/SIDL/Makefile.am
   MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in
Log:
Fixing a few IMESH's, and putting build of iMesh/SIDL app testcxx
under automake control.



Modified: MOAB/trunk/tools/iMesh/SIDL/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.am	2007-06-24 23:03:47 UTC (rev 1130)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.am	2007-06-24 23:39:59 UTC (rev 1131)
@@ -1,6 +1,10 @@
 include @abs_srcdir@/iMesh-SIDL-Defs.inc
 
+vpath = mserver bserver 
+VPATH = mserver bserver 
+
 include mserver/babel.make
+LD_FLAGS_PIC = -fpic -shared
 SERVER_HDRS := iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h    \
   iBase_EntTag_IOR.h iBase_EntityType_IOR.h iBase_ErrorActions_IOR.h          \
   iBase_ErrorType_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h  \
@@ -57,10 +61,15 @@
   iMesh_SIDL_MeshSidl_Impl.o iBase_Error_Impl.o iBase_Error_IOR.o           \
   iBase_Error_Skel.o iBase_Error.o
 
+#testcxx: ${iMesh_SIDL_FILES} testcxx.o 
+#	$(CXX)  ${LD_FLAGS} -o $@ testcxx.o -Wl,-rpath,. -L. ${iMesh_SIDL_LIBS}
 
-all: testcxx
-# testc_cbind
+bin_PROGRAMS = testcxx
+testcxx_SOURCES = testcxx.cpp
 
+LDADD = ../libiMesh.la $(top_builddir)/libMOAB.la @abs_srcdir@/libiMeshserver.so ${BABEL_DIR}/lib/libsidl.la
+testcxx_DEPENDENCIES = ../libiMesh.la $(top_builddir)/libMOAB.la @abs_srcdir@/libiMeshserver.so ${BABEL_DIR}/lib/libsidl.la
+
 settings:
 	@echo "FACTORY_OFILES = $(FACTORY_OFILES)"
 	@echo "SERVER_OFILES  = $(SERVER_OFILES)"
@@ -93,8 +102,8 @@
 	-rm -rf F77client
 	@BABEL_DIR@/bin/babel -R"repo" -cF77 -o F77client iMesh_SIDL.sidl
 
-${iMesh_DIR}/libiMeshserver.so: mserver/babel.make ${SERVER_OFILES}
-	$(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${SERVER_OFILES}
+${iMesh_SIDLLIBDIR}/libiMeshserver.so: mserver/babel.make ${SERVER_OFILES}
+	$(CXX) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${SERVER_OFILES}
 
 libiMeshCclient.so: Cclient ${CCLIENT_OFILES}
 	$(LD) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${CCLIENT_OFILES}
@@ -106,9 +115,6 @@
 
 F77client/babel.make: F77client
 
-testcxx: ${iMesh_SIDL_FILES} testcxx.o 
-	$(LD)  ${LD_FLAGS} -o $@ testcxx.o -Wl,-rpath,. -L. ${iMesh_SIDL_LIBS}
-
 clean:
 	-rm -f *.o *.so testc testcxx *~ core.*
 

Modified: MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in	2007-06-24 23:03:47 UTC (rev 1130)
+++ MOAB/trunk/tools/iMesh/SIDL/iMesh-SIDL-Defs.inc.in	2007-06-24 23:39:59 UTC (rev 1131)
@@ -6,12 +6,12 @@
 iMesh_SIDLLIBDIR = @abs_builddir@
 
 iMesh_SIDL_INCLUDES = \
-      -I${iMesh_SIDLINCLUDEDIR} -I${iMesh_SIDLINCLUDEDIR}/SIDL -I${iMesh_SIDLINCLUDEDIR}/SIDL/bserver \
-       -I${iMesh_SIDLINCLUDEDIR}/SIDL/mserver -I at BABEL_DIR@/include ${iMesh_INCLUDES} 
+      -I${iMesh_SIDLINCLUDEDIR} -I${iMesh_SIDLINCLUDEDIR} -I${iMesh_SIDLINCLUDEDIR}/bserver \
+       -I${iMesh_SIDLINCLUDEDIR}/mserver -I at BABEL_DIR@/include ${iMesh_INCLUDES} 
 
 iMesh_SIDL_LIBS = \
       -L${iMesh_SIDLLIBDIR} -liMeshserver -L at BABEL_DIR@/lib -lsidl \
-      -Wl,-rpath,${iMesh_SIDLLIBDIR} -Wl,-rpath,${iMesh_SIDLLIBDIR} -Wl,-rpath, at BABEL_DIR@/lib ${IMESH_LIBS_LINK}
+      -Wl,-rpath,${iMesh_SIDLLIBDIR} -Wl,-rpath,${iMesh_SIDLLIBDIR} -Wl,-rpath, at BABEL_DIR@/lib ${iMesh_LIBS}
 
 iMesh_SIDL_FILES = \
       ${iMesh_SIDLLIBDIR}/libiMeshserver.so