[MOAB-dev] commit/MOAB: danwu: Add a new macro LOCDIR to AM_CPPFLAGS in each makefile, which defines the directory where the compiled source is located. It will be used in printing error messages later.

commits-noreply at bitbucket.org commits-noreply at bitbucket.org
Mon Feb 3 14:55:49 CST 2014 

1 new commit in MOAB:

https://bitbucket.org/fathomteam/moab/commits/6e66fc7ab424/
Changeset:   6e66fc7ab424
Branch:      error_handling_enhancement
User:        danwu
Date:        2014-02-03 21:54:25
Summary:     Add a new macro LOCDIR to AM_CPPFLAGS in each makefile, which defines the directory where the compiled source is located. It will be used in printing error messages later.

Affected #:  25 files

diff --git a/examples/old/Makefile.am b/examples/old/Makefile.am
index 21e6da3..dbc4287 100644
--- a/examples/old/Makefile.am
+++ b/examples/old/Makefile.am
@@ -19,7 +19,8 @@ AM_CPPFLAGS += -I../src \
                -I$(srcdir)/../src \
                -I$(srcdir)/../src/parallel \
                -I$(srcdir)/../src/oldinc \
-               -DSRCDIR=$(SRCDIR)
+               -DSRCDIR=$(SRCDIR) \
+               -DLOCDIR=examples/old/
 
 FileRead_SOURCES = FileRead.cpp
 GeomSetHierarchy_SOURCES = GeomSetHierarchy.cpp

diff --git a/examples/old/itaps/Makefile.am b/examples/old/itaps/Makefile.am
index 1752713..8d77925 100644
--- a/examples/old/itaps/Makefile.am
+++ b/examples/old/itaps/Makefile.am
@@ -4,10 +4,11 @@ check_PROGRAMS += FindConnectF TagIterateF ListSetsNTagsF90
 endif
 
 AM_CPPFLAGS += -I$(top_srcdir)/itaps/imesh \
-	-I$(top_srcdir)/itaps/ \
-	-I$(top_srcdir)/src/parallel/ \
-	-I$(top_builddir)/itaps \
-	-I$(top_builddir)/itaps/imesh
+    -I$(top_srcdir)/itaps/ \
+    -I$(top_srcdir)/src/parallel/ \
+    -I$(top_builddir)/itaps \
+    -I$(top_builddir)/itaps/imesh \
+    -DLOCDIR=examples/old/itaps/
 
 TESTS = $(check_PROGRAMS)
 LDADD = $(top_builddir)/itaps/imesh/libiMesh.la $(top_builddir)/src/libMOAB.la ${MOAB_CXX_LINKFLAGS} ${MOAB_CXX_LIBS}

diff --git a/itaps/igeom/Makefile.am b/itaps/igeom/Makefile.am
index 93314d0..418cca8 100644
--- a/itaps/igeom/Makefile.am
+++ b/itaps/igeom/Makefile.am
@@ -3,7 +3,8 @@ BUILT_SOURCES = FBiGeom_protos.h
 MESHDIR = $(top_srcdir)/MeshFiles/unittest/iGeom
 
 AM_CPPFLAGS = -DSRCDIR=$(srcdir) \
-	      -DMESHDIR=$(MESHDIR) \
+              -DMESHDIR=$(MESHDIR) \
+              -DLOCDIR=itaps/igeom/ \
               -I$(top_srcdir)/src \
               -I$(top_builddir)/src \
               -I.. -I$(srcdir)/.. \

diff --git a/itaps/imesh/Makefile.am b/itaps/imesh/Makefile.am
index 647b8c1..c8d9dc3 100644
--- a/itaps/imesh/Makefile.am
+++ b/itaps/imesh/Makefile.am
@@ -4,6 +4,7 @@ MESHDIR = $(top_srcdir)/MeshFiles/unittest
 
 AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
                -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=itaps/imesh/ \
                -I$(srcdir)/.. \
                -I$(top_srcdir)/src \
                -I$(top_builddir)/src  \

diff --git a/src/LocalDiscretization/Makefile.am b/src/LocalDiscretization/Makefile.am
index cb34071..78568be 100644
--- a/src/LocalDiscretization/Makefile.am
+++ b/src/LocalDiscretization/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign
 noinst_LTLIBRARIES = libLocalDiscretization.la
          
 # Some variables
-AM_CPPFLAGS += -DIS_BUILDING_MB -DSRCDIR=$(srcdir) \
+AM_CPPFLAGS += -DIS_BUILDING_MB -DSRCDIR=$(srcdir) -DLOCDIR=src/LocalDiscretization/ \
                -I$(srcdir)/.. -I.. -I$(srcdir)/../moab -I$(srcdir)/moab
 
 # The directory in which to install headers

diff --git a/src/Makefile.am b/src/Makefile.am
index 31c522e..54fcf1c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -19,6 +19,7 @@ BUILT_SOURCES = MBCN_protos.h
 
 # Some variables
 AM_CPPFLAGS += -DIS_BUILDING_MB \
+               -DLOCDIR=src/ \
                -I. \
                -I$(srcdir)/io \
                -I$(srcdir)/io/mhdf/include \

diff --git a/src/parallel/Makefile.am b/src/parallel/Makefile.am
index b80b85e..5a39552 100644
--- a/src/parallel/Makefile.am
+++ b/src/parallel/Makefile.am
@@ -5,7 +5,7 @@ AUTOMAKE_OPTIONS = foreign
 noinst_LTLIBRARIES = libMOABpar.la
          
 # Some variables
-AM_CPPFLAGS += -DIS_BUILDING_MB -DSRCDIR=$(srcdir) \
+AM_CPPFLAGS += -DIS_BUILDING_MB -DSRCDIR=$(srcdir) -DLOCDIR=src/parallel/ \
                -I$(srcdir)/.. -I.. -I$(srcdir)/../io \
                -I$(srcdir)/../io/mhdf/include 
 

diff --git a/test/Makefile.am b/test/Makefile.am
index 631e126..4797a49 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -15,9 +15,10 @@ MESHDIR = $(top_srcdir)/MeshFiles/unittest
 
 AM_CPPFLAGS += -DIS_BUILDING_MB \
                -DSRCDIR=$(srcdir) \
-		-DMESHDIR=$(MESHDIR) \
+               -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=test/ \
                -I$(top_builddir)/src \
-               -I$(top_srcdir)/src  \
+               -I$(top_srcdir)/src \
                -I$(top_srcdir)/src/LocalDiscretization
 
 if PARALLEL

diff --git a/test/dual/Makefile.am b/test/dual/Makefile.am
index af0bd18..276dfa8 100644
--- a/test/dual/Makefile.am
+++ b/test/dual/Makefile.am
@@ -1,5 +1,5 @@
 
-AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src 
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src -DLOCDIR=test/dual/
 check_PROGRAMS = dual_test
 dual_test_SOURCES = dual_test.cpp
 LDADD = $(top_builddir)/src/libMOAB.la

diff --git a/test/h5file/Makefile.am b/test/h5file/Makefile.am
index f6bd2a5..ea6b613 100644
--- a/test/h5file/Makefile.am
+++ b/test/h5file/Makefile.am
@@ -1,17 +1,18 @@
 EXTRA_DIST = v3_dodec.h5m \
              rocket_ents_in_assm.h5m \
              portable_x86_64.h5m \
-	     portable_x86_32.h5m \
-	     portable_power_32.h5m
+             portable_x86_32.h5m \
+             portable_power_32.h5m
 
 AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
+               -DLOCDIR=test/h5file/ \
                -I.. -I$(srcdir)/.. \
                -I$(top_srcdir)/src \
                -I$(top_srcdir)/src/io \
                -I$(top_srcdir)/src/io/mhdf/include \
                -I$(top_builddir)/src \
                -I$(top_srcdir)/src/parallel \
-	       -I$(top_builddir)/src/parallel 
+               -I$(top_builddir)/src/parallel 
             
 TESTS = h5test \
         h5legacy \

diff --git a/test/io/Makefile.am b/test/io/Makefile.am
index c776727..58f6063 100644
--- a/test/io/Makefile.am
+++ b/test/io/Makefile.am
@@ -4,6 +4,7 @@ MESHDIR = $(top_srcdir)/MeshFiles/unittest
 
 AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
                -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=test/io/ \
                -I$(builddir) -I.. -I$(srcdir)/.. \
                -I$(top_builddir)/src \
                -I$(top_srcdir)/src \

diff --git a/test/obb/Makefile.am b/test/obb/Makefile.am
index 6360919..9a0b35b 100644
--- a/test/obb/Makefile.am
+++ b/test/obb/Makefile.am
@@ -5,6 +5,7 @@ MESHDIR = $(top_srcdir)/MeshFiles/unittest
 
 AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
                -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=test/obb/ \
                -I$(top_srcdir)/src -I$(top_builddir)/src -I.. \
                -I$(top_srcdir)/src/parallel -I$(top_builddir)/src/parallel
 

diff --git a/test/oldinc/Makefile.am b/test/oldinc/Makefile.am
index c681d07..2b57cbe 100644
--- a/test/oldinc/Makefile.am
+++ b/test/oldinc/Makefile.am
@@ -2,7 +2,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
                -I$(top_srcdir)/src/parallel \
                -I$(top_srcdir)/src/oldinc \
                -I$(top_builddir)/src \
-               -I$(top_builddir)/src/parallel
+               -I$(top_builddir)/src/parallel \
+               -DLOCDIR=test/oldinc/
 LDADD = $(top_builddir)/src/libMOAB.la
 check_PROGRAMS = test_oldinc
 test_oldinc_SOURCES = test_oldinc.cpp

diff --git a/test/parallel/Makefile.am b/test/parallel/Makefile.am
index 6dd3207..739751c 100644
--- a/test/parallel/Makefile.am
+++ b/test/parallel/Makefile.am
@@ -5,6 +5,7 @@ MESHDIR = $(top_srcdir)/MeshFiles/unittest
 AM_CPPFLAGS += -DIS_BUILDING_MB \
                -DSRCDIR=$(srcdir) \
                -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=test/parallel/ \
                -I. \
                -I.. -I$(srcdir)/.. \
                -I$(top_builddir)/src \

diff --git a/test/perf/Makefile.am b/test/perf/Makefile.am
index f946f94..11f9334 100644
--- a/test/perf/Makefile.am
+++ b/test/perf/Makefile.am
@@ -3,7 +3,8 @@ SUBDIRS = point_location
 AM_CPPFLAGS += -I$(top_srcdir)/src \
                -I$(top_srcdir)/src/io/mhdf/include \
                -I$(top_builddir)/src \
-               -DIS_BUILDING_MB
+               -DIS_BUILDING_MB \
+               -DLOCDIR=test/perf/
             
 LDADD = $(top_builddir)/src/libMOAB.la
 

diff --git a/test/perf/point_location/Makefile.am b/test/perf/point_location/Makefile.am
index 8aa6258..7d3d9c2 100644
--- a/test/perf/point_location/Makefile.am
+++ b/test/perf/point_location/Makefile.am
@@ -6,7 +6,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
                -I$(top_srcdir)/tools/mbcoupler \
                -I$(top_srcdir)/src/moab/point_locator/lotte \
                -I$(top_srcdir)/src/LocalDiscretization/moab/ \
-               -DIS_BUILDING_MB
+               -DIS_BUILDING_MB \
+               -DLOCDIR=test/perf/point_location/
 
 # might need parallel here because of timer
 if PARALLEL

diff --git a/tools/Makefile.am b/tools/Makefile.am
index e8ad0db..b425e94 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -2,9 +2,10 @@ AUTOMAKE_OPTIONS = foreign
 AM_CPPFLAGS += -I$(top_srcdir)/src \
                -I$(top_builddir)/src \
                -I$(top_srcdir)/src/parallel \
-	       -I$(top_srcdir)/itaps \
-	       -I$(top_builddir)/itaps/imesh \
-               -I$(top_builddir)/src/parallel 
+               -I$(top_srcdir)/itaps \
+               -I$(top_builddir)/itaps/imesh \
+               -I$(top_builddir)/src/parallel \
+               -DLOCDIR=tools/
 
 LDADD = $(top_builddir)/src/libMOAB.la
 if ENABLE_imesh

diff --git a/tools/dagmc/Makefile.am b/tools/dagmc/Makefile.am
index 29d43a5..c6fd864 100644
--- a/tools/dagmc/Makefile.am
+++ b/tools/dagmc/Makefile.am
@@ -1,6 +1,7 @@
 AM_CPPFLAGS += -I$(top_srcdir)/src \
                -I$(top_builddir)/src \
-	       -I$(top_srcdir)/tools
+               -I$(top_srcdir)/tools \
+               -DLOCDIR=tools/dagmc/
 
 lib_LTLIBRARIES = libdagmc.la
 libdagmc_la_SOURCES = DagMC.cpp

diff --git a/tools/mbcoupler/Makefile.am b/tools/mbcoupler/Makefile.am
index ea32ff9..cfb227a 100644
--- a/tools/mbcoupler/Makefile.am
+++ b/tools/mbcoupler/Makefile.am
@@ -1,11 +1,9 @@
 MESHDIR = $(top_srcdir)/MeshFiles/unittest
 
 AM_CPPFLAGS += -DIS_BUILDING_MB \
-               -I$(top_builddir)/src \
-               -I$(top_srcdir)/src 
-
-AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
+               -DSRCDIR=$(srcdir) \
                -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=tools/mbcoupler/ \
                -I$(top_srcdir)/src \
                -I$(top_builddir)/src \
                -I$(top_srcdir)/src/parallel \

diff --git a/tools/mbcslam/Makefile.am b/tools/mbcslam/Makefile.am
index 766c8ab..0697a15 100644
--- a/tools/mbcslam/Makefile.am
+++ b/tools/mbcslam/Makefile.am
@@ -1,11 +1,9 @@
 MESHDIR = $(top_srcdir)/MeshFiles/unittest
 
 AM_CPPFLAGS += -DIS_BUILDING_MB \
-               -I$(top_builddir)/src \
-               -I$(top_srcdir)/src 
-
-AM_CPPFLAGS += -DSRCDIR=$(srcdir) \
+               -DSRCDIR=$(srcdir) \
                -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=tools/mbcslam/ \
                -I$(top_srcdir)/src \
                -I$(top_builddir)/src \
                -I$(top_srcdir)/src/parallel \

diff --git a/tools/mbzoltan/Makefile.am b/tools/mbzoltan/Makefile.am
index 355ead8..46ec700 100644
--- a/tools/mbzoltan/Makefile.am
+++ b/tools/mbzoltan/Makefile.am
@@ -1,9 +1,10 @@
 
-AM_CPPFLAGS += -DIS_BUILDING_MB\
+AM_CPPFLAGS += -DIS_BUILDING_MB \
+               -DLOCDIR=tools/mbzoltan/ \
                -I$(top_srcdir)/src \
                -I$(top_srcdir)/src/parallel \
                -I$(top_builddir)/src \
-	       -I$(srcdir)/.. \
+               -I$(srcdir)/.. \
                $(ZOLTAN_INC_FLAGS)
 
 if HAVE_CGM

diff --git a/tools/mcnpmit/Makefile.am b/tools/mcnpmit/Makefile.am
index 8ca589b..77e10b6 100644
--- a/tools/mcnpmit/Makefile.am
+++ b/tools/mcnpmit/Makefile.am
@@ -1,7 +1,7 @@
 LDADD = $(top_builddir)/src/libMOAB.la \
         $(top_builddir)/tools/mbcoupler/libmbcoupler.la
 
-AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/tools/mbcoupler -I$(top_builddir)/src/moab/point_locater/lotte
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src -I$(top_srcdir)/tools/mbcoupler -I$(top_builddir)/src/moab/point_locater/lotte -DLOCDIR=tools/mcnpmit/
 
 bin_PROGRAMS = mcnpmit
 mcnpmit_SOURCES = mcnpmit.hpp mcnpmit.cpp main.cpp

diff --git a/tools/qvdual/Makefile.am b/tools/qvdual/Makefile.am
index 08b35cb..190360b 100644
--- a/tools/qvdual/Makefile.am
+++ b/tools/qvdual/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src $(QVDUAL_INCLUDES)
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src $(QVDUAL_INCLUDES) -DLOCDIR=tools/qvdual/
 bin_PROGRAMS = qvdual
 qvdual_SOURCES = \
   CropTool.cpp \

diff --git a/tools/refiner/Makefile.am b/tools/refiner/Makefile.am
index 189c641..fec4934 100644
--- a/tools/refiner/Makefile.am
+++ b/tools/refiner/Makefile.am
@@ -4,8 +4,8 @@ AM_CPPFLAGS += -I$(top_srcdir)/src \
                -I$(top_builddir)/src \
                -I$(top_srcdir)/src/parallel \
                -I$(top_srcdir)/test \
-               -DMESHDIR=$(MESHDIR)
-
+               -DMESHDIR=$(MESHDIR) \
+               -DLOCDIR=tools/refiner/
 
 lib_LTLIBRARIES = libMOABrefiner.la
 libMOABrefiner_la_LIBADD = $(top_builddir)/src/libMOAB.la

diff --git a/tools/vtkMOABReader/Makefile.am b/tools/vtkMOABReader/Makefile.am
index 18c00ed..17a1f38 100644
--- a/tools/vtkMOABReader/Makefile.am
+++ b/tools/vtkMOABReader/Makefile.am
@@ -1,4 +1,4 @@
-AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src $(VTK_INCLUDES)
+AM_CPPFLAGS += -I$(top_srcdir)/src -I$(top_builddir)/src $(VTK_INCLUDES) -DLOCDIR=tools/vtkMOABReader/
 lib_LTLIBRARIES = libvtkMOABReader.la
 libvtkMOABReader_la_SOURCES = vtkMOABReader.cxx
 libvtkMOABReader_la_include_HEADERS = vtkMOABReader.h

Repository URL: https://bitbucket.org/fathomteam/moab/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.

More information about the moab-dev mailing list