diff --git a/Areas/Makefile.am b/Areas/Makefile.am index 60277ea5d..0ee77fcf0 100644 --- a/Areas/Makefile.am +++ b/Areas/Makefile.am @@ -28,13 +28,16 @@ bin_PROGRAMS = areas areas_SOURCES = area.cxx area.hxx main.cxx -areas_LDADD = $(top_builddir)/Lib/Bucket/libBucket.la +areas_LDADD = $(top_builddir)/Lib/Bucket/libBucket.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.2 1998/07/30 23:49:18 curt +# Removed libtool support. +# # Revision 1.1 1998/07/20 12:54:53 curt # Whoops, need to commit Makefile.am, not Makefile. # diff --git a/AssemTris/Makefile.am b/AssemTris/Makefile.am index 190b0ec5a..f1cb9f24e 100644 --- a/AssemTris/Makefile.am +++ b/AssemTris/Makefile.am @@ -29,13 +29,16 @@ bin_PROGRAMS = assemtris assemtris_SOURCES = assemtris.c assemtris.h assemtris_LDADD = \ - $(top_builddir)/Lib/Bucket/libBucket.la + $(top_builddir)/Lib/Bucket/libBucket.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.3 1998/07/30 23:49:23 curt +# Removed libtool support. +# # Revision 1.2 1998/04/14 02:25:59 curt # Code reorganizations. Added a Lib/ directory for more general libraries. # diff --git a/DemInfo/Makefile.am b/DemInfo/Makefile.am index 4bfa93f57..0ec8323d0 100644 --- a/DemInfo/Makefile.am +++ b/DemInfo/Makefile.am @@ -30,9 +30,9 @@ 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)/Lib/DEM/libDEM.a \ + $(top_builddir)/Lib/Bucket/libBucket.a \ + $(top_builddir)/Lib/zlib/libz.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib @@ -44,6 +44,9 @@ CXXFLAGS = -g #--------------------------------------------------------------------------- # $Log$ +# 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. # diff --git a/FixNode/Makefile.am b/FixNode/Makefile.am index 04d7e2094..b44b9b6d7 100644 --- a/FixNode/Makefile.am +++ b/FixNode/Makefile.am @@ -32,9 +32,9 @@ fixnode_SOURCES = \ triload.cxx triload.hxx fixnode_LDADD = \ - $(top_builddir)/Lib/DEM/libDEM.la \ - $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/zlib/libz.la + $(top_builddir)/Lib/DEM/libDEM.a \ + $(top_builddir)/Lib/Bucket/libBucket.a \ + $(top_builddir)/Lib/zlib/libz.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib @@ -46,6 +46,9 @@ CXXFLAGS = -g #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/07/30 23:49:24 curt +# Removed libtool support. +# # Revision 1.3 1998/04/18 04:02:54 curt # Added zlib support in placed and other misc. tweaks. # diff --git a/FixObj/Makefile.am b/FixObj/Makefile.am index 0f7f16710..bafcf879c 100644 --- a/FixObj/Makefile.am +++ b/FixObj/Makefile.am @@ -29,15 +29,18 @@ bin_PROGRAMS = fixobj fixobj_SOURCES = main.cxx obj.cxx obj.hxx fixobj_LDADD = \ - $(top_builddir)/Lib/Math/libMath.la \ - $(top_builddir)/Lib/Debug/libDebug.la \ - $(top_builddir)/Lib/zlib/libz.la + $(top_builddir)/Lib/Math/libMath.a \ + $(top_builddir)/Lib/Debug/libDebug.a \ + $(top_builddir)/Lib/zlib/libz.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.6 1998/07/30 23:49:25 curt +# Removed libtool support. +# # Revision 1.5 1998/06/08 17:11:44 curt # Renamed *.[ch] to *.[ch]xx # diff --git a/SplitTris/Makefile.am b/SplitTris/Makefile.am index be4d06c8f..f43a3081f 100644 --- a/SplitTris/Makefile.am +++ b/SplitTris/Makefile.am @@ -29,16 +29,19 @@ bin_PROGRAMS = splittris splittris_SOURCES = splittris.cxx splittris.hxx splittris_LDADD = \ - $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/Math/libMath.la \ - $(top_builddir)/Lib/Debug/libDebug.la \ - $(top_builddir)/Lib/zlib/libz.la + $(top_builddir)/Lib/Bucket/libBucket.a \ + $(top_builddir)/Lib/Math/libMath.a \ + $(top_builddir)/Lib/Debug/libDebug.a \ + $(top_builddir)/Lib/zlib/libz.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.6 1998/07/30 23:49:26 curt +# Removed libtool support. +# # Revision 1.5 1998/07/08 14:49:13 curt # tweaks. # diff --git a/Tri2obj/Makefile.am b/Tri2obj/Makefile.am index e0ea71e5b..6c57a638d 100644 --- a/Tri2obj/Makefile.am +++ b/Tri2obj/Makefile.am @@ -29,16 +29,19 @@ bin_PROGRAMS = tri2obj tri2obj_SOURCES = tri2obj.cxx tri2obj.hxx tri2obj_LDADD = \ - $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/Math/libMath.la \ - $(top_builddir)/Lib/Debug/libDebug.la \ - $(top_builddir)/Lib/zlib/libz.la + $(top_builddir)/Lib/Bucket/libBucket.a \ + $(top_builddir)/Lib/Math/libMath.a \ + $(top_builddir)/Lib/Debug/libDebug.a \ + $(top_builddir)/Lib/zlib/libz.a INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.6 1998/07/30 23:49:26 curt +# Removed libtool support. +# # Revision 1.5 1998/07/08 14:49:14 curt # tweaks. #