Removed zlib support.

diff --git a/Bucket/Makefile.am b/Bucket/Makefile.am
index 6fcc2c021738638ac5ee405fcfa0ebbd043514a1..089ddc8a204023ae6fae77a9f2682b16ce9607de 100644 (file)
--- 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 03658bcbcc83a3be4b7c4809dc459ffd7766480d..ab447e4cd0f7b93dd2a02d7241bf0804c0606493 100644 (file)
--- 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 a0fc42f09ca9b6e5a001c2637af0af2e0f9498ed..dc84c65d275f176d944380f2eb19e351394bd98d 100644 (file)
--- 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 98f36e44813229d92d3077750c3dabdad6a1ffbc..fa756e0721dceca4f26efa19b6acb45e37034610 100644 (file)
--- 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 1364097bd1b321ab4aa70f1501349a266d0a6006..38aa0db882f51432d4b28b4da7efa7e20f2a5d53 100644 (file)
--- 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 29277c06895fd7765ac8c6d19ddb431d5a8df0b5..0c93862fcc2d3b5c2b452eab21e3018091c2f170 100644 (file)
--- 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 +=