diff options
Diffstat (limited to '')
| -rw-r--r-- | Makefile.in | 150 |
1 files changed, 55 insertions, 95 deletions
diff --git a/Makefile.in b/Makefile.in index 2889d08..4b80f1d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -91,8 +91,8 @@ host_triplet = @host@ @COND_GNULIB_TRUE@am__append_1 = lib subdir = . ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_capsicum.m4 \ - $(top_srcdir)/m4/ax_pthread.m4 $(top_srcdir)/m4/getopt.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ + $(top_srcdir)/m4/build-to-host.m4 $(top_srcdir)/m4/getopt.m4 \ $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/host-cpu-c-abi.m4 \ $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ @@ -112,8 +112,7 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ $(am__configure_deps) $(am__dist_doc_DATA_DIST) \ - $(am__dist_examples_DATA_DIST) \ - $(am__dist_examplesold_DATA_DIST) $(am__DIST_COMMON) + $(am__dist_examples_DATA_DIST) $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(install_sh) -d @@ -147,9 +146,9 @@ am__can_run_installinfo = \ n|no|NO) false;; \ *) (install-info --version) >/dev/null 2>&1;; \ esac -am__dist_doc_DATA_DIST = AUTHORS COPYING COPYING.GPLv2 NEWS README \ - THANKS TODO doc/faq.txt doc/history.txt doc/xz-file-format.txt \ - doc/lzma-file-format.txt +am__dist_doc_DATA_DIST = AUTHORS COPYING COPYING.0BSD COPYING.GPLv2 \ + NEWS README THANKS doc/faq.txt doc/history.txt \ + doc/xz-file-format.txt doc/lzma-file-format.txt am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -177,15 +176,13 @@ am__uninstall_files_from_dir = { \ || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ $(am__cd) "$$dir" && rm -f $$files; }; \ } -am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" \ - "$(DESTDIR)$(examplesolddir)" +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" am__dist_examples_DATA_DIST = doc/examples/00_README.txt \ doc/examples/01_compress_easy.c doc/examples/02_decompress.c \ doc/examples/03_compress_custom.c \ - doc/examples/04_compress_easy_mt.c doc/examples/Makefile -am__dist_examplesold_DATA_DIST = doc/examples_old/xz_pipe_comp.c \ - doc/examples_old/xz_pipe_decomp.c -DATA = $(dist_doc_DATA) $(dist_examples_DATA) $(dist_examplesold_DATA) + doc/examples/04_compress_easy_mt.c doc/examples/11_file_info.c \ + doc/examples/Makefile +DATA = $(dist_doc_DATA) $(dist_examples_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive am__recursive_targets = \ @@ -277,7 +274,6 @@ AUTOCONF = @AUTOCONF@ AUTOHEADER = @AUTOHEADER@ AUTOMAKE = @AUTOMAKE@ AWK = @AWK@ -CAPSICUM_LIB = @CAPSICUM_LIB@ CC = @CC@ CCAS = @CCAS@ CCASDEPMODE = @CCASDEPMODE@ @@ -406,6 +402,8 @@ install_sh = @install_sh@ libdir = @libdir@ libexecdir = @libexecdir@ localedir = @localedir@ +localedir_c = @localedir_c@ +localedir_c_make = @localedir_c_make@ localstatedir = @localstatedir@ mandir = @mandir@ mkdir_p = @mkdir_p@ @@ -432,11 +430,11 @@ SUBDIRS = $(am__append_1) src po tests @COND_DOC_TRUE@dist_doc_DATA = \ @COND_DOC_TRUE@ AUTHORS \ @COND_DOC_TRUE@ COPYING \ +@COND_DOC_TRUE@ COPYING.0BSD \ @COND_DOC_TRUE@ COPYING.GPLv2 \ @COND_DOC_TRUE@ NEWS \ @COND_DOC_TRUE@ README \ @COND_DOC_TRUE@ THANKS \ -@COND_DOC_TRUE@ TODO \ @COND_DOC_TRUE@ doc/faq.txt \ @COND_DOC_TRUE@ doc/history.txt \ @COND_DOC_TRUE@ doc/xz-file-format.txt \ @@ -449,34 +447,32 @@ SUBDIRS = $(am__append_1) src po tests @COND_DOC_TRUE@ doc/examples/02_decompress.c \ @COND_DOC_TRUE@ doc/examples/03_compress_custom.c \ @COND_DOC_TRUE@ doc/examples/04_compress_easy_mt.c \ +@COND_DOC_TRUE@ doc/examples/11_file_info.c \ @COND_DOC_TRUE@ doc/examples/Makefile -@COND_DOC_TRUE@examplesolddir = $(docdir)/examples_old -@COND_DOC_TRUE@dist_examplesold_DATA = \ -@COND_DOC_TRUE@ doc/examples_old/xz_pipe_comp.c \ -@COND_DOC_TRUE@ doc/examples_old/xz_pipe_decomp.c - EXTRA_DIST = \ - po4a \ - extra \ + cmake \ dos \ doxygen \ + extra \ + po4a \ windows \ - macosx \ - cmake \ CMakeLists.txt \ - autogen.sh \ COPYING.GPLv2 \ COPYING.GPLv3 \ COPYING.LGPLv2.1 \ INSTALL.generic \ PACKAGERS \ + TODO \ + autogen.sh \ build-aux/manconv.sh \ - build-aux/version.sh + build-aux/version.sh \ + po/xz.pot-header ACLOCAL_AMFLAGS = -I m4 -# List of man pages to convert to PDF and plain text in the dist-hook target. +# List of man pages to convert to plain text in the dist-hook target +# or to PDF in the pdf-local target. manfiles = \ src/xz/xz.1 \ src/xzdec/xzdec.1 \ @@ -589,27 +585,6 @@ uninstall-dist_examplesDATA: @list='$(dist_examples_DATA)'; test -n "$(examplesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(examplesdir)'; $(am__uninstall_files_from_dir) -install-dist_examplesoldDATA: $(dist_examplesold_DATA) - @$(NORMAL_INSTALL) - @list='$(dist_examplesold_DATA)'; test -n "$(examplesolddir)" || list=; \ - if test -n "$$list"; then \ - echo " $(MKDIR_P) '$(DESTDIR)$(examplesolddir)'"; \ - $(MKDIR_P) "$(DESTDIR)$(examplesolddir)" || exit 1; \ - fi; \ - for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - echo "$$d$$p"; \ - done | $(am__base_list) | \ - while read files; do \ - echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(examplesolddir)'"; \ - $(INSTALL_DATA) $$files "$(DESTDIR)$(examplesolddir)" || exit $$?; \ - done - -uninstall-dist_examplesoldDATA: - @$(NORMAL_UNINSTALL) - @list='$(dist_examplesold_DATA)'; test -n "$(examplesolddir)" || list=; \ - files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - dir='$(DESTDIR)$(examplesolddir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -926,7 +901,7 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(examplesolddir)"; do \ + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -959,8 +934,6 @@ distclean-generic: maintainer-clean-generic: @echo "This command is intended for maintainers to use" @echo "it deletes files that may require special tools to rebuild." -@COND_DOC_FALSE@install-data-local: -@COND_DOC_FALSE@uninstall-local: clean: clean-recursive clean-am: clean-generic clean-libtool mostlyclean-am @@ -983,8 +956,7 @@ info: info-recursive info-am: -install-data-am: install-data-local install-dist_docDATA \ - install-dist_examplesDATA install-dist_examplesoldDATA +install-data-am: install-dist_docDATA install-dist_examplesDATA install-dvi: install-dvi-recursive @@ -1024,14 +996,13 @@ mostlyclean-am: mostlyclean-generic mostlyclean-libtool pdf: pdf-recursive -pdf-am: +pdf-am: pdf-local ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_docDATA uninstall-dist_examplesDATA \ - uninstall-dist_examplesoldDATA uninstall-local +uninstall-am: uninstall-dist_docDATA uninstall-dist_examplesDATA .MAKE: $(am__recursive_targets) all install-am install-strip @@ -1043,71 +1014,46 @@ uninstall-am: uninstall-dist_docDATA uninstall-dist_examplesDATA \ distclean-generic distclean-hdr distclean-libtool \ distclean-tags distcleancheck distdir distuninstallcheck dvi \ dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-local \ - install-dist_docDATA install-dist_examplesDATA \ - install-dist_examplesoldDATA install-dvi install-dvi-am \ + install-data install-data-am install-dist_docDATA \ + install-dist_examplesDATA install-dvi install-dvi-am \ install-exec install-exec-am install-html install-html-am \ install-info install-info-am install-man install-pdf \ install-pdf-am install-ps install-ps-am install-strip \ installcheck installcheck-am installdirs installdirs-am \ maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-am uninstall uninstall-am uninstall-dist_docDATA \ - uninstall-dist_examplesDATA uninstall-dist_examplesoldDATA \ - uninstall-local + mostlyclean-generic mostlyclean-libtool pdf pdf-am pdf-local \ + ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-dist_docDATA uninstall-dist_examplesDATA .PRECIOUS: Makefile -# Install the Doxygen generated documentation if they were built. -@COND_DOC_TRUE@install-data-local: -@COND_DOC_TRUE@ if test -d "$(srcdir)/doc/api" ; then \ -@COND_DOC_TRUE@ $(MKDIR_P) "$(DESTDIR)$(docdir)/api" && \ -@COND_DOC_TRUE@ $(INSTALL_DATA) "$(srcdir)"/doc/api/* \ -@COND_DOC_TRUE@ "$(DESTDIR)$(docdir)/api"; \ -@COND_DOC_TRUE@ fi - -# Remove the Doxygen generated documentation when uninstalling. -@COND_DOC_TRUE@uninstall-local: -@COND_DOC_TRUE@ rm -rf "$(DESTDIR)$(docdir)/api" - # Create ChangeLog from output of "git log --date=iso --stat". -# Convert the man pages to PDF and plain text (ASCII only) formats. +# Convert the man pages to plain text (ASCII only) format. dist-hook: if test -d "$(srcdir)/.git" && type git > /dev/null 2>&1; then \ ( cd "$(srcdir)" && git log --date=iso --stat \ - 6060f7dc76fd6c2a8a1f8e85d0e4d86bb78273e6^..HEAD ) \ + b69da6d4bb6bb11fc0cf066920791990d2b22a06^..HEAD ) \ > "$(distdir)/ChangeLog"; \ fi - if type groff > /dev/null 2>&1 && type ps2pdf > /dev/null 2>&1; then \ + if type groff > /dev/null 2>&1; then \ dest="$(distdir)/doc/man" && \ - $(MKDIR_P) "$$dest/pdf-a4" "$$dest/pdf-letter" "$$dest/txt" && \ + $(MKDIR_P) "$$dest/txt" && \ for FILE in $(manfiles); do \ BASE=`basename $$FILE .1` && \ - sh "$(srcdir)/build-aux/manconv.sh" pdf a4 \ - < "$(srcdir)/$$FILE" \ - > "$$dest/pdf-a4/$$BASE-a4.pdf" && \ - sh "$(srcdir)/build-aux/manconv.sh" pdf letter \ - < "$(srcdir)/$$FILE" \ - > "$$dest/pdf-letter/$$BASE-letter.pdf" && \ - sh "$(srcdir)/build-aux/manconv.sh" ascii \ + $(SHELL) "$(srcdir)/build-aux/manconv.sh" ascii \ < "$(srcdir)/$$FILE" \ > "$$dest/txt/$$BASE.txt"; \ done; \ fi - if test -d "$(srcdir)/doc/api" ; then \ - $(MKDIR_P) "$(distdir)/doc/api" && \ - $(INSTALL_DATA) "$(srcdir)"/doc/api/* \ - "$(distdir)/doc/api"; \ - fi # This works with GNU tar and gives cleaner package than normal 'make dist'. -# This also ensures that the man page translations are up to date (dist-hook +# This also ensures that the translations are up to date (dist-hook # would be too late for that). mydist: - sh "$(srcdir)/src/liblzma/validate_map.sh" - cd "$(srcdir)/po4a" && sh update-po - cd "$(srcdir)/doxygen" && sh update-doxygen + $(SHELL) "$(srcdir)/src/liblzma/validate_map.sh" + cd po && $(MAKE) xz.pot-update + cd "$(srcdir)/po4a" && $(SHELL) update-po VERSION=$(VERSION); \ if test -d "$(srcdir)/.git" && type git > /dev/null 2>&1; then \ SNAPSHOT=`cd "$(srcdir)" && git describe --abbrev=4 | cut -b2-`; \ @@ -1116,6 +1062,20 @@ mydist: TAR_OPTIONS='--owner=0 --group=0 --numeric-owner --mode=u+rw,go+r-w' \ $(MAKE) VERSION="$$VERSION" dist-gzip +# NOTE: This only creates the PDFs. The install rules are missing. +pdf-local: + dest="doc/man" && \ + $(MKDIR_P) "$$dest/pdf-a4" "$$dest/pdf-letter" && \ + for FILE in $(manfiles); do \ + BASE=`basename $$FILE .1` && \ + $(SHELL) "$(srcdir)/build-aux/manconv.sh" pdf a4 \ + < "$(srcdir)/$$FILE" \ + > "$$dest/pdf-a4/$$BASE-a4.pdf" && \ + $(SHELL) "$(srcdir)/build-aux/manconv.sh" pdf letter \ + < "$(srcdir)/$$FILE" \ + > "$$dest/pdf-letter/$$BASE-letter.pdf"; \ + done + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: |