From 66f4bab7a002fdaca087c35d2291926be6ab0a4d Mon Sep 17 00:00:00 2001 From: curt Date: Wed, 4 Nov 1998 23:01:43 +0000 Subject: [PATCH] Changes to the automake/autoconf system to reduce the number of libraries that are unnecessarily linked into the various executables. --- Areas/Makefile.am | 8 +++++++- AssemTris/Makefile.am | 7 ++++++- DemInfo/Makefile.am | 7 ++++++- DemRaw2ascii/Makefile.am | 6 +++++- FixNode/Makefile.am | 7 ++++++- FixObj/Makefile.am | 7 ++++++- GenAirports/Makefile.am | 7 ++++++- Makedir/Makefile.am | 4 +++- SplitTris/Makefile.am | 7 ++++++- Stripe_u/Makefile.am | 1 + Stripe_w/Makefile.am | 1 + Tri2obj/Makefile.am | 7 ++++++- Triangle/Makefile.am | 2 ++ 13 files changed, 61 insertions(+), 10 deletions(-) diff --git a/Areas/Makefile.am b/Areas/Makefile.am index 0ee77fcf0..7c6106189 100644 --- 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 2398c9371..5e830c88b 100644 --- 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 aa73af873..39ae915fa 100644 --- 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 2ff4fb31e..b638e2e96 100644 --- 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 a72e8b22c..cc21872cc 100644 --- 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 bafcf879c..7ced91cc9 100644 --- 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 e3593d492..8ba8e5d1d 100644 --- 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 c83672258..e93857cc0 100644 --- 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 8e4c2df64..e8f64e5b9 100644 --- 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 56308ad51..8373ea88b 100644 --- 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 d3dbaab29..ac0280b8a 100644 --- 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 6c57a638d..c27fc320f 100644 --- 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 99c292410..9753a8dad 100644 --- 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 -- 2.39.2