Changes to the automake/autoconf system to reduce the number of libraries

that are unnecessarily linked into the various executables.

diff --git a/Areas/Makefile.am b/Areas/Makefile.am
index 0ee77fcf00de3ceed5124419f3fefde070467630..7c6106189098e644a5e6597820f4de03df942203 100644 (file)
--- a/Areas/Makefile.am
+++ b/Areas/Makefile.am
@@ -28,13 +28,19 @@ bin_PROGRAMS = areas
 
 areas_SOURCES = area.cxx area.hxx main.cxx
 
-areas_LDADD = $(top_builddir)/Lib/Bucket/libBucket.a
+areas_LDADD = \
+       $(top_builddir)/Lib/Bucket/libBucket.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1998/11/04 23:01:43  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.2  1998/07/30 23:49:18  curt
 # Removed libtool support.
 #

diff --git a/AssemTris/Makefile.am b/AssemTris/Makefile.am
index 2398c93718fae17539c4f743f65000e71a1a3a5f..5e830c88b35835f6d6a29c7ceb031fbaac0c0851 100644 (file)
--- a/AssemTris/Makefile.am
+++ b/AssemTris/Makefile.am
@@ -29,13 +29,18 @@ bin_PROGRAMS = assemtris
 assemtris_SOURCES = assemtris.cxx assemtris.hxx
 
 assemtris_LDADD = \
-       $(top_builddir)/Lib/Bucket/libBucket.a
+       $(top_builddir)/Lib/Bucket/libBucket.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.5  1998/11/04 23:01:45  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.4  1998/09/25 19:35:25  curt
 # Renamed assemtris.[ch] to assemtris.[ch]xx
 #

diff --git a/DemInfo/Makefile.am b/DemInfo/Makefile.am
index aa73af87304d5162595df1f7e636b8b255e8d7cd..39ae915fa460820be8f454925175a2ac5d17df42 100644 (file)
--- a/DemInfo/Makefile.am
+++ b/DemInfo/Makefile.am
@@ -33,7 +33,8 @@ deminfo_LDADD = \
        $(top_builddir)/Lib/DEM/libDEM.a \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
-       $(top_builddir)/Lib/zlib/libz.a
+       $(top_builddir)/Lib/zlib/libz.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
@@ -45,6 +46,10 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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
 #

diff --git a/DemRaw2ascii/Makefile.am b/DemRaw2ascii/Makefile.am
index 2ff4fb31e11a8ad000c8bae1b8f101fa2542c707..b638e2e966a95f6876dd42d0502c712532bcf8e9 100644 (file)
--- a/DemRaw2ascii/Makefile.am
+++ b/DemRaw2ascii/Makefile.am
@@ -28,13 +28,17 @@ bin_PROGRAMS = raw2ascii
 
 raw2ascii_SOURCES = main.c rawdem.c rawdem.h
 
-raw2ascii_LDADD = 
+raw2ascii_LDADD = $(base_LIBS)
 
 INCLUDES += 
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1998/11/04 23:01:50  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.2  1998/04/24 00:44:04  curt
 # Added zlib support.
 #

diff --git a/FixNode/Makefile.am b/FixNode/Makefile.am
index a72e8b22c680353ecbc095b0a75c8678994247e5..cc21872cc87e9123b0085095148a7deeb2cdee32 100644 (file)
--- a/FixNode/Makefile.am
+++ b/FixNode/Makefile.am
@@ -34,7 +34,8 @@ fixnode_LDADD = \
        $(top_builddir)/Lib/DEM/libDEM.a \
         $(top_builddir)/Lib/Bucket/libBucket.a \
         $(top_builddir)/Lib/Misc/libMisc.a \
-        $(top_builddir)/Lib/zlib/libz.a
+        $(top_builddir)/Lib/zlib/libz.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
@@ -46,6 +47,10 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# 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.
+#
 # Revision 1.6  1998/09/19 20:43:50  curt
 # C++-ified and STL-ified the code.  Combined triload.* and fixnode.* into
 # a single file.

diff --git a/FixObj/Makefile.am b/FixObj/Makefile.am
index bafcf879cd03a35a7fccc44cd1c3df4fb5c86d73..7ced91cc9f6ba2470727a49726b810d98a07886e 100644 (file)
--- a/FixObj/Makefile.am
+++ b/FixObj/Makefile.am
@@ -31,13 +31,18 @@ fixobj_SOURCES = main.cxx obj.cxx obj.hxx
 fixobj_LDADD = \
        $(top_builddir)/Lib/Math/libMath.a \
        $(top_builddir)/Lib/Debug/libDebug.a \
-       $(top_builddir)/Lib/zlib/libz.a
+       $(top_builddir)/Lib/zlib/libz.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1998/11/04 23:01:53  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.6  1998/07/30 23:49:25  curt
 # Removed libtool support.
 #

diff --git a/GenAirports/Makefile.am b/GenAirports/Makefile.am
index e3593d4928496965a6d2ed4a406cd78d4cca0c5e..8ba8e5d1dc80a41e2dfce96c4c87ccaed0d50e95 100644 (file)
--- a/GenAirports/Makefile.am
+++ b/GenAirports/Makefile.am
@@ -34,13 +34,18 @@ genapts_SOURCES = \
 
 genapts_LDADD = \
        $(top_builddir)/Lib/Bucket/libBucket.a \
-       $(top_builddir)/Lib/zlib/libz.a
+       $(top_builddir)/Lib/zlib/libz.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1998/11/04 23:01:54  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.2  1998/09/04 23:04:47  curt
 # Beginning of convex hull genereration routine.
 #

diff --git a/Makedir/Makefile.am b/Makedir/Makefile.am
index c836722585805af2f732b42152e42c3dc0b37046..e93857cc0527dd94a1230ca188b36b2cb4af498a 100644 (file)
--- a/Makedir/Makefile.am
+++ b/Makedir/Makefile.am
@@ -2,6 +2,8 @@ bin_PROGRAMS = makedir
 
 makedir_SOURCES = makedir.cxx
 
-makedir_LDADD = $(top_builddir)/Lib/Bucket/libBucket.a
+makedir_LDADD = \
+       $(top_builddir)/Lib/Bucket/libBucket.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib

diff --git a/SplitTris/Makefile.am b/SplitTris/Makefile.am
index 8e4c2df64b03b74a8022675646fa3a6048e3010a..e8f64e5b92b7648eae4ec5ecec3fc05cd2e5bfb0 100644 (file)
--- a/SplitTris/Makefile.am
+++ b/SplitTris/Makefile.am
@@ -33,13 +33,18 @@ splittris_LDADD = \
        $(top_builddir)/Lib/Math/libMath.a \
         $(top_builddir)/Lib/Debug/libDebug.a \
        $(top_builddir)/Lib/Misc/libMisc.a \
-        $(top_builddir)/Lib/zlib/libz.a
+        $(top_builddir)/Lib/zlib/libz.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.8  1998/11/04 23:01:57  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.7  1998/10/18 01:17:25  curt
 # Point3D tweaks.
 #

diff --git a/Stripe_u/Makefile.am b/Stripe_u/Makefile.am
index 56308ad51b7035dbcfe89469d6daba9083af3736..8373ea88bd6d4ce910813d9f3b96d0483c1c8224 100644 (file)
--- a/Stripe_u/Makefile.am
+++ b/Stripe_u/Makefile.am
@@ -27,3 +27,4 @@ strips_SOURCES = \
        triangulate.h triangulatex.h \
        util.c util.h
 
+strips_LDADD = $(base_LIBS)

diff --git a/Stripe_w/Makefile.am b/Stripe_w/Makefile.am
index d3dbaab29c710d48070abcfbf23dad37fa6dfa89..ac0280b8a0583771998c908407abae236394f50c 100644 (file)
--- a/Stripe_w/Makefile.am
+++ b/Stripe_w/Makefile.am
@@ -24,3 +24,4 @@ strips_SOURCES = \
        triangulate.h triangulatex.h \
        util.c util.h
 
+strips_LDADD = $(base_LIBS)

diff --git a/Tri2obj/Makefile.am b/Tri2obj/Makefile.am
index 6c57a638d1e87ee10a5bda07e2559c96a003eaec..c27fc320f02b285298b1508cda51d5e2d8bc09b0 100644 (file)
--- a/Tri2obj/Makefile.am
+++ b/Tri2obj/Makefile.am
@@ -32,13 +32,18 @@ tri2obj_LDADD = \
        $(top_builddir)/Lib/Bucket/libBucket.a \
        $(top_builddir)/Lib/Math/libMath.a \
         $(top_builddir)/Lib/Debug/libDebug.a \
-        $(top_builddir)/Lib/zlib/libz.a
+        $(top_builddir)/Lib/zlib/libz.a \
+       $(base_LIBS)
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.7  1998/11/04 23:02:02  curt
+# Changes to the automake/autoconf system to reduce the number of libraries
+# that are unnecessarily linked into the various executables.
+#
 # Revision 1.6  1998/07/30 23:49:26  curt
 # Removed libtool support.
 #

diff --git a/Triangle/Makefile.am b/Triangle/Makefile.am
index 99c292410fe70f00ca300f59af976a9d863f84e0..9753a8dadcb041004a59750b94ed28332f9330b0 100644 (file)
--- a/Triangle/Makefile.am
+++ b/Triangle/Makefile.am
@@ -15,4 +15,6 @@ bin_PROGRAMS = triangle # showme
 
 triangle_SOURCES = triangle.c triangle.h
 
+triangle_LDADD = $(base_LIBS)
+
 # showme_SOURCES = showme.c