1
0
Fork 0

Added zlib support in placed and other misc. tweaks.

This commit is contained in:
curt 1998-04-18 04:02:48 +00:00
parent db45671ad3
commit efcd77da4a
4 changed files with 17 additions and 56 deletions

View file

@ -344,7 +344,10 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $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. # Code reorganizations. Added a Lib/ directory for more general libraries.
# #
# Revision 1.1 1998/04/08 22:54:57 curt # Revision 1.1 1998/04/08 22:54:57 curt

View file

@ -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.
#

View file

@ -33,7 +33,8 @@ fixnode_SOURCES = \
fixnode_LDADD = \ fixnode_LDADD = \
$(top_builddir)/Lib/DEM/libDEM.la \ $(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 INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib
@ -45,6 +46,9 @@ CXXFLAGS = -g
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------
# $Log$ # $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 # Revision 1.2 1998/04/14 02:26:02 curt
# Code reorganizations. Added a Lib/ directory for more general libraries. # Code reorganizations. Added a Lib/ directory for more general libraries.
# #

View file

@ -105,7 +105,8 @@ fixnode_SOURCES = \
fixnode_LDADD = \ fixnode_LDADD = \
$(top_builddir)/Lib/DEM/libDEM.la \ $(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 # 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 # 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@ X_PRE_LIBS = @X_PRE_LIBS@
fixnode_OBJECTS = fixnode.o main.o triload.o fixnode_OBJECTS = fixnode.o main.o triload.o
fixnode_DEPENDENCIES = $(top_builddir)/Lib/DEM/libDEM.la \ 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 = fixnode_LDFLAGS =
CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS) CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CXXFLAGS)
LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(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$ # $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. # Code reorganizations. Added a Lib/ directory for more general libraries.
# #
# Revision 1.1 1998/04/08 23:05:54 curt # Revision 1.1 1998/04/08 23:05:54 curt