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

[tautges at mcs.anl.gov]

Author: tautges
Date: 2007-06-24 19:26:32 -0500 (Sun, 24 Jun 2007)
New Revision: 1132

Modified:
   MOAB/trunk/tools/iMesh/Makefile.am
   MOAB/trunk/tools/iMesh/SIDL/Makefile.am
Log:
Tweaking dependencies a bit to get libiMesh.a to build before
its subdirs (which depend on it) get built.



Modified: MOAB/trunk/tools/iMesh/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/Makefile.am	2007-06-24 23:39:59 UTC (rev 1131)
+++ MOAB/trunk/tools/iMesh/Makefile.am	2007-06-25 00:26:32 UTC (rev 1132)
@@ -1,5 +1,13 @@
 AUTOMAKE_OPTIONS = foreign
 
+if USE_BABEL
+  babel_DIR = SIDL
+else
+  babel_DIR = 
+endif 
+
+SUBDIRS = $(babel_DIR)
+
 INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I.
 
 DEFS += $(DEFINES)
@@ -27,6 +35,8 @@
 
 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
@@ -44,10 +54,3 @@
 	echo "iMesh_LIBDIR=${libdir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 	echo "iMesh_INCLUDEDIR=${includedir}" >> $(DESTDIR)$(cfgdir)/iMesh-Defs.inc
 
-if USE_BABEL
-  babel_DIR = SIDL
-else
-  babel_DIR = 
-endif 
-
-SUBDIRS = $(babel_DIR)

Modified: MOAB/trunk/tools/iMesh/SIDL/Makefile.am
===================================================================
--- MOAB/trunk/tools/iMesh/SIDL/Makefile.am	2007-06-24 23:39:59 UTC (rev 1131)
+++ MOAB/trunk/tools/iMesh/SIDL/Makefile.am	2007-06-25 00:26:32 UTC (rev 1132)
@@ -67,8 +67,8 @@
 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
+LDADD = @top_srcdir@/tools/iMesh/libiMesh.la $(top_builddir)/libMOAB.la @abs_srcdir@/libiMeshserver.so ${BABEL_DIR}/lib/libsidl.la
+testcxx_DEPENDENCIES = @top_srcdir@/tools/iMesh/libiMesh.la $(top_builddir)/libMOAB.la @abs_srcdir@/libiMeshserver.so ${BABEL_DIR}/lib/libsidl.la
 
 settings:
 	@echo "FACTORY_OFILES = $(FACTORY_OFILES)"