[MOAB-dev] r1767 - in MOAB/trunk: . tools/mbperf

[kraftche at mcs.anl.gov]

Author: kraftche
Date: 2008-04-15 09:48:02 -0500 (Tue, 15 Apr 2008)
New Revision: 1767

Modified:
   MOAB/trunk/configure.in
   MOAB/trunk/tools/mbperf/Makefile.am
Log:
Fix build without iMesh: make sure USE_BABEL is set (to false) when
building w/out iMesh.

Restructure conditional portions of mbperf/Makefile.am a bit





Modified: MOAB/trunk/configure.in
===================================================================
--- MOAB/trunk/configure.in	2008-04-15 14:26:04 UTC (rev 1766)
+++ MOAB/trunk/configure.in	2008-04-15 14:48:02 UTC (rev 1767)
@@ -769,6 +769,8 @@
   esac
   AC_SUBST(BABEL_DIR)
   AC_SUBST(USE_BABEL)
+else
+  USE_BABEL=no
 fi
 AM_CONDITIONAL(USE_BABEL, [test "xno" != "x$USE_BABEL"])
 

Modified: MOAB/trunk/tools/mbperf/Makefile.am
===================================================================
--- MOAB/trunk/tools/mbperf/Makefile.am	2008-04-15 14:26:04 UTC (rev 1766)
+++ MOAB/trunk/tools/mbperf/Makefile.am	2008-04-15 14:48:02 UTC (rev 1767)
@@ -1,25 +1,36 @@
 AUTOMAKE_OPTIONS = foreign
 DEFS = $(DEFINES) -DIS_BUILDING_MB
 
-INCLUDES += -I$(top_srcdir) -I$(top_builddir)
-bin_PROGRAMS = mbperf
-mbperf_SOURCES = mbperf.cpp
-LDADD = $(top_builddir)/libMOAB.la
-mbperf_DEPENDENCIES = $(top_builddir)/libMOAB.la
-
 if USE_BABEL
-  INCLUDES += -I$(top_srcdir)/tools/iMesh/SIDL/mserver \
-              -I../iMesh/SIDL/mserver \
-              -I$(BABEL_DIR)/include
-  bin_PROGRAMS += mbperf_SIDL
-  mbperf_SIDL_SOURCES = mbperf_SIDL.cpp
-  LDADD += $(top_builddir)/tools/iMesh/SIDL/mserver/libiMeshserver.la
+  babel_includes = -I$(BABEL_DIR)/include
+  babel_progs = mbperf_SIDL
+else
+  babel_includes = 
+  babel_progs = 
 endif
 
 if ENABLE_imesh
-  INCLUDES += -I$(top_srcdir)/tools/iMesh/
-  bin_PROGRAMS += mbperf_iMesh
-  LDADD += $(top_builddir)/tools/iMesh/libiMesh.la 
-  mbperf_iMesh_SOURCES = mbperf_iMesh.cpp
+  imesh_progs = mbperf_iMesh
+else
+  imesh_progs = 
 endif 
 
+
+INCLUDES += -I$(top_srcdir) \
+            -I$(top_builddir) \
+            -I$(top_srcdir)/tools/iMesh \
+            -I$(top_srcdir)/tools/iMesh/SIDL/mserver \
+            -I../iMesh/SIDL/mserver \
+            $(babel_includes)
+
+bin_PROGRAMS = mbperf $(babel_progs) $(imesh_progs)
+
+mbperf_SOURCES = mbperf.cpp
+mbperf_SIDL_SOURCES = mbperf_SIDL.cpp
+mbperf_iMesh_SOURCES = mbperf_iMesh.cpp
+
+LDADD = $(top_builddir)/libMOAB.la
+mbperf_iMesh_LDADD = $(LDADD) ../iMesh/libiMesh.la 
+mbperf_SIDL_LDADD = $(mbperf_iMesh_LDADD) ../iMesh/SIDL/mserver/libiMeshserver.la
+
+