Moving location of Lib/DEM/ to Tools/DEM/

diff --git a/DemInfo/Makefile.am b/DemInfo/Makefile.am
index 39ae915fa460820be8f454925175a2ac5d17df42..0b3c81ebfab669a07a03fe25b6916f2d0c7f432c 100644 (file)
--- a/DemInfo/Makefile.am
+++ b/DemInfo/Makefile.am
@@ -30,13 +30,13 @@ deminfo_SOURCES = \
        deminfo.cxx
 
 deminfo_LDADD = \
-       $(top_builddir)/Lib/DEM/libDEM.a \
+       $(top_builddir)/Tools/DEM/libDEM.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
        $(top_builddir)/Lib/zlib/libz.a \
        $(base_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
 
 # We can't build this with "-O2" (optimization) since this causes a seg fault
 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just
@@ -46,6 +46,9 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1999/02/01 21:09:27  curt
+# Moving location of Lib/DEM/ to Tools/DEM/
+#
 # Revision 1.4  1998/11/04 23:01:48  curt
 # Changes to the automake/autoconf system to reduce the number of libraries
 # that are unnecessarily linked into the various executables.

diff --git a/FixNode/Makefile.am b/FixNode/Makefile.am
index cc21872cc87e9123b0085095148a7deeb2cdee32..0ec6732761747519c1c736ec7c175bd1bf00844a 100644 (file)
--- a/FixNode/Makefile.am
+++ b/FixNode/Makefile.am
@@ -31,13 +31,13 @@ fixnode_SOURCES = \
        main.cxx
 
 fixnode_LDADD = \
-       $(top_builddir)/Lib/DEM/libDEM.a \
+       $(top_builddir)/Tools/DEM/libDEM.a \
         $(top_builddir)/Lib/Bucket/libBucket.a \
         $(top_builddir)/Lib/Misc/libMisc.a \
         $(top_builddir)/Lib/zlib/libz.a \
        $(base_LIBS)
 
-INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
+INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib -I$(top_builddir)/Tools
 
 # We can't build this with "-O2" (optimization) since this causes a seg fault
 # I haven't found a way to strip this out of the CXXFLAGS, so I'm just
@@ -47,6 +47,9 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.8  1999/02/01 21:09:30  curt
+# Moving location of Lib/DEM/ to Tools/DEM/
+#
 # Revision 1.7  1998/11/04 23:01:51  curt
 # Changes to the automake/autoconf system to reduce the number of libraries
 # that are unnecessarily linked into the various executables.

diff --git a/Tools/Makefile.am b/Tools/Makefile.am
index 41cc40b7c6cd8b144e27beda2dfd21774e2022bd..f501f6d76cca47a253c79c75f1bb3675b5af9141 100644 (file)
--- a/Tools/Makefile.am
+++ b/Tools/Makefile.am
@@ -3,6 +3,7 @@ EXTRA_DIST = process-dem.pl
 SUBDIRS = \
        Areas \
        AssemTris \
+       DEM \
        Dem2node \
        DemInfo \
        DemRaw2ascii \