From 305589cd012055e23d94426903a9f7a379d72a65 Mon Sep 17 00:00:00 2001 From: curt Date: Thu, 30 Jul 1998 23:42:14 +0000 Subject: [PATCH] Removed zlib support. --- Bucket/Makefile.am | 6 ++---- Debug/Makefile.am | 6 ++---- Math/Makefile.am | 5 ++--- PUI/Makefile.am | 6 ++---- XGL/Makefile.am | 6 ++---- zlib/Makefile.am | 12 ++---------- 6 files changed, 12 insertions(+), 29 deletions(-) diff --git a/Bucket/Makefile.am b/Bucket/Makefile.am index 6fcc2c02..089ddc8a 100644 --- a/Bucket/Makefile.am +++ b/Bucket/Makefile.am @@ -1,7 +1,5 @@ -libdir = ${exec_prefix}/lib +noinst_LIBRARIES = libBucket.a -lib_LTLIBRARIES = libBucket.la - -libBucket_la_SOURCES = bucketutils.c bucketutils.h +libBucket_a_SOURCES = bucketutils.c bucketutils.h INCLUDES += -I$(top_builddir) diff --git a/Debug/Makefile.am b/Debug/Makefile.am index 03658bcb..ab447e4c 100644 --- a/Debug/Makefile.am +++ b/Debug/Makefile.am @@ -1,7 +1,5 @@ -libdir = ${exec_prefix}/lib +noinst_LIBRARIES = libDebug.a -lib_LTLIBRARIES = libDebug.la - -libDebug_la_SOURCES = fg_debug.c fg_debug.h +libDebug_a_SOURCES = fg_debug.c fg_debug.h INCLUDES += -I$(top_builddir) diff --git a/Math/Makefile.am b/Math/Makefile.am index a0fc42f0..dc84c65d 100644 --- a/Math/Makefile.am +++ b/Math/Makefile.am @@ -1,7 +1,6 @@ -libdir = ${exec_prefix}/lib +noinst_LIBRARIES = libMath.a -lib_LTLIBRARIES = libMath.la -libMath_la_SOURCES = \ +libMath_a_SOURCES = \ MAT3geom.c \ MAT3inv.c \ MAT3mat.c \ diff --git a/PUI/Makefile.am b/PUI/Makefile.am index 98f36e44..fa756e07 100644 --- a/PUI/Makefile.am +++ b/PUI/Makefile.am @@ -1,8 +1,6 @@ -libdir = ${exec_prefix}/lib +noinst_LIBRARIES = libPUI.a -lib_LTLIBRARIES = libPUI.la - -libPUI_la_SOURCES = \ +libPUI_a_SOURCES = \ pu.h puLocal.h \ complex.cxx \ pu.cxx \ diff --git a/XGL/Makefile.am b/XGL/Makefile.am index 1364097b..38aa0db8 100644 --- a/XGL/Makefile.am +++ b/XGL/Makefile.am @@ -1,7 +1,5 @@ -libdir = ${exec_prefix}/lib +lib_LIBRARIES = libXGL.a -lib_LTLIBRARIES = libXGL.la - -libXGL_la_SOURCES = xgl.c xgl.h xglUtils.c +libXGL_a_SOURCES = xgl.c xgl.h xglUtils.c INCLUDES += -I$(top_builddir) -I$(top_builddir)/Simulator diff --git a/zlib/Makefile.am b/zlib/Makefile.am index 29277c06..0c93862f 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -1,11 +1,9 @@ -libdir = ${exec_prefix}/lib - EXTRA_DIST = ChangeLog INDEX Make_vms.com Makefile.riscos README \ algorithm.txt descrip.mms example.c maketree.c minigzip.c zlib.3 -lib_LTLIBRARIES = libz.la +lib_LIBRARIES = libz.a -libz_la_SOURCES = \ +libz_a_SOURCES = \ adler32.c \ compress.c \ crc32.c \ @@ -31,9 +29,3 @@ libz_la_SOURCES = \ zlib.h \ zutil.c \ zutil.h - -# example.c -# maketree.c -# minigzip.c - -INCLUDES += -- 2.39.5