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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2007-06-25 14:00:13 -0500 (Mon, 25 Jun 2007)
New Revision: 1134

Modified:
   MOAB/trunk/configure.in
   MOAB/trunk/tools/iMesh/Makefile.am
   MOAB/trunk/tools/iMesh/SIDL/Makefile.am
Log:
Coupla configure-related fixes.

tools/iMesh/Makefile.am: adding '.' to SUBDIRS and removing
  dependency I had inserted yesterday; also changed the install
  hook a bit
tools/iMesh/SIDL/Makefile.am: adding code to install iMesh-SIDL-Defs.inc
configure.in: fixing bug in USE_BABEL conditional



Modified: MOAB/trunk/configure.in
===================================================================
--- MOAB/trunk/configure.in	2007-06-25 17:24:43 UTC (rev 1133)
+++ MOAB/trunk/configure.in	2007-06-25 19:00:13 UTC (rev 1134)
@@ -691,7 +691,7 @@
   AC_SUBST(BABEL_DIR)
   AC_SUBST(USE_BABEL)
 fi
-AM_CONDITIONAL(USE_BABEL, [test "xno" != "$USE_BABEL"])
+AM_CONDITIONAL(USE_BABEL, [test "xno" != "x$USE_BABEL"])
 
 
 ################################################################################

Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am	2007-06-25 17:24:43 UTC (rev 1133)
+++ MOAB/trunk/tools/iMesh/Makefile.am	2007-06-25 19:00:13 UTC (rev 1134)
@@ -6,7 +6,7 @@
   babel_DIR = 
 endif 
 
-SUBDIRS = $(babel_DIR)
+SUBDIRS = . $(babel_DIR)
 
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I.
 
@@ -35,8 +35,6 @@
 
 libiMesh_la_LIBADD = $(top_builddir)/libMOAB.la
 
-all-recursive: ${LTLIBRARIES}
-
 # 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
@@ -50,7 +48,8 @@
 # 'make prefix=/foo install', we don't know the correct install
 # directory until we're doing the install.
 install-data-hook:
-	echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
-	echo "iMesh_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+	echo "iMesh_DIR=${DESTDIR}${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
 	echo "iMesh_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+	echo "iMesh_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
+	echo "MOAB_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 

Modified: MOAB/trunk/tools/iMesh/SIDL/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.am	2007-06-25 17:24:43 UTC (rev 1133)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.am	2007-06-25 19:00:13 UTC (rev 1134)
@@ -137,14 +137,20 @@
 %.o : %.f
 	$(FC) $(FC_FLAGS) ${iMesh_SIDL_INCLUDES} -o $@ -c $<
 
+# 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
+
 # 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.
-cfgdir = $(libdir)
 install-data-hook:
-	echo "iMesh_DIR=${DESTDIR}" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
+	echo "iMesh_DIR=${DESTDIR}${cfgdir}/.." >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
 	echo "iMesh_SIDLLIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
 	echo "iMesh_SIDLINCLUDEDIR=${includedir}/SIDL" >> $(DESTDIR)$(cfgdir)/iMesh-SIDL-Defs.inc
 	(cd mserver; install -d ${includedir}/SIDL; install -t ${includedir}/SIDL ${SERVER_HDRS})