[cgma-dev] r1873 - cgm/trunk/itaps/SIDL
kraftche at mcs.anl.gov
kraftche at mcs.anl.gov
Wed Jun 4 13:38:23 CDT 2008
Author: kraftche
Date: 2008-06-04 13:38:23 -0500 (Wed, 04 Jun 2008)
New Revision: 1873
Modified:
cgm/trunk/itaps/SIDL/Makefile.am
Log:
Fix thoroughly broken iGeom SIDL build:
- Build from iGeom sources, not iMesh
- If building a shared lib, need to compile with -fpic
- Remove use of non-existant variable: fixes attempt to create
library in root directory
- Look in the correct locations for input files for separate
build tree
Modified: cgm/trunk/itaps/SIDL/Makefile.am
===================================================================
--- cgm/trunk/itaps/SIDL/Makefile.am 2008-06-04 18:31:30 UTC (rev 1872)
+++ cgm/trunk/itaps/SIDL/Makefile.am 2008-06-04 18:38:23 UTC (rev 1873)
@@ -1,5 +1,6 @@
vpath = gserver bserver
VPATH = gserver bserver
+BABEL_FLAGS = -V$(srcdir)
LD_FLAGS_PIC = -fpic -shared
SERVER_HDRS = iBase_ArrTag_IOR.h iBase_CreationStatus_IOR.h iBase_EntSet_IOR.h \
@@ -7,17 +8,21 @@
iBase_ErrorType_IOR.h iBase_IOR.h iBase_SetBoolOps_IOR.h \
iBase_SetRelation_IOR.h iBase_SetTag_IOR.h iBase_StorageOrder_IOR.h \
iBase_TagValueType_IOR.h iBase_Tag_IOR.h iMesh_AdjacencyInfo_IOR.h \
- iMesh_ArrMod_IOR.h iMesh_Arr_IOR.h iMesh_EntityTopology_IOR.h \
- iMesh_Entity_IOR.h iMesh_IOR.h iMesh_Mesh_IOR.h iMesh_Modify_IOR.h \
- iMesh_SIDL_IOR.h iMesh_SIDL_MeshSidl_IOR.h \
+ iGeom_Construct_IOR.h iGeom_CoreQuery_IOR.h iGeom_Factory_IOR.h \
+ iGeom_Geometry_IOR.h iGeom_IOR.h iGeom_Iterators_IOR.h iGeom_Modify_IOR.h \
+ iGeom_Parametric_IOR.h iGeom_Primitives_IOR.h iGeom_SIDL_GeomSidl_IOR.h \
+ iGeom_SIDL_IOR.h iGeom_Shape_IOR.h iGeom_Tolerance_IOR.h \
+ iGeom_Topology_IOR.h iGeom_Transforms_IOR.h \
iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
iBase_EntTag.hh iBase_EntityType.hh iBase_ErrorActions.hh \
iBase_ErrorType.hh iBase_SetBoolOps.hh iBase_SetRelation.hh iBase_SetTag.hh \
iBase_StorageOrder.hh iBase_Tag.hh iBase_TagValueType.hh iMesh.hh \
- iMesh_AdjacencyInfo.hh iMesh_Arr.hh iMesh_ArrMod.hh iMesh_Entity.hh \
- iMesh_EntityTopology.hh iMesh_Mesh.hh iMesh_Modify.hh iMesh_SIDL.hh \
- iMesh_SIDL_MeshSidl.hh sidl.hh sidl_BaseClass.hh sidl_BaseException.hh \
- sidl_BaseInterface.hh sidl_ClassInfo.hh sidl_ClassInfoI.hh sidl_DFinder.hh \
+ iGeom_Booleans.hh iGeom_Construct.hh iGeom_CoreQuery.hh iGeom_Factory.hh \
+ iGeom_Geometry.hh iGeom_Iterators.hh iGeom_Modify.hh iGeom_Parametric.hh \
+ iGeom_Primitives.hh iGeom_SIDL.hh iGeom_SIDL_GeomSidl.hh iGeom_Shape.hh \
+ iGeom_Tolerance.hh iGeom_Topology.hh iGeom_Transforms.hh sidl.hh \
+ sidl_BaseClass.hh sidl_BaseException.hh sidl_BaseInterface.hh \
+ sidl_ClassInfo.hh sidl_ClassInfoI.hh sidl_DFinder.hh \
sidl_DLL.hh sidl_Finder.hh sidl_InvViolation.hh sidl_Loader.hh \
sidl_PostViolation.hh sidl_PreViolation.hh sidl_Resolve.hh \
sidl_SIDLException.hh sidl_Scope.hh sidl_io.hh sidl_io_Deserializer.hh \
@@ -25,13 +30,16 @@
sidl_rmi.hh sidl_rmi_ConnectRegistry.hh sidl_rmi_InstanceHandle.hh \
sidl_rmi_InstanceRegistry.hh sidl_rmi_Invocation.hh \
sidl_rmi_NetworkException.hh sidl_rmi_ProtocolFactory.hh \
- sidl_rmi_Response.hh iMesh_SIDL_MeshSidl_Impl.hh iBase_Error_Impl.hh \
+ sidl_rmi_Response.hh iGeom_SIDL_GeomSidl_Impl.hh iBase_Error_Impl.hh \
iBase_Error_IOR.h iBase_Error.hh
-SERVER_SRCS = iMesh_SIDL_MeshSidl_IOR.c \
+SERVER_CXX_SRCS = \
iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc \
iBase_SetBoolOps.cc iBase_SetRelation.cc iBase_SetTag.cc iBase_Tag.cc \
- iMesh_Arr.cc iMesh_ArrMod.cc iMesh_Entity.cc iMesh_Mesh.cc iMesh_Modify.cc \
- iMesh_SIDL_MeshSidl.cc sidl_BaseClass.cc sidl_BaseException.cc \
+ iGeom_Booleans.cc iGeom_Construct.cc iGeom_CoreQuery.cc iGeom_Factory.cc \
+ iGeom_Geometry.cc iGeom_Iterators.cc iGeom_Modify.cc iGeom_Parametric.cc \
+ iGeom_Primitives.cc iGeom_SIDL_GeomSidl.cc iGeom_Shape.cc \
+ iGeom_Tolerance.cc iGeom_Topology.cc iGeom_Transforms.cc sidl_BaseClass.cc \
+ sidle_BaseException.cc \
sidl_BaseInterface.cc sidl_ClassInfo.cc sidl_ClassInfoI.cc sidl_DFinder.cc \
sidl_DLL.cc sidl_Finder.cc sidl_InvViolation.cc sidl_Loader.cc \
sidl_PostViolation.cc sidl_PreViolation.cc sidl_SIDLException.cc \
@@ -39,24 +47,12 @@
sidl_io_Serializer.cc sidl_rmi_ConnectRegistry.cc \
sidl_rmi_InstanceHandle.cc sidl_rmi_InstanceRegistry.cc \
sidl_rmi_Invocation.cc sidl_rmi_NetworkException.cc \
- sidl_rmi_ProtocolFactory.cc sidl_rmi_Response.cc iMesh_SIDL_MeshSidl_Skel.cc \
- iMesh_SIDL_MeshSidl_Impl.cc iBase_Error_Impl.cc iBase_Error_IOR.c \
- iBase_Error_Skel.cc iBase_Error.cc
-SERVER_OFILES = iMesh_SIDL_MeshSidl_IOR.o \
- iBase_ArrTag.o iBase_EntSet.o iBase_EntTag.o \
- iBase_SetBoolOps.o iBase_SetRelation.o iBase_SetTag.o iBase_Tag.o \
- iMesh_Arr.o iMesh_ArrMod.o iMesh_Entity.o iMesh_Mesh.o iMesh_Modify.o \
- iMesh_SIDL_MeshSidl.o sidl_BaseClass.o sidl_BaseException.o \
- sidl_BaseInterface.o sidl_ClassInfo.o sidl_ClassInfoI.o sidl_DFinder.o \
- sidl_DLL.o sidl_Finder.o sidl_InvViolation.o sidl_Loader.o \
- sidl_PostViolation.o sidl_PreViolation.o sidl_SIDLException.o \
- sidl_io_Deserializer.o sidl_io_IOException.o sidl_io_Serializeable.o \
- sidl_io_Serializer.o sidl_rmi_ConnectRegistry.o \
- sidl_rmi_InstanceHandle.o sidl_rmi_InstanceRegistry.o \
- sidl_rmi_Invocation.o sidl_rmi_NetworkException.o \
- sidl_rmi_ProtocolFactory.o sidl_rmi_Response.o iMesh_SIDL_MeshSidl_Skel.o \
- iMesh_SIDL_MeshSidl_Impl.o iBase_Error_Impl.o iBase_Error_IOR.o \
- iBase_Error_Skel.o iBase_Error.o
+ sidl_rmi_ProtocolFactory.cc sidl_rmi_Response.cc iGeom_SIDL_GeomSidl_Skel.cc \
+ iGeom_SIDL_GeomSidl_Impl.cc iBase_Error_Impl.cc \
+ iBase_Error_Skel.cc iBase_Error.cc
+SERVER_C_SRCS = iGeom_SIDL_GeomSidl_IOR.c iBase_Error_IOR.c
+
+SERVER_OFILES = $(SERVER_CXX_SRCES:.cc=.o) $(SERVER_C_SRCS:.c=.o)
#bin_PROGRAMS = testgeom
#testgeom_SOURCES = testgeom.cpp
@@ -64,41 +60,43 @@
LDADD = @top_srcdir@/itaps/libiGeom.la @abs_srcdir@/libiGeomserver.so ${BABEL_DIR}/lib/libsidl.la
#testgeom_DEPENDENCIES = @top_srcdir@/itaps/libiGeom.la @abs_srcdir@/libiGeomserver.so ${BABEL_DIR}/lib/libsidl.la
-all: ${iGeom_SIDLLIBDIR}/libiGeomserver.so
+all: libiGeomserver.so
settings:
@echo "FACTORY_OFILES = $(FACTORY_OFILES)"
@echo "SERVER_OFILES = $(SERVER_OFILES)"
#============= iBase =============
-repo/.btimestamp: iBase.sidl
+repo/.btimestamp: $(srcdir)/iBase.sidl
-rm -rf repo
- @BABEL_DIR@/bin/babel -tXML -o repo iBase.sidl
+ @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -tXML -o repo $(srcdir)/iBase.sidl
touch $@
-bserver/babel.make: repo/.btimestamp iBase.sidl
+bserver/babel.make: repo/.btimestamp $(srcdir)/iBase.sidl
-rm -f $@
- @BABEL_DIR@/bin/babel -sC++ -o bserver iBase.sidl
+ @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -sC++ -o bserver $(srcdir)/iBase.sidl
#============= iBase =============
-repo/.gtimestamp: iGeom.sidl
- @BABEL_DIR@/bin/babel -tXML -o repo -Rrepo iGeom.sidl
+repo/.gtimestamp: $(srcdir)/iGeom.sidl bserver/babel.make
+ @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -tXML -o repo -Rrepo $(srcdir)/iGeom.sidl
touch $@
-gserver/babel.make: repo/.gtimestamp repo/.btimestamp iGeom_SIDL.sidl iGeom.sidl
+gserver/babel.make: repo/.gtimestamp repo/.btimestamp $(srcdir)/iGeom_SIDL.sidl $(srcdir)/iGeom.sidl
-rm -f $@
- @BABEL_DIR@/bin/babel -R"repo" -sC++ -o gserver iGeom_SIDL.sidl
+ @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -R"repo" -sC++ -o gserver $(srcdir)/iGeom_SIDL.sidl
-Cclient: repo/.gtimestamp repo/.gtimestamp iGeom_SIDL.sidl
+Cclient: repo/.gtimestamp repo/.gtimestamp $(srcdir)/iGeom_SIDL.sidl
-rm -rf Cclient
- @BABEL_DIR@/bin/babel -R"repo" -cC -o Cclient iGeom_SIDL.sidl
+ @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -R"repo" -cC -o Cclient $(srcdir)/iGeom_SIDL.sidl
-F77client: repo/.gtimestamp repo/.btimestamp iGeom_SIDL.sidl
+F77client: repo/.gtimestamp repo/.btimestamp $(srcdir)/iGeom_SIDL.sidl
-rm -rf F77client
- @BABEL_DIR@/bin/babel -R"repo" -cF77 -o F77client iGeom_SIDL.sidl
+ @BABEL_DIR@/bin/babel $(BABEL_FLAGS) -R"repo" -cF77 -o F77client $(srcdir)/iGeom_SIDL.sidl
-${iGeom_SIDLLIBDIR}/libiGeomserver.so: gserver/babel.make ${SERVER_OFILES}
+
+
+libiGeomserver.so: gserver/babel.make ${SERVER_OFILES}
$(CXX) $(LD_FLAGS) $(LD_FLAGS_PIC) -o $@ ${SERVER_OFILES}
libiGeomCclient.so: Cclient ${CCLIENT_OFILES}
@@ -119,19 +117,19 @@
cd mserver; rm -f ${SERVER_HDRS} ${SERVER_SRCS}
.cxx.o:
- $(CXX) $(CXX_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
+ $(CXX) $(LD_FLAGS_PIC) $(CXX_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
.cpp.o:
- $(CXX) $(CXX_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
+ $(CXX) $(LD_FLAGS_PIC) $(CXX_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
.cc.o:
- $(CXX) $(CXX_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
+ $(CXX) $(LD_FLAGS_PIC) $(CXX_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
.c.o:
- $(CC) $(CC_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
+ $(CC) $(LD_FLAGS_PIC) $(CC_FLAGS) -I$(BABEL_DIR)/include ${iGeom_SIDL_INCLUDES} -o $@ -c $<
.f.o:
- $(FC) $(FC_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
+ $(FC) $(LD_FLAGS_PIC) $(FC_FLAGS) ${iGeom_SIDL_INCLUDES} -o $@ -c $<
# Automake doesn't seem to have a directory defined for
# platform-dependent data (or include) files. So put
More information about the cgma-dev
mailing list