Added zlib support in placed and other misc. tweaks.

diff --git a/AssemTris/Makefile.in b/AssemTris/Makefile.in
index f40608c87c2957d177b26b5ce21cda13ccc1f476..62a291872f8074d219bfb9ae7d25e151e6ae86e0 100644 (file)
--- a/AssemTris/Makefile.in
+++ b/AssemTris/Makefile.in
@@ -344,7 +344,10 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.2  1998/04/14 02:26:00  curt
+# Revision 1.3  1998/04/18 04:02:48  curt
+# Added zlib support in placed and other misc. tweaks.
+#
+# Revision 1.2  1998/04/14 02:25:59  curt
 # Code reorganizations.  Added a Lib/ directory for more general libraries.
 #
 # Revision 1.1  1998/04/08 22:54:57  curt

diff --git a/DemRaw2ascii/Makefile b/DemRaw2ascii/Makefile
deleted file mode 100644 (file)
index 1a11a99..0000000
--- a/DemRaw2ascii/Makefile
+++ /dev/null
@@ -1,51 +0,0 @@
-#---------------------------------------------------------------------------
-# Makefile
-#
-# Written by Curtis Olson, started February 1998.
-#
-# Copyright (C) 1998  Curtis L. Olson  - curt@me.umn.edu
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-#
-# $Id$
-# (Log is kept at end of this file)
-#---------------------------------------------------------------------------
-
-
-TARGET = raw2ascii
-
-CFILES = main.c rawdem.c
-LDLIBS = -lm
-
-
-include $(FG_ROOT_SRC)/commondefs
-
-
-#---------------------------------------------------------------------------
-# Rule for TARGET
-#---------------------------------------------------------------------------
-
-$(TARGET): $(OBJECTS)
-       $(CC) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(LDLIBS)
-
-
-include $(COMMONRULES)
-
-
-#---------------------------------------------------------------------------
-# $Log$
-# Revision 1.1  1998/03/02 23:31:00  curt
-# Initial revision.
-#

diff --git a/FixNode/Makefile.am b/FixNode/Makefile.am
index fa6b8ef2da3e99c3484477b3b0bbfe010c99f546..04d7e2094b189b7418478c1d42d8e49b59a56ec7 100644 (file)
--- a/FixNode/Makefile.am
+++ b/FixNode/Makefile.am
@@ -33,7 +33,8 @@ fixnode_SOURCES = \
 
 fixnode_LDADD = \
        $(top_builddir)/Lib/DEM/libDEM.la \
-        $(top_builddir)/Lib/Bucket/libBucket.la
+        $(top_builddir)/Lib/Bucket/libBucket.la \
+        $(top_builddir)/Lib/zlib/libz.la
 
 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
@@ -45,6 +46,9 @@ CXXFLAGS = -g
 
 #---------------------------------------------------------------------------
 # $Log$
+# Revision 1.3  1998/04/18 04:02:54  curt
+# Added zlib support in placed and other misc. tweaks.
+#
 # Revision 1.2  1998/04/14 02:26:02  curt
 # Code reorganizations.  Added a Lib/ directory for more general libraries.
 #

diff --git a/FixNode/Makefile.in b/FixNode/Makefile.in
index 828ad939a4848a5c3e545cfdec109f40cd2e05ea..f10ec574006352a456f35729e1d670dfd770aee4 100644 (file)
--- a/FixNode/Makefile.in
+++ b/FixNode/Makefile.in
@@ -105,7 +105,8 @@ fixnode_SOURCES = \
 
 fixnode_LDADD = \
        $(top_builddir)/Lib/DEM/libDEM.la \
-        $(top_builddir)/Lib/Bucket/libBucket.la
+        $(top_builddir)/Lib/Bucket/libBucket.la \
+        $(top_builddir)/Lib/zlib/libz.la
 
 # 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
@@ -127,7 +128,8 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
 fixnode_OBJECTS =  fixnode.o main.o triload.o
 fixnode_DEPENDENCIES =  $(top_builddir)/Lib/DEM/libDEM.la \
-$(top_builddir)/Lib/Bucket/libBucket.la
+$(top_builddir)/Lib/Bucket/libBucket.la \
+$(top_builddir)/Lib/zlib/libz.la
 fixnode_LDFLAGS = 
 CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
 LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
@@ -369,7 +371,10 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
 
 #---------------------------------------------------------------------------
 # $Log$
-# Revision 1.2  1998/04/14 02:26:03  curt
+# Revision 1.3  1998/04/18 04:02:54  curt
+# Added zlib support in placed and other misc. tweaks.
+#
+# Revision 1.2  1998/04/14 02:26:02  curt
 # Code reorganizations.  Added a Lib/ directory for more general libraries.
 #
 # Revision 1.1  1998/04/08 23:05:54  curt