Lots of directory layout reorganization.

[flightgear.git] / DemInfo / Makefile.am

diff --git a/DemInfo/Makefile.am b/DemInfo/Makefile.am
index 4bfa93f57f9657d8f1493a859cb0d4c3d3a64738..355d81593b5f13ab33163631ac8d4b17512b857d 100644 (file)
--- a/DemInfo/Makefile.am
+++ b/DemInfo/Makefile.am
@@ -30,11 +30,13 @@ deminfo_SOURCES = \
        deminfo.cxx
 
 deminfo_LDADD = \
-       $(top_builddir)/Lib/DEM/libDEM.la \
-       $(top_builddir)/Lib/Bucket/libBucket.la \
-       $(top_builddir)/Lib/zlib/libz.la
+       $(top_builddir)/Tools/Lib/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/Lib
 
 # 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
@@ -44,6 +46,22 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.6  1999/03/08 22:00:46  curt
+# Lots of directory layout reorganization.
+#
+# 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.
+#
+# Revision 1.3  1998/09/19 18:01:21  curt
+# Support for changes to libDEM.a
+#
+# Revision 1.2  1998/07/30 23:49:24  curt
+# Removed libtool support.
+#
 # Revision 1.1  1998/06/04 19:18:04  curt
 # Initial revision.
 #