[MOAB-dev] r1237 - in MOAB/trunk: . tools/iMesh/SIDL tools/iMesh/SIDL/mserver
kraftche at mcs.anl.gov
kraftche at mcs.anl.gov
Thu Aug 16 15:33:04 CDT 2007
Author: kraftche
Date: 2007-08-16 15:33:04 -0500 (Thu, 16 Aug 2007)
New Revision: 1237
Added:
MOAB/trunk/tools/iMesh/SIDL/Cclient.make
MOAB/trunk/tools/iMesh/SIDL/Fclient.make
MOAB/trunk/tools/iMesh/SIDL/Makefile.in
MOAB/trunk/tools/iMesh/SIDL/common.make.in
MOAB/trunk/tools/iMesh/SIDL/mserver.make
Removed:
MOAB/trunk/tools/iMesh/SIDL/Cclient/
MOAB/trunk/tools/iMesh/SIDL/Fclient/
MOAB/trunk/tools/iMesh/SIDL/Makefile.am
MOAB/trunk/tools/iMesh/SIDL/bserver/
MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am
Modified:
MOAB/trunk/configure.in
Log:
Rewrite the build system for the SIDL-based iMesh interface:
o Use custom Makefile.in rather than letting automake generate one
- automake cannot correctly handle lists of source files
generated at build time (babel.make)
o Use two-level makefiles
- in upper-level makefile, do "$(MAKE) -f other-makefile TARGET"
- ensures that stubs generated by babel are created/updated before
they are included, so that the build works with make implementations
other than GNUmake
o The following targets are implemented:
all: (default) build server and client libraries
mostlyclean: remove compiled files
clean: remove compiled files & babel-generated files
distclean: prinstine source
install: build and install libs and headers
uninstall: remove any files created by 'install'
distdir: used by top-level "make dist"
testcxx: compile "testcxx" test
check: compile and run tests
o The following targets are provided but do nothing:
dvi pdf ps html info man installcheck
o The following top-level targets now work correctly, both with
and without configured BABEL support:
- make install
- make uninstall
- make dist
- make distcheck
Modified: MOAB/trunk/configure.in
===================================================================
--- MOAB/trunk/configure.in 2007-08-16 17:01:02 UTC (rev 1236)
+++ MOAB/trunk/configure.in 2007-08-16 20:33:04 UTC (rev 1237)
@@ -766,9 +766,7 @@
tools/iMesh/iMesh-Defs.inc
tools/iMesh/SIDL/iMesh-SIDL-Defs.inc
tools/iMesh/SIDL/Makefile
- tools/iMesh/SIDL/mserver/Makefile
- tools/iMesh/SIDL/Cclient/Makefile
- tools/iMesh/SIDL/Fclient/Makefile
+ tools/iMesh/SIDL/common.make
tools/mbperf/Makefile
tools/mbchaco/Makefile
tools/mbzoltan/Config.moab
Added: MOAB/trunk/tools/iMesh/SIDL/Cclient.make
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Cclient.make (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/Cclient.make 2007-08-16 20:33:04 UTC (rev 1237)
@@ -0,0 +1,9 @@
+include babel.make
+
+TARGET_LIB = libiMeshCclient.la
+C_SRCS = $(STUBSRCS)
+CXX_SRCS =
+LIBLINK = $(LINK)
+bdir = Cclient
+
+include ../common.make
Added: MOAB/trunk/tools/iMesh/SIDL/Fclient.make
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Fclient.make (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/Fclient.make 2007-08-16 20:33:04 UTC (rev 1237)
@@ -0,0 +1,9 @@
+include babel.make
+
+TARGET_LIB = libiMeshFclient.la
+C_SRCS = $(STUBSRCS)
+CXX_SRCS =
+LIBLINK = $(LINK)
+bdir = Fclient
+
+include ../common.make
Deleted: MOAB/trunk/tools/iMesh/SIDL/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.am 2007-08-16 17:01:02 UTC (rev 1236)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.am 2007-08-16 20:33:04 UTC (rev 1237)
@@ -1,43 +0,0 @@
-SUBDIRS = . mserver Cclient Fclient
-
-# $(RECURSIVE_TARGETS): mserver/babel.make Cclient/babel.make Fclient/babel.make
-#
-# BABEL = @BABEL_DIR@/bin/babel
-# if USE_BABEL
-# SIDL_FILES = $(srcdir)/iBase.sidl $(srcdir)/iMesh.sidl $(srcdir)/iMesh_SIDL.sidl
-# server_babel_cmd = $(BABEL) -sC++ -omserver
-# cclient_babel_cmd = $(BABEL) -cC -oCclient
-# fclient_babel_cmd = $(BABEL) -cF77 -oFclient
-# else
-# SIDL_FILES=
-# server_babel_cmd = touch mserver/babel.make
-# cclient_babel_cmd = touch Cclient/babel.make
-# fclient_babel_cmd = touch Fclient/babel.make
-# endif
-#
-# mserver/babel.make: $(SIDL_FILES)
-# $(server_babel_cmd) $(SIDL_FILES)
-#
-# Cclient/babel.make: $(SIDL_FILES)
-# $(cclient_babel_cmd) $(SIDL_FILES)
-#
-# Fclient/babel.make: $(SIDL_FILES)
-# $(fclient_babel_cmd) $(SIDL_FILES)
-
-# Automake doesn't seem to have a directory defined for
-# platform-dependent data (or include) files. So put
-# in $(libdir). Define a $(cfgdir) to get around automake's
-# check that only libraries are going in $(libdir)
-cfgdir = $(libdir)
-cfg_DATA = iMesh-SIDL-Defs.inc
-
-EXTRA_DIST = iBase.sidl iMesh.sidl iMesh_SIDL.sidl iBase_SIDL_defs.h
-
-# By default, iMesh-SIDL-Defs.inc will define these to $(srcdir). We
-# want to override that during the INSTALL of the file so
-# that the correct values are set (e.g. if someone does
-# 'make prefix=/foo install', we don't know the correct install
-# directory until we're doing the install.
-install-data-hook:
- echo "iMesh_SIDL_includes=-I$(includedir) -I$(includedir)/SIDL" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
- echo "iMesh_SIDL_LFDFLAGS=-L${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
Added: MOAB/trunk/tools/iMesh/SIDL/Makefile.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.in (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.in 2007-08-16 20:33:04 UTC (rev 1237)
@@ -0,0 +1,241 @@
+ at SET_MAKE@
+
+MAKE_INC = iMesh-SIDL-Defs.inc
+SIDL_FILES = iBase.sidl iMesh.sidl iMesh_SIDL.sidl
+SIDL_FILES_PATH = $(srcdir)/iBase.sidl $(srcdir)/iMesh.sidl $(srcdir)/iMesh_SIDL.sidl
+SERVER_FILES = mserver/iBase_Error_Impl.cc \
+ mserver/iBase_Error_Impl.hh \
+ mserver/iMesh_SIDL_MeshSidl_Impl.cc \
+ mserver/iMesh_SIDL_MeshSidl_Impl.hh
+SERVER_FILES_PATH = $(srcdir)/mserver/iBase_Error_Impl.cc \
+ $(srcdir)/mserver/iBase_Error_Impl.hh \
+ $(srcdir)/mserver/iMesh_SIDL_MeshSidl_Impl.cc \
+ $(srcdir)/mserver/iMesh_SIDL_MeshSidl_Impl.hh
+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
+
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL = @INSTALL@
+BABEL_DIR = @BABEL_DIR@
+USE_BABEL = @USE_BABEL@
+BABEL = $(BABEL_DIR)/bin/babel
+ECHO = @ECHO@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAGMC_CONFIG_OPTIONS = @DAGMC_CONFIG_OPTIONS@
+DEFINES = @DEFINES@
+LIBTOOL = @LIBTOOL@
+
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+subdir = tools/iMesh/SIDL
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+
+VPATH = @srcdir@
+
+all: $(MAKE_INC) recursive
+ if test "x$(USE_BABEL)" = "xyes"; then \
+ (cd mserver && $(MAKE) -f ../$(srcdir)/mserver.make $@) && \
+ (cd Cclient && $(MAKE) -f ../$(srcdir)/Cclient.make $@) && \
+ (cd Fclient && $(MAKE) -f ../$(srcdir)/Fclient.make $@) ; \
+ fi
+
+clean:
+ rm -rf Cclient Fclient mserver
+ rm -rf testcxx testcxx.lo testcxx.o .deps .libs
+
+distclean: clean
+ rm -f Makefile iMesh-SIDL-Defs.inc.in
+
+mostlyclean:
+ rm -rf Cclient/*.o Cclient/*.lo \
+ Fclient/*.o Fclient/*.lo \
+ server/*.o server/*.lo
+
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+common.make: $(srcdir)/common.make.in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+$(MAKE_INC): $(srcdir)/$(MAKE_INC).in $(top_builddir)/config.status
+ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+install: $(SIDL_FILES) $(MAKE_INC) install-recursive
+ for file in $(SIDL_FILES); do \
+ $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(includedir)/$$file ; \
+ done
+ $(INSTALL_DATA) $(MAKE_INC) $(DESTDIR)$(libdir)/$(MAKE_INC)
+ $(ECHO) "iMesh_SIDL_includes=-I$(includedir) -I$(includedir)/SIDL" >> $(DESTDIR)$(libdir)/$(MAKE_INC)
+ $(ECHO) "iMesh_SIDL_LFDFLAGS=-L${libdir}" >> $(DESTDIR)$(libdir)/$(MAKE_INC)
+
+uninstall: uninstall-recursive
+ for file in $(SIDL_FILES); do \
+ rm -f $(DESTDIR)$(includedir)/$$file ; \
+ done
+ rm -f $(DESTDIR)$(libdir)/$(MAKE_INC)
+
+install-recursive: recursive
+ if test "x$(USE_BABEL)" = "xyes"; then \
+ (cd mserver && $(MAKE) -f ../$(srcdir)/mserver.make install DESTDIR="$(DESTDIR)") && \
+ (cd Cclient && $(MAKE) -f ../$(srcdir)/Cclient.make install DESTDIR="$(DESTDIR)") && \
+ (cd Fclient && $(MAKE) -f ../$(srcdir)/Fclient.make install DESTDIR="$(DESTDIR)") ; \
+ fi
+
+uninstall-recursive: recursive
+ if test "x$(USE_BABEL)" = "xyes"; then \
+ (cd mserver && $(MAKE) -f ../$(srcdir)/mserver.make uninstall DESTDIR="$(DESTDIR)") && \
+ (cd Cclient && $(MAKE) -f ../$(srcdir)/Cclient.make uninstall DESTDIR="$(DESTDIR)") && \
+ (cd Fclient && $(MAKE) -f ../$(srcdir)/Fclient.make uninstall DESTDIR="$(DESTDIR)") ; \
+ fi
+
+distdir: $(DIST_FILES)
+ test -d $(distdir) || $(mkdir_p) $(distdir) || exit 1
+ test -d $(distdir)/mserver || $(mkdir_p) $(distdir)/mserver || exit 1
+ @for file in $(DIST_FILES); do \
+ $(ECHO) "cp -p $(srcdir)/$$file $(distdir)/$$file"; \
+ cp -p $(srcdir)/$$file $(distdir)/$$file || exit 1; \
+ done
+
+recursive: mserver/babel.make Cclient/babel.make Fclient/babel.make common.make
+
+# The --vpath option is broken for some versions of babel, so
+# copy files when doing out-of-tree build.
+# These should do nothing for in-tree builds because the target
+# and source files are the same file and therefore always have
+# the same timestamp.
+# Use 'cat' rather than 'cp' so that target files get a clean
+# set of permissions (writable, owned by person running make, etc.)
+mserver/babel.make: $(SIDL_FILES_PATH) $(SERVER_FILES_PATH)
+ test -d mserver || $(mkdir_p) mserver || exit 1
+ @for p in $(SERVER_FILES); do \
+ $(ECHO) "cat $(srcdir)/$$p > $$p"; \
+ cat $(srcdir)/$$p > $$p; \
+ done
+ @if test "x$(USE_BABEL)" = "xyes"; then \
+ $(ECHO) '$(BABEL) -sC++ $(SIDL_FILES_PATH) -o mserver' ; \
+ $(BABEL) -sC++ $(SIDL_FILES_PATH) -o mserver; \
+ fi
+ touch $@
+
+Cclient/babel.make: $(SIDL_FILES)
+ test -d Cclient || $(mkdir_p) Cclient || exit 1
+ @if test "x$(USE_BABEL)" = "xyes"; then \
+ $(ECHO) '$(BABEL) -cC $(SIDL_FILES_PATH) -o Cclient' ; \
+ $(BABEL) -cC $(SIDL_FILES_PATH) -o Cclient; \
+ fi
+ touch $@
+
+Fclient/babel.make: $(SIDL_FILES)
+ test -d Fclient || $(mkdir_p) Fclient || exit 1
+ @if test "x$(USE_BABEL)" = "xyes"; then \
+ $(ECHO) '$(BABEL) -cF77 $(SIDL_FILES_PATH) -o Fclient' ; \
+ $(BABEL) -cF77 $(SIDL_FILES_PATH) -o Fclient; \
+ fi
+ touch $@
+
+.SUFFIXES: .cpp .cc .c .lo
+
+check:
+ @test "x$(USE_BABEL)" != "xyes" || $(MAKE) run_testcxx
+
+run_testcxx: testcxx
+ @$(ECHO) "./$< $(top_srcdir)/test/3k-tri-sphere.vtk"
+ @./$< $(top_srcdir)/test/3k-tri-sphere.vtk || $(ECHO) "<<<<<<<<<<<<<<<< testcxx FAILED >>>>>>>>>>>>>>>>>>>"
+
+testcxx : testcxx.lo all
+ $(CXXLINK) $< mserver/libiMeshserver.la
+
+.cpp.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.c.lo:
+ $(LTCOMPILE) -c -o $@ $<
+
+dvi:
+
+pdf:
+
+ps:
+
+html:
+
+info:
+
+man:
+
+installcheck:
+
+.PHONEY: all clean distclean mostlyclean distdir check recursive \
+ install install-recursive uninstall uninstall-recursive \
+ dvi ps pdf html info man installcheck
+
+
+
Added: MOAB/trunk/tools/iMesh/SIDL/common.make.in
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/common.make.in (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/common.make.in 2007-08-16 20:33:04 UTC (rev 1237)
@@ -0,0 +1,213 @@
+ at SET_MAKE@
+
+LIBS = $(imesh_builddir)/libiMesh.la \
+ $(top_builddir)/libMOAB.la \
+ -L$(BABEL_DIR)/lib -lsidl
+
+INCLUDES = -I$(BABEL_DIR)/include \
+ -I$(builddir) -I$(srcdir) \
+ -I$(imesh_srcdir) \
+ -I$(imesh_builddir) \
+ -I$(sidl_srcdir)
+
+imesh_srcdir = $(sidl_srcdir)/..
+imesh_builddir = $(sidl_builddir)/..
+sidl_srcdir = $(srcdir)/..
+sidl_builddir = $(builddir)/..
+srcdir = ../@srcdir@
+top_srcdir = ../@top_srcdir@
+VPATH =
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../../../..
+builddir = .
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+target_triplet = @target@
+subdir = tools/iMesh/SIDL/$(bdir)
+libLTLIBRARIES_INSTALL = $(INSTALL)
+LTLIBRARIES = $(lib_LTLIBRARIES)
+
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) --tag=CXX --mode=compile $(CXX) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CXXFLAGS) $(CXXFLAGS)
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+ $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+CCLD = $(CC)
+LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+BABEL_DIR = @BABEL_DIR@
+BABEL = $(BABEL_DIR)/bin/babel
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DAGMC_CONFIG_OPTIONS = @DAGMC_CONFIG_OPTIONS@
+DEFINES = @DEFINES@
+
+# Some variables
+DEFS = $(DEFINES) -DIS_BUILDING_MB
+DEPDIR = @DEPDIR@
+DISTCHECK_CONFIGURE_FLAGS = @DISTCHECK_CONFIGURE_FLAGS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GREP = @GREP@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAKEINFO = @MAKEINFO@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PARALLEL_FALSE = @PARALLEL_FALSE@
+PARALLEL_HDF5_FALSE = @PARALLEL_HDF5_FALSE@
+PARALLEL_HDF5_TRUE = @PARALLEL_HDF5_TRUE@
+PARALLEL_TRUE = @PARALLEL_TRUE@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target = @target@
+target_alias = @target_alias@
+target_cpu = @target_cpu@
+target_os = @target_os@
+target_vendor = @target_vendor@
+
+# Don't require GNU-standard files (Changelog, README, etc.)
+AUTOMAKE_OPTIONS = foreign
+
+# The list of source files, and any header files that do not need to be installed
+SOURCES = $(C_SRCS) $(CXX_SRCS)
+OBJECTS = $(C_SRCS:.c=.lo) $(CXX_SRCS:.cc=.lo)
+HEADERS = $(IMPLHDRS) $(IORHDRS) $(STUBHDRS)
+
+all: $(TARGET_LIB)
+
+install: install-lib install-headers
+
+uninstall: uninstall-lib uninstall-headers
+
+$(TARGET_LIB): $(OBJECTS)
+ $(LIBLINK) -rpath $(libdir) $(LDFLAGS) $(OBJECTS) $(LIBADD) $(LIBS)
+
+
+install-lib: $(TARGET_LIB)
+ test -d "$(libdir)" || mkdir "$(libdir)"
+ $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $< '$(DESTDIR)$(libdir)/$<'
+
+uninstall-lib:
+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$(TARGET_LIB)"
+
+install-headers: $(HEADERS)
+ test -d "$(includedir)" || mkdir "$(includedir)"
+ @list='$(HEADERS)'; for p in $$list; do \
+ $(ECHO) $(INSTALL_HEADER) $$p $(DESTDIR)$(includedir)/$$p ; \
+ $(INSTALL_HEADER) "$$p" "$(DESTDIR)$(includedir)/$$p" ; \
+ done
+
+uninstall-headers:
+ @list='$(HEADERS)'; for p in $$list; do \
+ $(ECHO) "rm -f $(DESTDIR)$(includedir)/$$p" ; \
+ rm -f "$(DESTDIR)$(includedir)/$$p" ; \
+ done
+
+.cc.lo:
+ $(LTCXXCOMPILE) -c -o $@ $<
+
+.c.lo:
+ $(LTCOMPILE) -c -o $@ $<
+
+.SUFFIXES: .lo .cc .c
+
+.PHONEY: all install uninstall install-lib uninstall-lib install-headers uninstall-headers
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
Deleted: MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am 2007-08-16 17:01:02 UTC (rev 1236)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver/Makefile.am 2007-08-16 20:33:04 UTC (rev 1237)
@@ -1,88 +0,0 @@
-INCLUDES += -I at BABEL_DIR@/include -I at srcdir@/..
-
-BUILT_SOURCES = $(libiMeshserver_la_SOURCES) $(libiMeshserver_la_include_HEADERS)
-
-if USE_BABEL
- BABEL_CMD=@BABEL_DIR@/bin/babel -sC++ $(SIDL_FILES)
-else
- BABEL_CMD=touch $(BUILT_SOURCES)
-endif
-
-SIDL_FILES = @srcdir@/../iBase.sidl \
- @srcdir@/../iMesh.sidl \
- @srcdir@/../iMesh_SIDL.sidl
-
-$(BUILT_SOURCES) : .timestamp
-
-.timestamp: $(SIDL_FILES)
- $(BABEL_CMD)
- touch $@
-
-lib_LTLIBRARIES = libiMeshserver.la
-
-libiMeshserver_la_LIBADD = ../../libiMesh.la
-
-libiMeshserver_la_includedir = $(includedir)/SIDL
-
-libiMeshserver_la_SOURCES = \
- iBase_Error_Impl.hh iMesh_SIDL_MeshSidl_Impl.hh iMesh_Factory_Impl.hh \
- iBase_Error_Impl.cc iMesh_SIDL_MeshSidl_Impl.cc iMesh_Factory_Impl.cc \
- 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_Error_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 \
- iBase_Error_IOR.c iMesh_SIDL_MeshSidl_IOR.c iMesh_Factory_IOR.c \
- iBase_Error_Skel.cc iMesh_SIDL_MeshSidl_Skel.cc iMesh_Factory_Skel.cc \
- iBase_ArrTag.cc iBase_EntSet.cc iBase_EntTag.cc iBase_Error.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 iMesh_Factory.cc sidl_BaseClass.cc sidl_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 \
- sidl_io_Deserializer.cc sidl_io_IOException.cc sidl_io_Serializeable.cc \
- 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
-
-libiMeshserver_la_include_HEADERS = \
- iBase.hh iBase_ArrTag.hh iBase_CreationStatus.hh iBase_EntSet.hh \
- iBase_EntTag.hh iBase_EntityType.hh iBase_Error.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 \
- 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 \
- sidl_io_IOException.hh sidl_io_Serializeable.hh sidl_io_Serializer.hh \
- 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
-
-my_dist_sources = \
- iBase_Error_Impl.hh iMesh_SIDL_MeshSidl_Impl.hh iMesh_Factory_Impl.hh \
- iBase_Error_Impl.cc iMesh_SIDL_MeshSidl_Impl.cc iMesh_Factory_Impl.cc
-
-
-
-dist-hook:
- for i in $(BUILT_SOURCES); do \
- found=0; \
- for j in $(my_dist_sources); do \
- if test "x$$i" = "x$$j"; then \
- found=1; \
- fi; \
- done; \
- if test "$$found" = "0"; then \
- $(RM) $(distdir)/$$i; \
- fi; \
- done
Added: MOAB/trunk/tools/iMesh/SIDL/mserver.make
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/mserver.make (rev 0)
+++ MOAB/trunk/tools/iMesh/SIDL/mserver.make 2007-08-16 20:33:04 UTC (rev 1237)
@@ -0,0 +1,9 @@
+include babel.make
+
+TARGET_LIB = libiMeshserver.la
+C_SRCS = $(IORSRCS)
+CXX_SRCS = $(IMPLSRCS) $(SKELSRCS) $(STUBSRCS)
+LIBLINK = $(CXXLINK)
+bdir = mserver
+
+include ../common.make
More information about the moab-dev
mailing list