aboutsummaryrefslogtreecommitdiffstats
path: root/zlib/Makefile.am
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--zlib/Makefile.am11
-rw-r--r--zlib/Makefile.am~29
2 files changed, 6 insertions, 34 deletions
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index 2f2f65a29..91610af4d 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -5,7 +5,7 @@
CFLAGS = -O -Wall
-EXTRA_DIST = README algorithm.doc ChangeLog example.c
+EXTRA_DIST = README algorithm.doc ChangeLog
# I found no other easy way to use this only if zlib is neede
# doing this with SUBDIR = @xxx@ in the top Makefile.am does not
@@ -15,15 +15,16 @@ noinst_LIBRARIES = libzlib.a
endif
-libzlib_a_SOURCES = adler32.c compress.c crc32.c gzio.c \
+libzlib_a_SOURCES = adler32.c compress.c crc32.c \
uncompr.c deflate.c trees.c zutil.c \
inflate.c infblock.c inftrees.c \
infcodes.c infutil.c inffast.c \
- zlib.h zconf.h deflate.h infblock.h \
- infcodes.h inffast.h inftrees.h infutil.h zutil.h
+ deflate.h infblock.h infcodes.h inffast.h \
+ inffixed.h inftrees.h infutil.h trees.h \
+ zconf.h zlib.h zutil.h
-CLEANFILES = example foo.gz
+CLEANFILES = foo.gz
diff --git a/zlib/Makefile.am~ b/zlib/Makefile.am~
deleted file mode 100644
index 71103692f..000000000
--- a/zlib/Makefile.am~
+++ /dev/null
@@ -1,29 +0,0 @@
-# Process this file with automake to produce Makefile.in
-# Copyright (C) 1995-1996 Jean-loup Gailly.
-# For conditions of distribution and use, see copyright notice in zlib.h
-# This is used if a systems lacks support of zlib
-
-CFLAGS = -O -Wall
-
-EXTRA_DIST = README algorithm.doc ChangeLog gzio.c example.c
-
-# I found no other easy way to use this only if zlib is neede
-# doing this with SUBDIR = @xxx@ in the top Makefile.am does not
-# work because automake doesn't scan this Makefile.am here.
-if ENABLE_LOCAL_ZLIB
-noinst_LIBRARIES = libzlib.a
-endif
-
-
-libzlib_a_SOURCES = adler32.c compress.c crc32.c \
- uncompr.c deflate.c trees.c zutil.c \
- inflate.c infblock.c inftrees.c \
- infcodes.c infutil.c inffast.c \
- zlib.h zconf.h deflate.h infblock.h \
- infcodes.h inffast.h inftrees.h infutil.h zutil.h
-
-
-CLEANFILES = example foo.gz
-
-
-