From: Robert Collins Date: Mon, 29 Apr 2002 10:39:30 +0000 (+0000) Subject: 2002-04-29 Robert Collins X-Git-Tag: Z-setup-200205_merge_HEAD~5 X-Git-Url: https://cygwin.com/git/?a=commitdiff_plain;h=776a9a9ee9caf12274d4172a5053bcc6bbc81266;p=cygwin-apps%2Fsetup.git 2002-04-29 Robert Collins * Makefile.in: Regenerate. * Makefile.am: Remove the cygnus option. --- diff --git a/zlib/ChangeLog b/zlib/ChangeLog index 8ac1c9ba..f00ea5e0 100644 --- a/zlib/ChangeLog +++ b/zlib/ChangeLog @@ -1,3 +1,8 @@ +2002-04-29 Robert Collins + + * Makefile.in: Regenerate. + * Makefile.am: Remove the cygnus option. + 2002-04-26 Robert Collins * Makefile.in: Regenerate diff --git a/zlib/Makefile.am b/zlib/Makefile.am index b056dd1b..06012e3c 100644 --- a/zlib/Makefile.am +++ b/zlib/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in. -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = libzcygw_a_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \ gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \ diff --git a/zlib/Makefile.in b/zlib/Makefile.in index 293da8ff..52be4ac7 100644 --- a/zlib/Makefile.in +++ b/zlib/Makefile.in @@ -84,7 +84,7 @@ am__quote = @am__quote@ install_sh = @install_sh@ target_all = @target_all@ -AUTOMAKE_OPTIONS = cygnus +AUTOMAKE_OPTIONS = libzcygw_a_SOURCES = adler32.c compress.c crc32.c deflate.c deflate.h \ gzio.c infblock.c infblock.h infcodes.c infcodes.h inffast.c inffast.h \ @@ -118,14 +118,26 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ LIBS = @LIBS@ -depcomp = -am__depfiles_maybe = +depcomp = $(SHELL) $(top_srcdir)/../cfgaux/depcomp +am__depfiles_maybe = depfiles +@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/adler32.Po ./$(DEPDIR)/compress.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/crc32.Po ./$(DEPDIR)/deflate.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/gzio.Po ./$(DEPDIR)/infblock.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/infcodes.Po ./$(DEPDIR)/inffast.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/inflate.Po ./$(DEPDIR)/inftrees.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/infutil.Po ./$(DEPDIR)/trees.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/uncompr.Po ./$(DEPDIR)/zutil.Po COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) CCLD = $(CC) LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CFLAGS = @CFLAGS@ DIST_SOURCES = $(libzcygw_a_SOURCES) +DIST_COMMON = README ../cfgaux/compile ../cfgaux/config.guess \ + ../cfgaux/config.sub ../cfgaux/depcomp ../cfgaux/install-sh \ + ../cfgaux/ltmain.sh ../cfgaux/missing ../cfgaux/mkinstalldirs \ + ChangeLog Makefile.am Makefile.in aclocal.m4 configure \ + configure.in SOURCES = $(libzcygw_a_SOURCES) all: all-am @@ -134,7 +146,7 @@ all: all-am .SUFFIXES: .c .o .obj $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ - $(AUTOMAKE) --cygnus Makefile + $(AUTOMAKE) --foreign Makefile Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe) @@ -159,11 +171,36 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/adler32.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/crc32.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/deflate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/gzio.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infblock.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infcodes.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inffast.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inflate.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/inftrees.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/infutil.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/trees.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/uncompr.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zutil.Po@am__quote@ + +distclean-depend: + -rm -rf ./$(DEPDIR) + .c.o: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$< .c.obj: +@AMDEP_TRUE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@ depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@ +@AMDEP_TRUE@ $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ $(COMPILE) -c `cygpath -w $<` +CCDEPMODE = @CCDEPMODE@ uninstall-info-am: ETAGS = etags @@ -201,7 +238,94 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH -check-am: +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) + +top_distdir = . +distdir = $(PACKAGE)-$(VERSION) + +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } + +GZIP_ENV = --best +distcleancheck_listfiles = find . -type f -print + +distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) + $(mkinstalldirs) $(distdir)/../cfgaux + @for file in $(DISTFILES); do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ + if test -d $$d/$$file; then \ + cp -pR $$d/$$file $(distdir)$$dir \ + || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +dist dist-all: distdir + $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + $(am__remove_distdir) + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf - + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/=build + mkdir $(distdir)/=inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \ + && cd $(distdir)/=build \ + && ../configure --srcdir=.. --prefix=$$dc_install_base \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + find $$dc_install_base -type f -print ; \ + exit 1; } >&2 ) \ + && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \ + && rm -f $(distdir).tar.gz \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @echo "$(distdir).tar.gz is ready for distribution" | \ + sed 'h;s/./=/g;p;x;p;x' +distcleancheck: distclean + if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am check: check-am all-am: Makefile $(LIBRARIES) @@ -237,8 +361,8 @@ clean-am: clean-generic clean-noinstLIBRARIES mostlyclean-am distclean: distclean-am -rm -f config.status config.cache config.log -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags +distclean-am: clean-am distclean-compile distclean-depend \ + distclean-generic distclean-tags dvi: dvi-am @@ -252,7 +376,7 @@ install-data-am: install-data-local install-exec-am: install-exec-local -install-info: +install-info: install-info-am install-man: @@ -266,11 +390,12 @@ mostlyclean: mostlyclean-am mostlyclean-am: mostlyclean-compile mostlyclean-generic -uninstall-am: +uninstall-am: uninstall-info-am .PHONY: GTAGS all all-am check check-am clean clean-generic \ - clean-noinstLIBRARIES distclean distclean-compile \ - distclean-generic distclean-tags dvi dvi-am info info-am \ + clean-noinstLIBRARIES dist dist-all dist-gzip distcheck \ + distclean distclean-compile distclean-depend distclean-generic \ + distclean-tags distcleancheck distdir dvi dvi-am info info-am \ install install-am install-data install-data-am \ install-data-local install-exec install-exec-am \ install-exec-local install-info install-info-am install-man \