aboutsummaryrefslogtreecommitdiffstats
path: root/zlib
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>1998-09-29 16:15:15 +0000
committerWerner Koch <[email protected]>1998-09-29 16:15:15 +0000
commit9a854f1010d6311576b823b6638997f9778b4327 (patch)
treea2f20737cfaa86e6faaeebfef81892e7c56bfa63 /zlib
parent*** empty log message *** (diff)
downloadgnupg-9a854f1010d6311576b823b6638997f9778b4327.tar.gz
gnupg-9a854f1010d6311576b823b6638997f9778b4327.zip
*** empty log message ***
Diffstat (limited to 'zlib')
-rw-r--r--zlib/Makefile20
1 files changed, 10 insertions, 10 deletions
diff --git a/zlib/Makefile b/zlib/Makefile
index 7b77552a3..0d5d12d55 100644
--- a/zlib/Makefile
+++ b/zlib/Makefile
@@ -1,5 +1,5 @@
# Generated automatically from Makefile.in by configure.
-# Makefile.in generated automatically by automake 1.2f from Makefile.am
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
# This Makefile.in is free software; the Free Software Foundation
@@ -37,6 +37,8 @@ mandir = ${prefix}/man
includedir = ${prefix}/include
oldincludedir = /usr/include
+DISTDIR =
+
pkgdatadir = $(datadir)/gnupg
pkglibdir = $(libdir)/gnupg
pkgincludedir = $(includedir)/gnupg
@@ -93,7 +95,7 @@ RANLIB = ranlib
USE_INCLUDED_LIBINTL = no
USE_NLS = no
VERSION = 0.4.0a
-ZLIBS =
+ZLIBS = ../zlib/libzlib.a
l =
CFLAGS = -O -Wall
@@ -103,7 +105,7 @@ EXTRA_DIST = README algorithm.doc ChangeLog 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.
-#noinst_LIBRARIES = libzlib.a
+noinst_LIBRARIES = libzlib.a
libzlib_a_SOURCES = adler32.c compress.c crc32.c gzio.c \
uncompr.c deflate.c trees.c zutil.c \
@@ -122,7 +124,7 @@ LIBRARIES = $(noinst_LIBRARIES)
DEFS = -DHAVE_CONFIG_H -I. -I$(srcdir) -I..
CPPFLAGS =
LDFLAGS =
-LIBS = -ldl -lz
+LIBS = -ldl
libzlib_a_LIBADD =
libzlib_a_OBJECTS = adler32.o compress.o crc32.o gzio.o uncompr.o \
deflate.o trees.o zutil.o inflate.o infblock.o inftrees.o infcodes.o \
@@ -144,14 +146,14 @@ DEP_FILES = .deps/adler32.P .deps/compress.P .deps/crc32.P \
SOURCES = $(libzlib_a_SOURCES)
OBJECTS = $(libzlib_a_OBJECTS)
-default: all
+all: Makefile $(LIBRARIES)
.SUFFIXES:
.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOMAKE) --gnu zlib/Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES)
cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
@@ -267,8 +269,6 @@ install: install-exec install-data all
uninstall:
-all: Makefile $(LIBRARIES)
-
install-strip:
$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
installdirs:
@@ -305,7 +305,7 @@ maintainer-clean: maintainer-clean-noinstLIBRARIES \
@echo "This command is intended for maintainers to use;"
@echo "it deletes files that may require special tools to rebuild."
-.PHONY: default mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+.PHONY: mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
mostlyclean-compile distclean-compile clean-compile \
maintainer-clean-compile tags mostlyclean-tags distclean-tags \