From fe33bf171ee771b320b0db883d126fddf04ffe91 Mon Sep 17 00:00:00 2001 From: curt Date: Fri, 24 Apr 1998 00:43:59 +0000 Subject: [PATCH] Added zlib support. --- AssemTris/Makefile.in | 4 ++-- DemRaw2ascii/Makefile.am | 5 ++++- DemRaw2ascii/Makefile.in | 7 +++++-- FixNode/Makefile.in | 3 +++ FixObj/Makefile.am | 8 +++++++- FixObj/Makefile.in | 11 +++++++++-- SplitTris/Makefile.am | 7 ++++++- SplitTris/Makefile.in | 10 ++++++++-- Tri2obj/Makefile.am | 7 ++++++- Tri2obj/Makefile.in | 10 ++++++++-- 10 files changed, 58 insertions(+), 14 deletions(-) diff --git a/AssemTris/Makefile.in b/AssemTris/Makefile.in index 62a291872..c227dfc9a 100644 --- a/AssemTris/Makefile.in +++ b/AssemTris/Makefile.in @@ -344,8 +344,8 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ -# Revision 1.3 1998/04/18 04:02:48 curt -# Added zlib support in placed and other misc. tweaks. +# Revision 1.4 1998/04/24 00:43:59 curt +# Added zlib support. # # Revision 1.2 1998/04/14 02:25:59 curt # Code reorganizations. Added a Lib/ directory for more general libraries. diff --git a/DemRaw2ascii/Makefile.am b/DemRaw2ascii/Makefile.am index ab05c9034..2ff4fb31e 100644 --- a/DemRaw2ascii/Makefile.am +++ b/DemRaw2ascii/Makefile.am @@ -26,7 +26,7 @@ bin_PROGRAMS = raw2ascii -raw2ascii_SOURCES = main.c rawdem.c +raw2ascii_SOURCES = main.c rawdem.c rawdem.h raw2ascii_LDADD = @@ -35,6 +35,9 @@ INCLUDES += #--------------------------------------------------------------------------- # $Log$ +# Revision 1.2 1998/04/24 00:44:04 curt +# Added zlib support. +# # Revision 1.1 1998/04/18 03:59:44 curt # Incorporated into gnu automake/autoconf system. # diff --git a/DemRaw2ascii/Makefile.in b/DemRaw2ascii/Makefile.in index 3e72c38fc..dbfe637ee 100644 --- a/DemRaw2ascii/Makefile.in +++ b/DemRaw2ascii/Makefile.in @@ -98,7 +98,7 @@ VERSION = @VERSION@ bin_PROGRAMS = raw2ascii -raw2ascii_SOURCES = main.c rawdem.c +raw2ascii_SOURCES = main.c rawdem.c rawdem.h raw2ascii_LDADD = mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -343,7 +343,10 @@ INCLUDES += #--------------------------------------------------------------------------- # $Log$ -# Revision 1.1 1998/04/18 03:59:45 curt +# Revision 1.2 1998/04/24 00:44:04 curt +# Added zlib support. +# +# Revision 1.1 1998/04/18 03:59:44 curt # Incorporated into gnu automake/autoconf system. # diff --git a/FixNode/Makefile.in b/FixNode/Makefile.in index f10ec5740..a9ccdeaeb 100644 --- a/FixNode/Makefile.in +++ b/FixNode/Makefile.in @@ -371,6 +371,9 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:04 curt +# Added zlib 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 e041122ea..2ee3159b4 100644 --- a/FixObj/Makefile.am +++ b/FixObj/Makefile.am @@ -28,13 +28,19 @@ bin_PROGRAMS = fixobj fixobj_SOURCES = main.c obj.c obj.h -fixobj_LDADD = $(top_builddir)/Lib/Math/libMath.la +fixobj_LDADD = \ + $(top_builddir)/Lib/Math/libMath.la \ + $(top_builddir)/Lib/Debug/libDebug.la \ + $(top_builddir)/Lib/zlib/libz.la INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:05 curt +# Added zlib support. +# # Revision 1.3 1998/04/18 04:01:02 curt # Now use libMath rather than having local copies of math routines. # diff --git a/FixObj/Makefile.in b/FixObj/Makefile.in index de2c960d3..02a640867 100644 --- a/FixObj/Makefile.in +++ b/FixObj/Makefile.in @@ -100,7 +100,10 @@ bin_PROGRAMS = fixobj fixobj_SOURCES = main.c obj.c obj.h -fixobj_LDADD = $(top_builddir)/Lib/Math/libMath.la +fixobj_LDADD = \ + $(top_builddir)/Lib/Math/libMath.la \ + $(top_builddir)/Lib/Debug/libDebug.la \ + $(top_builddir)/Lib/zlib/libz.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = @@ -116,7 +119,8 @@ X_LIBS = @X_LIBS@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ fixobj_OBJECTS = main.o obj.o -fixobj_DEPENDENCIES = $(top_builddir)/Lib/Math/libMath.la +fixobj_DEPENDENCIES = $(top_builddir)/Lib/Math/libMath.la \ +$(top_builddir)/Lib/Debug/libDebug.la $(top_builddir)/Lib/zlib/libz.la fixobj_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -343,6 +347,9 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:05 curt +# Added zlib support. +# # Revision 1.3 1998/04/18 04:01:02 curt # Now use libMath rather than having local copies of math routines. # diff --git a/SplitTris/Makefile.am b/SplitTris/Makefile.am index d17e02df2..e928787d7 100644 --- a/SplitTris/Makefile.am +++ b/SplitTris/Makefile.am @@ -30,13 +30,18 @@ splittris_SOURCES = splittris.c splittris.h splittris_LDADD = \ $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/Math/libMath.la + $(top_builddir)/Lib/Math/libMath.la \ + $(top_builddir)/Lib/Debug/libDebug.la \ + $(top_builddir)/Lib/zlib/libz.la INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:06 curt +# Added zlib support. +# # Revision 1.3 1998/04/18 04:01:17 curt # Now use libMath rather than having local copies of math routines. # diff --git a/SplitTris/Makefile.in b/SplitTris/Makefile.in index 1282f517e..5ab5c561f 100644 --- a/SplitTris/Makefile.in +++ b/SplitTris/Makefile.in @@ -102,7 +102,9 @@ splittris_SOURCES = splittris.c splittris.h splittris_LDADD = \ $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/Math/libMath.la + $(top_builddir)/Lib/Math/libMath.la \ + $(top_builddir)/Lib/Debug/libDebug.la \ + $(top_builddir)/Lib/zlib/libz.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = @@ -119,7 +121,8 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ splittris_OBJECTS = splittris.o splittris_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la \ -$(top_builddir)/Lib/Math/libMath.la +$(top_builddir)/Lib/Math/libMath.la \ +$(top_builddir)/Lib/Debug/libDebug.la $(top_builddir)/Lib/zlib/libz.la splittris_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -346,6 +349,9 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:06 curt +# Added zlib support. +# # Revision 1.3 1998/04/18 04:01:17 curt # Now use libMath rather than having local copies of math routines. # diff --git a/Tri2obj/Makefile.am b/Tri2obj/Makefile.am index 0bf71d497..86b10ba82 100644 --- a/Tri2obj/Makefile.am +++ b/Tri2obj/Makefile.am @@ -30,13 +30,18 @@ tri2obj_SOURCES = tri2obj.c tri2obj.h tri2obj_LDADD = \ $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/Math/libMath.la + $(top_builddir)/Lib/Math/libMath.la \ + $(top_builddir)/Lib/Debug/libDebug.la \ + $(top_builddir)/Lib/zlib/libz.la INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:07 curt +# Added zlib support. +# # Revision 1.3 1998/04/18 04:01:29 curt # Now use libMath rather than having local copies of math routines. # diff --git a/Tri2obj/Makefile.in b/Tri2obj/Makefile.in index 9a947ad24..4dd02536c 100644 --- a/Tri2obj/Makefile.in +++ b/Tri2obj/Makefile.in @@ -102,7 +102,9 @@ tri2obj_SOURCES = tri2obj.c tri2obj.h tri2obj_LDADD = \ $(top_builddir)/Lib/Bucket/libBucket.la \ - $(top_builddir)/Lib/Math/libMath.la + $(top_builddir)/Lib/Math/libMath.la \ + $(top_builddir)/Lib/Debug/libDebug.la \ + $(top_builddir)/Lib/zlib/libz.la mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../Include/config.h CONFIG_CLEAN_FILES = @@ -119,7 +121,8 @@ X_EXTRA_LIBS = @X_EXTRA_LIBS@ X_PRE_LIBS = @X_PRE_LIBS@ tri2obj_OBJECTS = tri2obj.o tri2obj_DEPENDENCIES = $(top_builddir)/Lib/Bucket/libBucket.la \ -$(top_builddir)/Lib/Math/libMath.la +$(top_builddir)/Lib/Math/libMath.la \ +$(top_builddir)/Lib/Debug/libDebug.la $(top_builddir)/Lib/zlib/libz.la tri2obj_LDFLAGS = CFLAGS = @CFLAGS@ COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) @@ -346,6 +349,9 @@ INCLUDES += -I$(top_builddir) -I$(top_builddir)/Lib #--------------------------------------------------------------------------- # $Log$ +# Revision 1.4 1998/04/24 00:44:07 curt +# Added zlib support. +# # Revision 1.3 1998/04/18 04:01:29 curt # Now use libMath rather than having local copies of math routines. # -- 2.39.2