Check for __CYGWIN__ (b20) as well as __CYGWIN32__ (pre b20 compilers)

[simgear.git] / zlib / Makefile.am

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 +=