diff options
| author | Karl Berry <karl@freefriends.org> | 2013-07-22 23:43:41 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2013-07-22 23:43:41 +0000 |
| commit | 554e64ea47473a9546624706ff8fc84a952fed66 (patch) | |
| tree | e4d7ec35e3b1d5b6d135735471fe177c2416bebb /Build | |
| parent | 730f0f077f73f09896b995953daad44d73895172 (diff) | |
xz 5.0.5
git-svn-id: svn://tug.org/texlive/trunk@31269 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build')
122 files changed, 13565 insertions, 8216 deletions
diff --git a/Build/source/extra/xz/ABOUT-NLS b/Build/source/extra/xz/ABOUT-NLS index ec20977e060..4f50fb5f0d4 100644 --- a/Build/source/extra/xz/ABOUT-NLS +++ b/Build/source/extra/xz/ABOUT-NLS @@ -101,8 +101,11 @@ codes, stating which languages are allowed. As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, -and `CC' is an ISO 3166 two-letter country code. For example, let's +`LL_CC' combination. If you happen to have the `LC_ALL' or some other +`LC_xxx' environment variables set, you should unset them before +setting `LANG', otherwise the setting of `LANG' will not have the +desired effect. Here `LL' is an ISO 639 two-letter language code, and +`CC' is an ISO 3166 two-letter country code. For example, let's suppose that you speak German and live in Germany. At the shell prompt, merely execute `setenv LANG de_DE' (in `csh'), `export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). @@ -153,8 +156,7 @@ people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. Each translation team has its own mailing list. The up-to-date list of teams can be found at the Free Translation Project's homepage, -`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" -area. +`http://translationproject.org/', in the "Teams" area. If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. @@ -168,8 +170,8 @@ message to `sv-request@li.org', having this message body: _actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to -get started, please write to `translation@iro.umontreal.ca' to reach the -coordinator for all translator teams. +get started, please write to `coordinator@translationproject.org' to +reach the coordinator for all translator teams. The English team is special. It works at improving and uniformizing the terminology in use. Proven linguistic skills are praised more than @@ -179,890 +181,1114 @@ programming skills, here. ====================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of October -2006. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2010. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files af am ar az be bg bs ca cs cy da de el en en_GB eo - +----------------------------------------------------+ - GNUnet | [] | - a2ps | [] [] [] [] [] | - aegis | () | - ant-phone | () | - anubis | [] | - ap-utils | | - aspell | [] [] [] [] [] | - bash | [] [] [] | - batchelor | [] | - bfd | | - bibshelf | [] | - binutils | [] | - bison | [] [] | - bison-runtime | | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | [] [] | - coreutils | [] [] [] | - cpio | | - cpplib | [] [] [] | - cryptonit | [] | - darkstat | [] () [] | - dialog | [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] () [] | - fileutils | [] [] | - findutils | [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | | - gawk | [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] [] [] | - gip | [] | - gliv | [] | - glunarclock | [] | - gmult | [] [] | - gnubiff | () | - gnucash | () () [] | - gnucash-glossary | [] () | - gnuedu | | - gnulib | [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] | - gpe-conf | [] [] | - gpe-contacts | | - gpe-edit | [] | - gpe-filemanager | | - gpe-go | [] | - gpe-login | [] [] | - gpe-ownerinfo | [] [] | - gpe-package | | - gpe-sketchbook | [] [] | - gpe-su | [] [] | - gpe-taskmanager | [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | | - gphoto2 | [] [] [] [] | - gprof | [] [] | - gpsdrive | () () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] | - gretl | | - gsasl | | - gss | | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] [] [] | - gst-plugins-good | [] [] [] [] [] [] [] | - gstreamer | [] [] [] [] [] [] [] | - gtick | () | - gtkam | [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] | - id-utils | [] [] | - impost | | - indent | [] [] [] | - iso_3166 | [] [] | - iso_3166_2 | | - iso_4217 | [] | - iso_639 | [] [] | - jpilot | [] | - jtag | | - jwhois | | - kbd | [] [] [] [] | - keytouch | | - keytouch-editor | | - keytouch-keyboa... | | - latrine | () | - ld | [] | - leafpad | [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] | - libgpg-error | [] | - libgphoto2 | [] [] | - libgphoto2_port | [] [] | - libgsasl | | - libiconv | [] [] | - libidn | [] [] | - lifelines | [] () | - lilypond | [] | - lingoteach | | - lynx | [] [] [] [] | - m4 | [] [] [] [] | - mailutils | [] | - make | [] [] | - man-db | [] () [] [] | - minicom | [] [] [] | - mysecretdiary | [] [] | - nano | [] [] [] | - nano_1_0 | [] () [] [] | - opcodes | [] | - parted | | - pilot-qof | [] | - psmisc | [] | - pwdutils | | - python | | - qof | | - radius | [] | - recode | [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] [] | - sed | [] [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] | - sharutils | [] [] [] [] [] [] | - shishi | | - silky | | - skencil | [] () | - sketch | [] () | - solfege | | - soundtracker | [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | () () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] [] [] | - wastesedge | () | - wdiff | [] [] [] [] | - wget | [] [] | - xchat | [] [] [] [] [] [] | - xkeyboard-config | | - xpad | [] [] | - +----------------------------------------------------+ - af am ar az be bg bs ca cs cy da de el en en_GB eo - 10 0 1 2 9 22 1 42 41 2 60 95 16 1 17 16 - - es et eu fa fi fr ga gl gu he hi hr hu id is it - +--------------------------------------------------+ - GNUnet | | - a2ps | [] [] [] () | - aegis | | - ant-phone | [] | - anubis | [] | - ap-utils | [] [] | - aspell | [] [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | [] | - bibshelf | [] [] [] | - binutils | [] [] [] | - bison | [] [] [] [] [] [] | - bison-runtime | [] [] [] [] [] | - bluez-pin | [] [] [] [] [] | - cflow | [] | - clisp | [] [] | - console-tools | | - coreutils | [] [] [] [] [] [] | - cpio | [] [] [] | - cpplib | [] [] | - cryptonit | [] | - darkstat | [] () [] [] [] | - dialog | [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] [] | - enscript | [] [] [] | - error | [] [] [] [] [] | - fetchmail | [] | - fileutils | [] [] [] [] [] [] | - findutils | [] [] [] [] | - flex | [] [] [] | - fslint | [] | - gas | [] [] | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] | - gettext-tools | [] [] [] | - gimp-print | [] [] | - gip | [] [] [] | - gliv | () | - glunarclock | [] [] [] | - gmult | [] [] [] | - gnubiff | () () | - gnucash | () () () | - gnucash-glossary | [] [] | - gnuedu | [] | - gnulib | [] [] [] [] [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] [] | - gpe-beam | [] [] | - gpe-calendar | | - gpe-clock | [] [] [] [] | - gpe-conf | [] | - gpe-contacts | [] [] | - gpe-edit | [] [] [] [] | - gpe-filemanager | [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] [] [] [] | - gpe-package | [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] [] | - gpe-taskmanager | [] [] [] | - gpe-timesheet | [] [] [] [] | - gpe-today | [] [] [] [] | - gpe-todo | [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] [] | - gpsdrive | () () [] () | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] [] [] [] [] | - gretl | [] [] [] | - gsasl | [] [] | - gss | [] | - gst-plugins | [] [] [] | - gst-plugins-base | [] [] | - gst-plugins-good | [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] [] [] | - gtkorphan | [] [] | - gtkspell | [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] [] | - impost | [] [] | - indent | [] [] [] [] [] [] [] [] [] [] | - iso_3166 | [] [] [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] [] | - jpilot | [] [] | - jtag | [] | - jwhois | [] [] [] [] [] | - kbd | [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] [] | - ld | [] [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] | - libgpewidget | [] [] [] [] [] | - libgpg-error | | - libgphoto2 | [] [] [] | - libgphoto2_port | [] [] | - libgsasl | [] [] | - libiconv | [] [] | - libidn | [] [] | - lifelines | () | - lilypond | [] | - lingoteach | [] [] [] | - lynx | [] [] [] | - m4 | [] [] [] [] | - mailutils | [] [] | - make | [] [] [] [] [] [] [] [] | - man-db | () | - minicom | [] [] [] [] | - mysecretdiary | [] [] [] | - nano | [] [] [] [] [] [] | - nano_1_0 | [] [] [] [] [] | - opcodes | [] [] [] [] | - parted | [] [] [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] [] | - rpm | [] [] | - screem | | - scrollkeeper | [] [] [] | - sed | [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] | - shared-mime-info | [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] [] [] | - shishi | | - silky | [] | - skencil | [] [] | - sketch | [] [] | - solfege | [] | - soundtracker | [] [] [] | - sp | [] | - stardict | [] | - system-tools-ba... | [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] [] [] | - texinfo | [] [] | - textutils | [] [] [] [] [] | - tin | [] () | - tp-robot | [] [] [] [] | - tuxpaint | [] [] | - unicode-han-tra... | | - unicode-transla... | [] [] | - util-linux | [] [] [] [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | () | - wdiff | [] [] [] [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - xchat | [] [] [] [] [] [] [] [] | - xkeyboard-config | [] [] [] [] | - xpad | [] [] [] | - +--------------------------------------------------+ - es et eu fa fi fr ga gl gu he hi hr hu id is it - 88 22 14 2 40 115 61 14 1 8 1 6 59 31 0 52 + Ready PO files af am ar as ast az be be@latin bg bn_IN bs ca crh + +---------------------------------------------------+ + a2ps | [] [] | + aegis | | + ant-phone | | + anubis | | + aspell | [] [] | + bash | | + bfd | | + bibshelf | [] | + binutils | | + bison | | + bison-runtime | [] | + bluez-pin | [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] [] | + cpio | | + cppi | | + cpplib | [] | + cryptsetup | | + dfarc | | + dialog | [] [] | + dico | | + diffutils | [] | + dink | | + doodle | | + e2fsprogs | [] | + enscript | [] | + exif | | + fetchmail | [] | + findutils | [] | + flex | [] | + freedink | | + gas | | + gawk | [] [] | + gcal | [] | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] [] [] | + gettext-tools | [] [] | + gip | [] | + gjay | | + gliv | [] | + glunarclock | [] [] | + gnubiff | | + gnucash | [] | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | | + gold | | + gpe-aerial | | + gpe-beam | | + gpe-bluetooth | | + gpe-calendar | | + gpe-clock | [] | + gpe-conf | | + gpe-contacts | | + gpe-edit | | + gpe-filemanager | | + gpe-go | | + gpe-login | | + gpe-ownerinfo | [] | + gpe-package | | + gpe-sketchbook | | + gpe-su | [] | + gpe-taskmanager | [] | + gpe-timesheet | [] | + gpe-today | [] | + gpe-todo | | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | [] [] | + gsasl | | + gss | | + gst-plugins-bad | [] | + gst-plugins-base | [] | + gst-plugins-good | [] | + gst-plugins-ugly | [] | + gstreamer | [] [] [] | + gtick | | + gtkam | [] | + gtkorphan | [] | + gtkspell | [] [] [] | + gutenprint | | + hello | [] | + help2man | | + hylafax | | + idutils | | + indent | [] [] | + iso_15924 | | + iso_3166 | [] [] [] [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | | + iso_639 | [] [] [] [] [] | + iso_639_3 | [] | + jwhois | | + kbd | | + keytouch | [] | + keytouch-editor | | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | | + ld | [] | + leafpad | [] [] | + libc | [] [] | + libexif | () | + libextractor | | + libgnutls | | + libgpewidget | | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | [] | + libidn | | + lifelines | | + liferea | [] [] | + lilypond | | + linkdr | [] | + lordsawar | | + lprng | | + lynx | [] | + m4 | | + mailfromd | | + mailutils | | + make | | + man-db | | + man-db-manpages | | + minicom | | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | | + psmisc | | + pspp | [] | + pwdutils | | + radius | [] | + recode | [] [] | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] | + sed | [] [] | + sharutils | [] [] | + shishi | | + skencil | | + solfege | | + solfege-manual | | + soundtracker | | + sp | | + sysstat | | + tar | [] | + texinfo | | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] [] | + wyslij-po | | + xchat | [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +---------------------------------------------------+ + af am ar as ast az be be@latin bg bn_IN bs ca crh + 6 0 2 3 19 1 11 3 28 3 1 38 5 - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no + cs da de el en en_GB en_ZA eo es et eu fa fi +-------------------------------------------------+ - GNUnet | | - a2ps | () [] [] () | - aegis | () | - ant-phone | [] | - anubis | [] [] [] | - ap-utils | [] | - aspell | [] [] | - bash | [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | | - bison | [] [] [] | - bison-runtime | [] [] [] | - bluez-pin | [] [] [] | - cflow | | - clisp | [] | - console-tools | | - coreutils | [] | - cpio | | - cpplib | [] | - cryptonit | [] | - darkstat | [] [] | - dialog | [] [] | - diffutils | [] [] [] | - doodle | | - e2fsprogs | [] | - enscript | [] | - error | [] | - fetchmail | [] [] | - fileutils | [] [] | - findutils | [] | - flex | [] [] | - fslint | [] [] | - gas | | - gawk | [] [] | - gbiff | [] | - gcal | | - gcc | | - gettext-examples | [] [] | - gettext-runtime | [] [] [] | - gettext-tools | [] [] | - gimp-print | [] [] | - gip | [] [] | - gliv | [] | - glunarclock | [] [] | - gmult | [] [] | - gnubiff | | - gnucash | () () | - gnucash-glossary | [] | - gnuedu | | - gnulib | [] [] [] [] | - gnunet-gtk | | - gnutls | | - gpe-aerial | [] | - gpe-beam | [] | - gpe-calendar | [] | - gpe-clock | [] [] [] | - gpe-conf | [] [] | - gpe-contacts | [] | - gpe-edit | [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] | - gpe-login | [] [] [] | - gpe-ownerinfo | [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] | - gpe-su | [] [] [] | - gpe-taskmanager | [] [] [] [] | - gpe-timesheet | [] | - gpe-today | [] [] | - gpe-todo | [] | - gphoto2 | [] [] | - gprof | | - gpsdrive | () () () | - gramadoir | () | - grep | [] [] [] [] | - gretl | | - gsasl | [] | - gss | | - gst-plugins | [] | - gst-plugins-base | | - gst-plugins-good | [] | - gstreamer | [] | - gtick | | - gtkam | [] | - gtkorphan | [] | - gtkspell | [] [] | - gutenprint | | - hello | [] [] [] [] [] [] | - id-utils | [] | - impost | | - indent | [] [] | - iso_3166 | [] | - iso_3166_2 | [] | - iso_4217 | [] [] [] | - iso_639 | [] [] | - jpilot | () () () | - jtag | | - jwhois | [] | - kbd | [] | - keytouch | [] | - keytouch-editor | | - keytouch-keyboa... | | - latrine | [] | - ld | | - leafpad | [] [] | - libc | [] [] [] [] [] | - libexif | | + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] () | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | [] [] | + buzztard | [] [] [] | + cflow | [] [] [] | + clisp | [] [] [] [] | + coreutils | [] [] [] [] | + cpio | [] | + cppi | [] | + cpplib | [] [] [] | + cryptsetup | [] | + dfarc | [] [] [] [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] | + dink | [] [] [] | + doodle | [] | + e2fsprogs | [] [] [] | + enscript | [] [] [] | + exif | () [] [] [] | + fetchmail | [] [] () [] [] [] | + findutils | [] [] [] [] | + flex | [] [] [] | + freedink | [] [] [] [] | + gas | [] | + gawk | [] [] [] | + gcal | [] | + gcc | [] [] | + gettext-examples | [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] | + gip | [] [] [] [] [] | + gjay | [] [] | + gliv | [] [] [] [] | + glunarclock | [] [] [] | + gnubiff | () | + gnucash | [] () () () () () | + gnuedu | [] [] | + gnulib | [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] [] | + gpe-aerial | [] [] [] [] [] | + gpe-beam | [] [] [] [] [] | + gpe-bluetooth | [] [] [] | + gpe-calendar | [] [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] [] [] | + gpe-contacts | [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] [] | + gpe-go | [] [] [] [] [] | + gpe-login | [] [] [] | + gpe-ownerinfo | [] [] [] [] [] | + gpe-package | [] [] [] [] | + gpe-sketchbook | [] [] [] [] [] | + gpe-su | [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] | + gpe-today | [] [] [] [] [] | + gpe-todo | [] [] [] [] | + gphoto2 | [] [] () [] [] [] [] | + gprof | [] [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] [] | + grub | [] [] [] | + gsasl | [] [] | + gss | [] | + gst-plugins-bad | [] [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] [] | + gtick | [] () [] [] | + gtkam | [] [] () [] [] | + gtkorphan | [] [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] [] | + hello | [] [] [] [] [] | + help2man | [] [] | + hylafax | [] [] | + idutils | [] [] [] | + indent | [] [] [] [] [] [] [] [] | + iso_15924 | [] () [] [] [] | + iso_3166 | [] [] [] () [] [] [] () [] | + iso_3166_2 | () | + iso_4217 | [] [] [] () [] [] [] | + iso_639 | [] [] [] () [] [] [] | + iso_639_3 | | + jwhois | [] [] | + kbd | [] [] [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] | + klavaro | [] [] [] [] | + latrine | [] () [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] [] | + libc | [] [] [] [] [] | + libexif | [] [] () | libextractor | | - libgpewidget | [] | - libgpg-error | | - libgphoto2 | [] | - libgphoto2_port | [] | - libgsasl | [] | - libiconv | | - libidn | [] [] | - lifelines | [] | - lilypond | | - lingoteach | [] | - lynx | [] [] | - m4 | [] [] | - mailutils | | - make | [] [] [] | - man-db | () | - minicom | [] | - mysecretdiary | [] | - nano | [] [] [] | - nano_1_0 | [] [] [] | - opcodes | [] | - parted | [] [] | - pilot-qof | | - psmisc | [] [] [] | - pwdutils | | - python | | - qof | | - radius | | - recode | [] | - rpm | [] [] | - screem | [] | - scrollkeeper | [] [] [] [] | - sed | [] [] | - sh-utils | [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] | + libgnutls | [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] () | + libgphoto2_port | [] () [] | + libgsasl | [] | + libiconv | [] [] [] [] [] [] | + libidn | [] [] [] [] | + lifelines | [] () | + liferea | [] [] [] [] [] | + lilypond | [] [] [] [] | + linkdr | [] [] [] [] | + lordsawar | [] | + lprng | | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] | + make | [] [] [] [] | + man-db | | + man-db-manpages | | + minicom | [] [] [] [] [] | + mkisofs | [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] | + pies | | + popt | [] [] [] [] [] [] | + psmisc | [] [] [] [] | + pspp | [] | + pwdutils | [] | + radius | [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] [] | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] | shishi | | - silky | [] | - skencil | | - sketch | | - solfege | | - soundtracker | | - sp | () | - stardict | [] [] | - system-tools-ba... | [] [] [] [] | - tar | [] [] [] | - texinfo | [] [] [] | - textutils | [] [] [] | - tin | | - tp-robot | [] | - tuxpaint | [] | + skencil | [] () [] | + solfege | [] [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] [] | + sp | [] | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] | + texinfo | [] [] [] | + tin | [] [] | unicode-han-tra... | | unicode-transla... | | - util-linux | [] [] | - vorbis-tools | [] | - wastesedge | [] | - wdiff | [] [] | - wget | [] [] | - xchat | [] [] [] [] | - xkeyboard-config | [] | - xpad | [] [] [] | + util-linux-ng | [] [] [] [] [] | + vice | () () | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] [] | + wget | [] [] [] [] | + wyslij-po | [] | + xchat | [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] [] | +-------------------------------------------------+ - ja ko ku ky lg lt lv mk mn ms mt nb ne nl nn no - 52 24 2 2 1 3 0 2 3 21 0 15 1 97 5 1 + cs da de el en en_GB en_ZA eo es et eu fa fi + 64 105 117 18 1 8 0 28 89 18 19 0 104 + + fr ga gl gu he hi hr hu hy id is it ja ka kn + +------------------------------------------------+ + a2ps | [] [] [] | + aegis | [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] | + bash | [] [] [] | + bfd | [] [] | + bibshelf | [] [] [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] | + bombono-dvd | | + buzztard | [] | + cflow | [] [] | + clisp | [] | + coreutils | [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] [] | + cryptsetup | [] [] [] | + dfarc | [] [] | + dialog | [] [] [] [] [] [] [] | + dico | | + diffutils | [] [] [] [] [] [] [] [] | + dink | [] | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] | + exif | [] [] [] [] [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] | + freedink | [] [] | + gas | [] [] | + gawk | [] [] [] [] () [] | + gcal | [] | + gcc | [] | + gettext-examples | [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] | + gettext-tools | [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | () | + glunarclock | [] [] [] | + gnubiff | () [] () | + gnucash | () () () () [] | + gnuedu | [] [] | + gnulib | [] [] [] [] [] | + gnunet | | + gnunet-gtk | [] | + gnutls | [] [] | + gold | [] | + gpe-aerial | [] [] | + gpe-beam | [] [] [] | + gpe-bluetooth | [] [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] | + gpe-conf | [] [] [] | + gpe-contacts | [] [] [] | + gpe-edit | [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] | + gpe-su | [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] | + gpe-timesheet | [] [] [] [] | + gpe-today | [] [] [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] [] | + gramadoir | [] [] [] | + grep | [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] [] | + gst-plugins-bad | [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | [] [] [] [] | + gtick | [] [] [] [] | + gtkam | [] [] [] [] [] | + gtkorphan | [] [] [] | + gtkspell | [] [] [] [] [] [] [] [] | + gutenprint | [] [] [] | + hello | [] [] | + help2man | [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | () [] [] | + iso_3166 | () [] [] [] [] [] [] [] [] [] [] | + iso_3166_2 | () [] [] [] | + iso_4217 | () [] [] [] [] | + iso_639 | () [] [] [] [] [] [] [] | + iso_639_3 | () [] [] | + jwhois | [] [] [] [] | + kbd | [] [] | + keytouch | [] [] [] [] [] | + keytouch-editor | [] [] [] [] | + keytouch-keyboa... | [] [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | [] [] [] | + leafpad | [] [] [] [] [] [] () | + libc | [] [] [] [] | + libexif | | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] [] | + libgphoto2_port | [] [] [] | + libgsasl | [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] [] | + lifelines | () | + liferea | [] [] [] [] | + lilypond | [] | + linkdr | [] [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | | + mailutils | [] [] | + make | [] [] [] [] [] [] [] [] | + man-db | [] [] | + man-db-manpages | [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] | + pies | | + popt | [] [] [] [] [] [] [] [] | + psmisc | [] [] | + pspp | | + pwdutils | [] [] | + radius | [] [] | + recode | [] [] [] [] [] [] [] | + rosegarden | () () () () | + rpm | [] [] | + rush | | + sarg | [] | + screem | [] [] | + scrollkeeper | [] [] [] | + sed | [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] | + shishi | [] | + skencil | [] | + solfege | [] [] [] | + solfege-manual | [] [] | + soundtracker | [] [] | + sp | [] () | + sysstat | [] [] [] [] | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | [] [] | + util-linux-ng | [] [] [] [] [] | + vice | () () () | + vmm | [] | + vorbis-tools | [] | + wastesedge | () () | + wdiff | | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] | + xchat | [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] | + +------------------------------------------------+ + fr ga gl gu he hi hr hu hy id is it ja ka kn + 121 53 20 4 8 2 5 53 2 120 5 83 66 0 4 - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - +------------------------------------------------------+ - GNUnet | | - a2ps | () [] [] [] [] [] [] | - aegis | () () | - ant-phone | [] [] | - anubis | [] [] [] | - ap-utils | () | - aspell | [] [] | - bash | [] [] [] | - batchelor | [] [] | - bfd | | - bibshelf | [] | - binutils | [] [] | - bison | [] [] [] [] [] | - bison-runtime | [] [] [] [] | - bluez-pin | [] [] [] [] [] [] [] [] [] | - cflow | [] | - clisp | [] | - console-tools | [] | - coreutils | [] [] [] [] | - cpio | [] [] [] | - cpplib | [] | - cryptonit | [] [] | - darkstat | [] [] [] [] [] [] | - dialog | [] [] [] [] [] [] [] [] [] | - diffutils | [] [] [] [] [] [] | - doodle | [] [] | - e2fsprogs | [] [] | - enscript | [] [] [] [] [] | - error | [] [] [] [] | - fetchmail | [] [] [] | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] [] [] [] [] | - fslint | [] [] [] [] | - gas | | - gawk | [] [] [] [] | - gbiff | [] | - gcal | [] | - gcc | [] | - gettext-examples | [] [] [] [] [] [] [] [] | - gettext-runtime | [] [] [] [] [] [] [] [] | - gettext-tools | [] [] [] [] [] [] [] | - gimp-print | [] [] | - gip | [] [] [] [] | - gliv | [] [] [] [] | - glunarclock | [] [] [] [] [] [] | - gmult | [] [] [] [] | - gnubiff | () | - gnucash | () [] | - gnucash-glossary | [] [] [] | - gnuedu | | - gnulib | [] [] [] [] [] | - gnunet-gtk | [] | - gnutls | [] [] | - gpe-aerial | [] [] [] [] [] [] [] | - gpe-beam | [] [] [] [] [] [] [] | - gpe-calendar | [] | - gpe-clock | [] [] [] [] [] [] [] [] | - gpe-conf | [] [] [] [] [] [] [] | - gpe-contacts | [] [] [] [] [] | - gpe-edit | [] [] [] [] [] [] [] [] | - gpe-filemanager | [] [] | - gpe-go | [] [] [] [] [] [] | - gpe-login | [] [] [] [] [] [] [] [] | - gpe-ownerinfo | [] [] [] [] [] [] [] [] | - gpe-package | [] [] | - gpe-sketchbook | [] [] [] [] [] [] [] [] | - gpe-su | [] [] [] [] [] [] [] [] | - gpe-taskmanager | [] [] [] [] [] [] [] [] | - gpe-timesheet | [] [] [] [] [] [] [] [] | - gpe-today | [] [] [] [] [] [] [] [] | - gpe-todo | [] [] [] [] | - gphoto2 | [] [] [] [] [] | - gprof | [] [] [] | - gpsdrive | [] [] [] | - gramadoir | [] [] | - grep | [] [] [] [] [] [] [] [] | - gretl | [] | - gsasl | [] [] [] | - gss | [] [] [] | - gst-plugins | [] [] [] [] | - gst-plugins-base | [] | - gst-plugins-good | [] [] [] [] | - gstreamer | [] [] [] | - gtick | [] | - gtkam | [] [] [] [] | - gtkorphan | [] | - gtkspell | [] [] [] [] [] [] [] [] | - gutenprint | [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] [] | - impost | [] | - indent | [] [] [] [] [] [] | - iso_3166 | [] [] [] [] [] [] | - iso_3166_2 | | - iso_4217 | [] [] [] [] | - iso_639 | [] [] [] [] | - jpilot | | - jtag | [] | - jwhois | [] [] [] [] | - kbd | [] [] [] | - keytouch | [] | - keytouch-editor | [] | - keytouch-keyboa... | [] | - latrine | [] [] | - ld | [] | - leafpad | [] [] [] [] [] [] | - libc | [] [] [] [] [] | - libexif | [] | - libextractor | [] [] | - libgpewidget | [] [] [] [] [] [] [] | - libgpg-error | [] [] | - libgphoto2 | [] | - libgphoto2_port | [] [] [] | - libgsasl | [] [] [] [] | - libiconv | [] [] | - libidn | [] [] () | - lifelines | [] [] | - lilypond | | - lingoteach | [] | - lynx | [] [] [] | - m4 | [] [] [] [] [] | - mailutils | [] [] [] [] | - make | [] [] [] [] | - man-db | [] [] | - minicom | [] [] [] [] [] | - mysecretdiary | [] [] [] [] | - nano | [] [] [] | - nano_1_0 | [] [] [] [] | - opcodes | [] [] | - parted | [] | - pilot-qof | [] | - psmisc | [] [] | - pwdutils | [] [] | - python | | - qof | [] [] | - radius | [] [] | - recode | [] [] [] [] [] [] [] | - rpm | [] [] [] [] | - screem | | - scrollkeeper | [] [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] | - shared-mime-info | [] [] [] [] [] | - sharutils | [] [] [] [] | - shishi | [] | - silky | [] | - skencil | [] [] [] | - sketch | [] [] [] | - solfege | [] | - soundtracker | [] [] | - sp | | - stardict | [] [] [] | - system-tools-ba... | [] [] [] [] [] [] [] [] [] | - tar | [] [] [] [] [] | - texinfo | [] [] [] [] | - textutils | [] [] [] | - tin | () | - tp-robot | [] | - tuxpaint | [] [] [] [] [] | - unicode-han-tra... | | - unicode-transla... | | - util-linux | [] [] [] [] | - vorbis-tools | [] [] | - wastesedge | | - wdiff | [] [] [] [] [] [] | - wget | [] [] [] [] | - xchat | [] [] [] [] [] [] [] | - xkeyboard-config | [] [] | - xpad | [] [] [] | - +------------------------------------------------------+ - nso or pa pl pt pt_BR rm ro ru rw sk sl sq sr sv ta - 0 2 3 58 30 54 5 73 72 4 40 46 11 50 128 2 + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + +-----------------------------------------------+ + a2ps | [] | + aegis | | + ant-phone | | + anubis | [] [] | + aspell | [] | + bash | | + bfd | | + bibshelf | [] [] | + binutils | | + bison | [] | + bison-runtime | [] [] [] [] [] | + bluez-pin | [] [] [] [] [] | + bombono-dvd | | + buzztard | | + cflow | | + clisp | | + coreutils | [] | + cpio | | + cppi | | + cpplib | | + cryptsetup | | + dfarc | [] | + dialog | [] [] [] [] [] | + dico | | + diffutils | [] [] | + dink | | + doodle | | + e2fsprogs | | + enscript | | + exif | [] | + fetchmail | | + findutils | | + flex | | + freedink | [] | + gas | | + gawk | | + gcal | | + gcc | | + gettext-examples | [] [] [] [] | + gettext-runtime | [] | + gettext-tools | [] | + gip | [] [] | + gjay | | + gliv | | + glunarclock | [] | + gnubiff | | + gnucash | () () () () | + gnuedu | | + gnulib | | + gnunet | | + gnunet-gtk | | + gnutls | [] | + gold | | + gpe-aerial | [] | + gpe-beam | [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] | + gpe-clock | [] [] [] [] [] | + gpe-conf | [] [] | + gpe-contacts | [] [] | + gpe-edit | [] | + gpe-filemanager | [] [] | + gpe-go | [] [] [] | + gpe-login | [] | + gpe-ownerinfo | [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] | + gpe-su | [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] | + gpe-timesheet | [] [] | + gpe-today | [] [] [] [] | + gpe-todo | [] [] | + gphoto2 | | + gprof | [] | + gpsdrive | | + gramadoir | | + grep | | + grub | | + gsasl | | + gss | | + gst-plugins-bad | [] [] | + gst-plugins-base | [] [] | + gst-plugins-good | [] [] | + gst-plugins-ugly | [] [] [] [] [] | + gstreamer | | + gtick | | + gtkam | [] | + gtkorphan | [] [] | + gtkspell | [] [] [] [] [] [] [] | + gutenprint | | + hello | [] [] [] | + help2man | | + hylafax | | + idutils | | + indent | | + iso_15924 | [] [] | + iso_3166 | [] [] () [] [] [] [] [] | + iso_3166_2 | | + iso_4217 | [] [] | + iso_639 | [] [] | + iso_639_3 | [] | + jwhois | [] | + kbd | | + keytouch | [] | + keytouch-editor | [] | + keytouch-keyboa... | [] | + klavaro | [] | + latrine | [] | + ld | | + leafpad | [] [] [] | + libc | [] | + libexif | | + libextractor | | + libgnutls | [] | + libgpewidget | [] [] | + libgpg-error | | + libgphoto2 | | + libgphoto2_port | | + libgsasl | | + libiconv | | + libidn | | + lifelines | | + liferea | | + lilypond | | + linkdr | | + lordsawar | | + lprng | | + lynx | | + m4 | | + mailfromd | | + mailutils | | + make | [] | + man-db | | + man-db-manpages | | + minicom | [] | + mkisofs | | + myserver | | + nano | [] [] | + opcodes | | + parted | | + pies | | + popt | [] [] [] | + psmisc | | + pspp | | + pwdutils | | + radius | | + recode | | + rosegarden | | + rpm | | + rush | | + sarg | | + screem | | + scrollkeeper | [] [] | + sed | | + sharutils | | + shishi | | + skencil | | + solfege | [] | + solfege-manual | | + soundtracker | | + sp | | + sysstat | [] | + tar | [] | + texinfo | [] | + tin | | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | | + vice | | + vmm | | + vorbis-tools | | + wastesedge | | + wdiff | | + wget | [] | + wyslij-po | | + xchat | [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] | + +-----------------------------------------------+ + ko ku ky lg lt lv mk ml mn mr ms mt nb nds ne + 20 5 10 1 12 48 4 2 2 4 24 10 19 3 1 + + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + +---------------------------------------------------+ + a2ps | [] [] [] [] [] [] [] [] | + aegis | [] [] [] | + ant-phone | [] [] | + anubis | [] [] [] | + aspell | [] [] [] [] [] | + bash | [] [] | + bfd | [] | + bibshelf | [] [] | + binutils | [] [] | + bison | [] [] [] | + bison-runtime | [] [] [] [] [] [] [] | + bluez-pin | [] [] [] [] [] [] [] [] | + bombono-dvd | [] () | + buzztard | [] [] | + cflow | [] | + clisp | [] [] | + coreutils | [] [] [] [] [] [] | + cpio | [] [] [] | + cppi | [] | + cpplib | [] | + cryptsetup | [] | + dfarc | [] | + dialog | [] [] [] [] | + dico | [] | + diffutils | [] [] [] [] [] [] | + dink | () | + doodle | [] [] | + e2fsprogs | [] [] | + enscript | [] [] [] [] [] | + exif | [] [] [] () [] | + fetchmail | [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] [] | + freedink | [] [] | + gas | | + gawk | [] [] [] [] | + gcal | | + gcc | [] | + gettext-examples | [] [] [] [] [] [] [] [] | + gettext-runtime | [] [] [] [] [] [] [] [] [] | + gettext-tools | [] [] [] [] [] [] | + gip | [] [] [] [] [] | + gjay | | + gliv | [] [] [] [] [] [] | + glunarclock | [] [] [] [] [] | + gnubiff | [] () | + gnucash | [] () () () | + gnuedu | [] | + gnulib | [] [] [] [] | + gnunet | | + gnunet-gtk | | + gnutls | [] [] | + gold | | + gpe-aerial | [] [] [] [] [] [] [] | + gpe-beam | [] [] [] [] [] [] [] | + gpe-bluetooth | [] [] | + gpe-calendar | [] [] [] [] | + gpe-clock | [] [] [] [] [] [] [] [] | + gpe-conf | [] [] [] [] [] [] [] | + gpe-contacts | [] [] [] [] [] | + gpe-edit | [] [] [] | + gpe-filemanager | [] [] [] | + gpe-go | [] [] [] [] [] [] [] [] | + gpe-login | [] [] | + gpe-ownerinfo | [] [] [] [] [] [] [] [] | + gpe-package | [] [] | + gpe-sketchbook | [] [] [] [] [] [] [] | + gpe-su | [] [] [] [] [] [] [] [] | + gpe-taskmanager | [] [] [] [] [] [] [] [] | + gpe-timesheet | [] [] [] [] [] [] [] [] | + gpe-today | [] [] [] [] [] [] [] [] | + gpe-todo | [] [] [] [] [] | + gphoto2 | [] [] [] [] [] [] [] [] | + gprof | [] [] [] | + gpsdrive | [] [] | + gramadoir | [] [] | + grep | [] [] [] [] | + grub | [] [] [] | + gsasl | [] [] [] [] | + gss | [] [] [] | + gst-plugins-bad | [] [] [] [] [] | + gst-plugins-base | [] [] [] [] [] | + gst-plugins-good | [] [] [] [] [] | + gst-plugins-ugly | [] [] [] [] [] [] | + gstreamer | [] [] [] [] [] | + gtick | [] [] [] | + gtkam | [] [] [] [] [] [] | + gtkorphan | [] | + gtkspell | [] [] [] [] [] [] [] [] [] [] | + gutenprint | [] [] | + hello | [] [] [] [] | + help2man | [] [] | + hylafax | [] | + idutils | [] [] [] [] [] | + indent | [] [] [] [] [] [] [] | + iso_15924 | [] [] [] [] | + iso_3166 | [] [] [] [] [] () [] [] [] [] [] [] [] [] | + iso_3166_2 | [] [] [] | + iso_4217 | [] [] [] [] [] [] [] [] | + iso_639 | [] [] [] [] [] [] [] [] [] | + iso_639_3 | [] [] | + jwhois | [] [] [] [] | + kbd | [] [] [] | + keytouch | [] [] [] | + keytouch-editor | [] [] [] | + keytouch-keyboa... | [] [] [] | + klavaro | [] [] | + latrine | [] [] | + ld | | + leafpad | [] [] [] [] [] [] [] [] [] | + libc | [] [] [] [] | + libexif | [] [] () [] | + libextractor | | + libgnutls | [] [] | + libgpewidget | [] [] [] | + libgpg-error | [] [] | + libgphoto2 | [] [] | + libgphoto2_port | [] [] [] [] | + libgsasl | [] [] [] [] [] | + libiconv | [] [] [] [] [] | + libidn | [] [] | + lifelines | [] [] | + liferea | [] [] [] [] [] () () [] | + lilypond | [] | + linkdr | [] [] [] | + lordsawar | | + lprng | [] | + lynx | [] [] [] | + m4 | [] [] [] [] [] | + mailfromd | [] | + mailutils | [] | + make | [] [] [] [] | + man-db | [] [] [] | + man-db-manpages | [] [] [] | + minicom | [] [] [] [] | + mkisofs | [] [] [] | + myserver | | + nano | [] [] [] [] | + opcodes | [] [] | + parted | [] [] [] [] | + pies | [] | + popt | [] [] [] [] | + psmisc | [] [] [] | + pspp | [] [] | + pwdutils | [] | + radius | [] [] [] | + recode | [] [] [] [] [] [] [] [] | + rosegarden | () () | + rpm | [] [] [] | + rush | [] [] | + sarg | | + screem | | + scrollkeeper | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] | + shishi | [] | + skencil | [] [] | + solfege | [] [] [] [] | + solfege-manual | [] [] [] | + soundtracker | [] | + sp | | + sysstat | [] [] [] [] | + tar | [] [] [] [] | + texinfo | [] [] [] [] | + tin | [] | + unicode-han-tra... | | + unicode-transla... | | + util-linux-ng | [] [] [] [] [] | + vice | [] | + vmm | [] | + vorbis-tools | [] [] | + wastesedge | [] | + wdiff | [] [] | + wget | [] [] [] [] [] [] [] | + wyslij-po | [] [] [] | + xchat | [] [] [] [] [] [] [] [] [] | + xdg-user-dirs | [] [] [] [] [] [] [] [] [] [] [] [] [] [] | + xkeyboard-config | [] [] [] [] [] | + +---------------------------------------------------+ + nl nn or pa pl ps pt pt_BR ro ru rw sk sl sq sr + 135 10 4 7 105 1 29 61 47 91 3 55 47 8 37 - tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu + sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW +---------------------------------------------------+ - GNUnet | [] | 2 - a2ps | [] [] [] | 19 - aegis | | 0 - ant-phone | [] [] | 6 - anubis | [] [] [] | 11 - ap-utils | () [] | 4 - aspell | [] [] [] | 15 - bash | [] | 11 - batchelor | [] [] | 9 - bfd | | 1 - bibshelf | [] | 7 - binutils | [] [] [] | 9 - bison | [] [] [] | 19 - bison-runtime | [] [] [] | 15 - bluez-pin | [] [] [] [] [] [] | 28 - cflow | [] [] | 5 - clisp | | 6 - console-tools | [] [] | 5 - coreutils | [] [] | 16 - cpio | [] [] [] | 9 - cpplib | [] [] [] [] | 11 - cryptonit | | 5 - darkstat | [] () () | 15 - dialog | [] [] [] [] [] | 30 - diffutils | [] [] [] [] | 28 - doodle | [] | 6 - e2fsprogs | [] [] | 10 - enscript | [] [] [] | 16 - error | [] [] [] [] | 18 - fetchmail | [] [] | 12 - fileutils | [] [] [] | 18 - findutils | [] [] [] | 17 - flex | [] [] | 15 - fslint | [] | 9 - gas | [] | 3 - gawk | [] [] | 15 - gbiff | [] | 5 - gcal | [] | 5 - gcc | [] [] [] | 6 - gettext-examples | [] [] [] [] [] [] | 27 - gettext-runtime | [] [] [] [] [] [] | 28 - gettext-tools | [] [] [] [] [] | 19 - gimp-print | [] [] | 12 - gip | [] [] | 12 - gliv | [] [] | 8 - glunarclock | [] [] [] | 15 - gmult | [] [] [] [] | 15 - gnubiff | [] | 1 - gnucash | () | 2 - gnucash-glossary | [] [] | 9 - gnuedu | [] | 2 - gnulib | [] [] [] [] [] | 28 - gnunet-gtk | | 1 - gnutls | | 2 - gpe-aerial | [] [] | 14 - gpe-beam | [] [] | 14 - gpe-calendar | [] | 3 - gpe-clock | [] [] [] [] | 21 - gpe-conf | [] [] | 14 - gpe-contacts | [] [] | 10 - gpe-edit | [] [] [] [] | 20 - gpe-filemanager | [] | 6 - gpe-go | [] [] | 15 - gpe-login | [] [] [] [] [] | 21 - gpe-ownerinfo | [] [] [] [] | 21 - gpe-package | [] | 6 - gpe-sketchbook | [] [] | 16 - gpe-su | [] [] [] | 20 - gpe-taskmanager | [] [] [] | 20 - gpe-timesheet | [] [] [] [] | 18 - gpe-today | [] [] [] [] [] | 21 - gpe-todo | [] | 7 - gphoto2 | [] [] [] [] | 20 - gprof | [] [] | 11 - gpsdrive | | 4 - gramadoir | [] | 7 - grep | [] [] [] [] | 34 - gretl | | 4 - gsasl | [] [] | 8 - gss | [] | 5 - gst-plugins | [] [] [] | 15 - gst-plugins-base | [] [] [] | 9 - gst-plugins-good | [] [] [] [] [] | 20 - gstreamer | [] [] [] | 17 - gtick | [] | 3 - gtkam | [] | 13 - gtkorphan | [] | 7 - gtkspell | [] [] [] [] [] [] | 26 - gutenprint | | 3 - hello | [] [] [] [] [] | 37 - id-utils | [] [] | 14 - impost | [] | 4 - indent | [] [] [] [] | 25 - iso_3166 | [] [] [] [] | 16 - iso_3166_2 | | 2 - iso_4217 | [] [] | 14 - iso_639 | [] | 14 - jpilot | [] [] [] [] | 7 - jtag | [] | 3 - jwhois | [] [] [] | 13 - kbd | [] [] | 12 - keytouch | [] | 4 - keytouch-editor | | 2 - keytouch-keyboa... | [] | 3 - latrine | [] [] | 8 - ld | [] [] [] [] | 8 - leafpad | [] [] [] [] | 23 - libc | [] [] [] | 23 - libexif | [] | 4 - libextractor | [] | 5 - libgpewidget | [] [] [] | 19 - libgpg-error | [] | 4 - libgphoto2 | [] | 8 - libgphoto2_port | [] [] [] | 11 - libgsasl | [] | 8 - libiconv | [] | 7 - libidn | [] [] | 10 - lifelines | | 4 - lilypond | | 2 - lingoteach | [] | 6 - lynx | [] [] [] | 15 - m4 | [] [] [] | 18 - mailutils | [] | 8 - make | [] [] [] | 20 - man-db | [] | 6 - minicom | [] | 14 - mysecretdiary | [] [] | 12 - nano | [] [] | 17 - nano_1_0 | [] [] [] | 18 - opcodes | [] [] | 10 - parted | [] [] [] | 10 - pilot-qof | [] | 3 - psmisc | [] | 10 - pwdutils | [] | 3 - python | | 0 - qof | [] | 4 - radius | [] | 6 - recode | [] [] [] | 25 - rpm | [] [] [] [] | 14 - screem | [] | 2 - scrollkeeper | [] [] [] [] | 26 - sed | [] [] [] | 22 - sh-utils | [] | 15 - shared-mime-info | [] [] [] [] | 24 - sharutils | [] [] [] | 23 - shishi | | 1 - silky | [] | 4 - skencil | [] | 7 - sketch | | 6 - solfege | | 2 - soundtracker | [] [] | 9 - sp | [] | 3 - stardict | [] [] [] [] | 11 - system-tools-ba... | [] [] [] [] [] [] [] | 37 - tar | [] [] [] [] | 20 - texinfo | [] [] [] | 15 - textutils | [] [] [] | 17 - tin | | 1 - tp-robot | [] [] [] | 10 - tuxpaint | [] [] [] | 16 + a2ps | [] [] [] [] [] | 27 + aegis | [] | 9 + ant-phone | [] [] [] [] | 9 + anubis | [] [] [] [] | 15 + aspell | [] [] [] | 20 + bash | [] [] | 11 + bfd | [] | 6 + bibshelf | [] [] [] | 16 + binutils | [] [] | 8 + bison | [] [] | 12 + bison-runtime | [] [] [] [] [] [] | 29 + bluez-pin | [] [] [] [] [] [] [] [] | 37 + bombono-dvd | [] | 4 + buzztard | [] | 7 + cflow | [] [] [] | 9 + clisp | | 10 + coreutils | [] [] [] [] | 22 + cpio | [] [] [] [] [] [] | 13 + cppi | [] [] | 5 + cpplib | [] [] [] [] [] [] | 13 + cryptsetup | [] [] | 7 + dfarc | [] | 9 + dialog | [] [] [] [] [] [] [] | 30 + dico | [] | 2 + diffutils | [] [] [] [] [] [] | 30 + dink | | 4 + doodle | [] [] | 7 + e2fsprogs | [] [] [] | 11 + enscript | [] [] [] [] | 17 + exif | [] [] [] | 16 + fetchmail | [] [] [] | 17 + findutils | [] [] [] [] [] | 20 + flex | [] [] [] [] | 15 + freedink | [] | 10 + gas | [] | 4 + gawk | [] [] [] [] | 18 + gcal | [] [] | 5 + gcc | [] [] [] | 7 + gettext-examples | [] [] [] [] [] [] [] | 34 + gettext-runtime | [] [] [] [] [] [] [] | 30 + gettext-tools | [] [] [] [] [] [] | 22 + gip | [] [] [] [] | 22 + gjay | [] | 3 + gliv | [] [] [] | 14 + glunarclock | [] [] [] [] [] | 19 + gnubiff | [] [] | 4 + gnucash | () [] () () | 9 + gnuedu | [] [] | 7 + gnulib | [] [] [] [] | 16 + gnunet | [] | 1 + gnunet-gtk | [] [] [] | 5 + gnutls | [] [] [] | 10 + gold | [] | 4 + gpe-aerial | [] [] [] | 18 + gpe-beam | [] [] [] | 19 + gpe-bluetooth | [] [] [] | 13 + gpe-calendar | [] [] [] [] | 12 + gpe-clock | [] [] [] [] [] | 28 + gpe-conf | [] [] [] [] | 20 + gpe-contacts | [] [] [] | 17 + gpe-edit | [] [] [] | 12 + gpe-filemanager | [] [] [] [] | 16 + gpe-go | [] [] [] [] [] | 25 + gpe-login | [] [] [] | 11 + gpe-ownerinfo | [] [] [] [] [] | 25 + gpe-package | [] [] [] | 13 + gpe-sketchbook | [] [] [] | 20 + gpe-su | [] [] [] [] [] | 30 + gpe-taskmanager | [] [] [] [] [] | 29 + gpe-timesheet | [] [] [] [] [] | 25 + gpe-today | [] [] [] [] [] [] | 30 + gpe-todo | [] [] [] [] | 17 + gphoto2 | [] [] [] [] [] | 24 + gprof | [] [] [] | 15 + gpsdrive | [] [] [] | 11 + gramadoir | [] [] [] | 11 + grep | [] [] [] | 10 + grub | [] [] [] | 14 + gsasl | [] [] [] [] | 14 + gss | [] [] [] | 11 + gst-plugins-bad | [] [] [] [] | 22 + gst-plugins-base | [] [] [] [] [] | 24 + gst-plugins-good | [] [] [] [] [] | 25 + gst-plugins-ugly | [] [] [] [] [] | 29 + gstreamer | [] [] [] [] | 22 + gtick | [] [] [] | 13 + gtkam | [] [] [] | 20 + gtkorphan | [] [] [] | 14 + gtkspell | [] [] [] [] [] [] [] [] [] | 45 + gutenprint | [] | 10 + hello | [] [] [] [] [] [] | 21 + help2man | [] [] | 7 + hylafax | [] | 5 + idutils | [] [] [] [] | 17 + indent | [] [] [] [] [] [] | 30 + iso_15924 | () [] () [] [] | 16 + iso_3166 | [] [] () [] [] () [] [] [] () | 53 + iso_3166_2 | () [] () [] | 9 + iso_4217 | [] () [] [] () [] [] | 26 + iso_639 | [] [] [] () [] () [] [] [] [] | 38 + iso_639_3 | [] () | 8 + jwhois | [] [] [] [] [] | 16 + kbd | [] [] [] [] [] | 15 + keytouch | [] [] [] | 16 + keytouch-editor | [] [] [] | 14 + keytouch-keyboa... | [] [] [] | 14 + klavaro | [] | 11 + latrine | [] [] [] | 10 + ld | [] [] [] [] | 11 + leafpad | [] [] [] [] [] [] | 33 + libc | [] [] [] [] [] | 21 + libexif | [] () | 6 + libextractor | [] | 1 + libgnutls | [] [] [] | 9 + libgpewidget | [] [] [] | 14 + libgpg-error | [] [] [] | 9 + libgphoto2 | [] [] | 8 + libgphoto2_port | [] [] [] [] | 13 + libgsasl | [] [] [] | 13 + libiconv | [] [] [] [] | 21 + libidn | () [] [] | 11 + lifelines | [] | 4 + liferea | [] [] [] | 21 + lilypond | [] | 7 + linkdr | [] [] [] [] [] | 17 + lordsawar | | 1 + lprng | [] | 3 + lynx | [] [] [] [] | 17 + m4 | [] [] [] [] | 19 + mailfromd | [] [] | 3 + mailutils | [] | 5 + make | [] [] [] [] | 21 + man-db | [] [] [] | 8 + man-db-manpages | | 4 + minicom | [] [] | 16 + mkisofs | [] [] | 9 + myserver | | 0 + nano | [] [] [] [] | 21 + opcodes | [] [] [] | 11 + parted | [] [] [] [] [] | 15 + pies | [] [] | 3 + popt | [] [] [] [] [] [] | 27 + psmisc | [] [] | 11 + pspp | | 4 + pwdutils | [] [] | 6 + radius | [] [] | 9 + recode | [] [] [] [] | 28 + rosegarden | () | 0 + rpm | [] [] [] | 11 + rush | [] [] | 4 + sarg | | 1 + screem | [] | 3 + scrollkeeper | [] [] [] [] [] | 27 + sed | [] [] [] [] [] | 30 + sharutils | [] [] [] [] [] | 22 + shishi | [] | 3 + skencil | [] [] | 7 + solfege | [] [] [] [] | 16 + solfege-manual | [] | 8 + soundtracker | [] [] [] | 9 + sp | [] | 3 + sysstat | [] [] | 15 + tar | [] [] [] [] [] [] | 23 + texinfo | [] [] [] [] | 16 + tin | | 4 unicode-han-tra... | | 0 unicode-transla... | | 2 - util-linux | [] [] [] | 20 - vorbis-tools | [] [] | 11 - wastesedge | | 1 - wdiff | [] [] | 22 - wget | [] [] [] | 19 - xchat | [] [] [] [] | 29 - xkeyboard-config | [] [] [] [] | 11 - xpad | [] [] [] | 14 + util-linux-ng | [] [] [] [] | 20 + vice | () () | 1 + vmm | [] | 4 + vorbis-tools | [] | 6 + wastesedge | | 2 + wdiff | [] [] | 7 + wget | [] [] [] [] [] | 26 + wyslij-po | [] [] | 8 + xchat | [] [] [] [] [] [] | 36 + xdg-user-dirs | [] [] [] [] [] [] [] [] [] | 60 + xkeyboard-config | [] [] [] [] | 25 +---------------------------------------------------+ - 77 teams tg th tk tr uk ven vi wa xh zh_CN zh_HK zh_TW zu - 170 domains 0 1 1 77 39 0 136 10 1 48 5 54 0 2028 + 84 teams sv sw ta te tg th tr uk vi wa zh_CN zh_HK zh_TW + 178 domains 119 1 3 2 0 10 66 50 155 17 97 7 41 2610 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -1075,10 +1301,10 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If October 2006 seems to be old, you may fetch a more recent copy of + If May 2010 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at -`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. +`http://translationproject.org/extra/matrix.html'. 1.6 Using `gettext' in new packages =================================== @@ -1096,6 +1322,6 @@ the use of `gettext' the only thing missing are the translations. The Free Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact -`translation@iro.umontreal.ca' to make the `.pot' files available to -the translation teams. +`coordinator@translationproject.org' to make the `.pot' files available +to the translation teams. diff --git a/Build/source/extra/xz/AUTHORS b/Build/source/extra/xz/AUTHORS index 63a9815bc03..bda87975a51 100644 --- a/Build/source/extra/xz/AUTHORS +++ b/Build/source/extra/xz/AUTHORS @@ -16,11 +16,11 @@ Authors of XZ Utils Some scripts have been adapted from gzip. The original versions were written by Jean-loup Gailly, Charles Levert, and Paul Eggert. - Andrew Dudman helped adapting the script and their man pages for + Andrew Dudman helped adapting the scripts and their man pages for XZ Utils. - The GNU Autotools based build system contains files from many authors, - which I'm not trying list here. + The GNU Autotools-based build system contains files from many authors, + which I'm not trying to list here. Several people have contributed fixes or reported bugs. Most of them are mentioned in the file THANKS. diff --git a/Build/source/extra/xz/ChangeLog b/Build/source/extra/xz/ChangeLog index 8f60c9e2af0..e003ddc54e3 100644 --- a/Build/source/extra/xz/ChangeLog +++ b/Build/source/extra/xz/ChangeLog @@ -1,11 +1,1011 @@ +commit b69900ed0b2f914fc6c0a180dcb522dbe5b80ea7 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-30 18:02:27 +0300 + + Man pages: Use similar syntax for synopsis as in xz. + + The man pages of lzmainfo, xzmore, and xzdec had similar + constructs as the man page of xz had before the commit + eb6ca9854b8eb9fbf72497c1cf608d6b19d2d494. Eric S. Raymond + didn't mention these man pages in his bug report, but + it's nice to be consistent. + + src/lzmainfo/lzmainfo.1 | 4 ++-- + src/scripts/xzmore.1 | 6 +++--- + src/xzdec/xzdec.1 | 10 +++++----- + 3 files changed, 10 insertions(+), 10 deletions(-) + +commit cf4a1e1879d89be314ef3c064bd2656ea452f87e +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-30 15:55:09 +0300 + + Update NEWS for 5.0.5. + + NEWS | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 52 insertions(+) + +commit cb94bb6d1f34e1e93c2d634ea9c3b7dfb3981d05 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-30 15:54:38 +0300 + + Bump version and soname for 5.0.5. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit b7dee202d5b041ccae028d0c5433b83cecbe9e5d +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-28 23:56:17 +0300 + + xz: Fix return value type in io_write_buf(). + + It didn't affect the behavior of the code since -1 + becomes true anyway. + + src/xz/file_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 265e7b44d804b47373f10b7da28350db7611cea6 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-28 18:46:13 +0300 + + xz: Remove an outdated NetBSD-specific comment. + + Nowadays errno == EFTYPE is documented in open(2). + + src/xz/file_io.c | 4 ---- + 1 file changed, 4 deletions(-) + +commit 78c2f8db902195468b8249c432252a6b281db836 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-28 18:09:47 +0300 + + xz: Fix error detection of fcntl(fd, F_SETFL, flags) calls. + + POSIX says that fcntl(fd, F_SETFL, flags) returns -1 on + error and "other than -1" on success. This is how it is + documented e.g. on OpenBSD too. On Linux, success with + F_SETFL is always 0 (at least accorinding to fcntl(2) + from man-pages 3.51). + + src/xz/file_io.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +commit 91750dff8f2c654ff636f12a2acdffe5492374b3 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-28 17:36:47 +0300 + + xz: Fix use of wrong variable in a fcntl() call. + + Due to a wrong variable name, when writing a sparse file + to standard output, *all* file status flags were cleared + (to the extent the operating system allowed it) instead of + only clearing the O_APPEND flag. In practice this worked + fine in the common situations on GNU/Linux, but I didn't + check how it behaved elsewhere. + + The original flags were still restored correctly. I still + changed the code to use a separate boolean variable to + indicate when the flags should be restored instead of + relying on a special value in stdout_flags. + + src/xz/file_io.c | 24 +++++++++++++----------- + 1 file changed, 13 insertions(+), 11 deletions(-) + +commit e11888a79a4a77a69afde60445880d44f63d01aa +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-26 13:30:57 +0300 + + xz: Check the value of lzma_stream_flags.version in --list. + + It is a no-op for now, but if an old xz version is used + together with a newer liblzma that supports something new, + then this check becomes important and will stop the old xz + from trying to parse files that it won't understand. + + src/xz/list.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +commit f39ddd88f3222219ada88998cf30abfdd3e0e96c +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-26 12:17:00 +0300 + + Build: Require Automake 1.12 and use serial-tests option. + + It should actually still work with Automake 1.10 if + the serial-tests option is removed. Automake 1.13 started + using parallel tests by default and the option to get + the old behavior isn't supported before 1.12. + + At least for now, parallel tests don't improve anything + in XZ Utils but they hide the progress output from + test_compress.sh. + + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit cb84e278027a90e9827a6f4d3bb0b4d4744a2fbb +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-23 17:36:47 +0300 + + xz: Validate Uncompressed Size from Block Header in list.c. + + This affects only "xz -lvv". Normal decompression with xz + already detected if Block Header and Index had mismatched + Uncompressed Size fields. So this just makes "xz -lvv" + show such files as corrupt instead of showing the + Uncompressed Size from Index. + + src/xz/list.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +commit f01780fce454c7489f7dcbf806299b50da5f51b7 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-26 10:58:58 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit d98ede7d700b892e32d9c2f46563b6ebc566786d +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-21 22:04:45 +0300 + + xz: Make the man page more friendly to doclifter. + + Thanks to Eric S. Raymond. + + src/xz/xz.1 | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) + +commit 19b447b64b3f520cd5b11429000b092f7c76709b +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-21 21:54:59 +0300 + + xz: A couple of man page fixes. + + Now the interaction of presets and custom filter chains + is described correctly. Earlier it contradicted itself. + + Thanks to DevHC who reported these issues on IRC to me + on 2012-12-14. + + src/xz/xz.1 | 35 +++++++++++++++++++++++------------ + 1 file changed, 23 insertions(+), 12 deletions(-) + +commit 45edf2966fc9a4d2eae8f84b2fa027fb4fa1df8b +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-06-21 21:50:26 +0300 + + xz: Fix interaction between preset and custom filter chains. + + There was somewhat illogical behavior when --extreme was + specified and mixed with custom filter chains. + + Before this commit, "xz -9 --lzma2 -e" was equivalent + to "xz --lzma2". After it is equivalent to "xz -6e" + (all earlier preset options get forgotten when a custom + filter chain is specified and the default preset is 6 + to which -e is applied). I find this less illogical. + + This also affects the meaning of "xz -9e --lzma2 -7". + Earlier it was equivalent to "xz -7e" (the -e specified + before a custom filter chain wasn't forgotten). Now it + is "xz -7". Note that "xz -7e" still is the same as "xz -e7". + + Hopefully very few cared about this in the first place, + so pretty much no one should even notice this change. + + Thanks to Conley Moorhous. + + src/xz/coder.c | 35 +++++++++++++++++++++-------------- + 1 file changed, 21 insertions(+), 14 deletions(-) + +commit b065984e5a9272eb50bc0c6d3731e6199c0ae8a8 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-04-08 17:53:05 +0300 + + xz: Change size_t to uint32_t in a few places. + + src/xz/coder.c | 6 +++--- + src/xz/coder.h | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) + +commit 32be621f52f2e1686db88baa7b01dc1ae338f426 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-04-27 22:07:46 +0300 + + Build: Use -Wvla with GCC if supported. + + Variable-length arrays are mandatory in C99 but optional in C11. + The code doesn't currently use any VLAs and it shouldn't in the + future either to stay compatible with C11 without requiring any + optional C11 features. + + configure.ac | 1 + + 1 file changed, 1 insertion(+) + +commit efb07cfba65e9e05984c02cd796c1b0338ce04dc +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-04-15 19:29:09 +0300 + + xzdec: Improve the --help message. + + The options are now ordered in the same order as in xz's help + message. + + Descriptions were added to the options that are ignored. + I left them in parenthesis even if it looks a bit weird + because I find it easier to spot the ignored vs. non-ignored + options from the list that way. + + src/xzdec/xzdec.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +commit e3c8be13699e2813f5e2879d8187444b46d82d89 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-04-05 19:25:40 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit ad8282efe483612f6b5544f9a0d2e4914fb2532a +Author: Jeff Bastian <jbastian@redhat.com> +Date: 2013-04-03 13:59:17 +0200 + + xzgrep: make the '-h' option to be --no-filename equivalent + + * src/scripts/xzgrep.in: Accept the '-h' option in argument parsing. + + src/scripts/xzgrep.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 9271a3eb0e022b23e8712154be851d0afe4c02e4 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-04-05 19:34:09 +0300 + + liblzma: Be less picky in lzma_alone_decoder(). + + To avoid false positives when detecting .lzma files, + rare values in dictionary size and uncompressed size fields + were rejected. They will still be rejected if .lzma files + are decoded with lzma_auto_decoder(), but when using + lzma_alone_decoder() directly, such files will now be accepted. + Hopefully this is an OK compromise. + + This doesn't affect xz because xz still has its own file + format detection code. This does affect lzmadec though. + So after this commit lzmadec will accept files that xz or + xz-emulating-lzma doesn't. + + NOTE: lzma_alone_decoder() still won't decode all .lzma files + because liblzma's LZMA decoder doesn't support lc + lp > 4. + + Reported here: + http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/7068827 + + Conflicts: + src/liblzma/common/alone_decoder.c + src/liblzma/common/alone_decoder.h + + src/liblzma/common/alone_decoder.c | 22 ++++++++++++++-------- + src/liblzma/common/alone_decoder.h | 5 +++-- + src/liblzma/common/auto_decoder.c | 2 +- + 3 files changed, 18 insertions(+), 11 deletions(-) + +commit 211b931cee58626c1d2e021810cb108cb5cbc10f +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2013-03-05 19:14:50 +0200 + + Avoid unneeded use of awk in xzless. + + Use "read" instead of "awk" in xzless to get the version + number of "less". The need for awk was introduced in + the commit db5c1817fabf7cbb9e4087b1576eb26f0747338e. + + Thanks to Ariel P for the patch. + + src/scripts/xzless.in | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +commit 9f62fd9605eade23b62b07a235d1f02156f7a5c6 +Author: Jonathan Nieder <jrnieder@gmail.com> +Date: 2012-11-19 00:10:10 -0800 + + xzless: Make "less -V" parsing more robust + + In v4.999.9beta~30 (xzless: Support compressed standard input, + 2009-08-09), xzless learned to parse ‘less -V’ output to figure out + whether less is new enough to handle $LESSOPEN settings starting + with “|-”. That worked well for a while, but the version string from + ‘less’ versions 448 (June, 2012) is misparsed, producing a warning: + + $ xzless /tmp/test.xz; echo $? + /usr/bin/xzless: line 49: test: 456 (GNU regular expressions): \ + integer expression expected + 0 + + More precisely, modern ‘less’ lists the regexp implementation along + with its version number, and xzless passes the entire version number + with attached parenthetical phrase as a number to "test $a -gt $b", + producing the above confusing message. + + $ less-444 -V | head -1 + less 444 + $ less -V | head -1 + less 456 (no regular expressions) + + So relax the pattern matched --- instead of expecting "less <number>", + look for a line of the form "less <number>[ (extra parenthetical)]". + While at it, improve the behavior when no matching line is found --- + instead of producing a cryptic message, we can fall back on a LESSPIPE + setting that is supported by all versions of ‘less’. + + The implementation uses "awk" for simplicity. Hopefully that’s + portable enough. + + Reported-by: Jörg-Volker Peetz <jvpeetz@web.de> + Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> + + src/scripts/xzless.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 1d05980f5b5c2c94d833001daccacce4a466876e +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-10-03 15:54:24 +0300 + + xz: Fix the note about --rsyncable on the man page. + + src/xz/xz.1 | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) + +commit fb68497333598688d309a92838d91fd560f7e9f0 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-09-28 20:11:09 +0300 + + xz: Improve handling of failed realloc in xrealloc. + + Thanks to Jim Meyering. + + src/xz/util.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +commit 75013db6d4d63c195bd8b8d45729b4be0665a812 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-12-15 20:01:02 +0200 + + A few typo fixes to comments and the xz man page. + + Thanks to Jim Meyering. + + configure.ac | 2 +- + src/liblzma/check/sha256.c | 1 - + src/xz/xz.1 | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) + +commit e44b21839b1dcbac5097be39b87dd2ddb6e114fd +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-08-02 17:13:30 +0300 + + Build: Bump gettext version requirement to 0.18. + + Otherwise too old version of m4/lib-link.m4 gets included + when autoreconf -fi is run. + + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit fd3dbb23ca7e75a7a888d7e897c381dc06308307 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-07-05 07:36:28 +0300 + + Tests: Remove tests/test_block.c that had gotten committed accidentally. + + tests/test_block.c | 52 ---------------------------------------------------- + 1 file changed, 52 deletions(-) + +commit 05a735d279d74af437c31f25f69aded4713c1a3d +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-07-05 07:33:35 +0300 + + Build: Include macosx/build.sh in the distribution. + + It has been in the Git repository since 2010 but probably + few people have seen it since it hasn't been included in + the release tarballs. :-( + + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +commit 4e6d62793b5e7b87edcc93c7ded072c1ecd94173 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-07-05 07:24:45 +0300 + + Docs: Fix the name LZMA Utils -> XZ Utils in debug/README. + + debug/README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit dd95b5e7614baf1f07a1316b5106bd616a9efa79 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-07-05 07:23:17 +0300 + + Include debug/translation.bash in the distribution. + + Also fix the script name mentioned in README. + + README | 4 ++-- + debug/Makefile.am | 3 +++ + 2 files changed, 5 insertions(+), 2 deletions(-) + +commit 20778053a07eb90c159c1377ca8dc05a90fd530b +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-22 14:36:16 +0300 + + xz: Update man page date to match the latest update. + + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 2cefa84af676da37d7e9c466d55d46c67ab00c22 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-22 10:25:43 +0300 + + Bump version and soname for 5.0.4. + + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +commit 433fec191a17e45690809e54146ea7a773f54cff +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-22 10:25:09 +0300 + + Update NEWS for 5.0.4. + + NEWS | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) + +commit 711fa680f552a4003df73b37e6dc4d6e00b47bcd +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-18 21:27:47 +0300 + + Docs: Language fix to 01_compress_easy.c. + + Thanks to Jonathan Nieder. + + doc/examples/01_compress_easy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 3d7ab1dc61a75c560828be5df96598388b771456 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-14 20:15:30 +0300 + + Fix the top-level Makefile.am for the new example programs. + + Makefile.am | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +commit ef8b8e5f111469b5bc005975f7abb9abbd372b25 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-14 10:52:33 +0300 + + Docs: Add new example programs. + + These have more comments than the old examples and + human-readable error messages. More tutorial-like examples + are needed but these are a start. + + doc/examples/00_README.txt | 27 ++++ + doc/examples/01_compress_easy.c | 297 ++++++++++++++++++++++++++++++++++++++ + doc/examples/02_decompress.c | 287 ++++++++++++++++++++++++++++++++++++ + doc/examples/03_compress_custom.c | 193 +++++++++++++++++++++++++ + doc/examples/Makefile | 23 +++ + 5 files changed, 827 insertions(+) + +commit 75c149bc8045a26f8bc719cb8ed20668dab79091 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-14 10:33:27 +0300 + + Docs: Move xz_pipe_comp.c and xz_pipe_decomp.c to doc/examples_old. + + It is good to keep these around to so that if someone has + copied the decompressor bug from xz_pipe_decomp.c he has + an example how to easily fix it. + + doc/examples/xz_pipe_comp.c | 127 -------------------------------------- + doc/examples/xz_pipe_decomp.c | 123 ------------------------------------ + doc/examples_old/xz_pipe_comp.c | 127 ++++++++++++++++++++++++++++++++++++++ + doc/examples_old/xz_pipe_decomp.c | 123 ++++++++++++++++++++++++++++++++++++ + 4 files changed, 250 insertions(+), 250 deletions(-) + +commit 456307ebf947a5f50bd995d617b99c1215572308 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-06-14 10:33:01 +0300 + + Docs: Fix a bug in xz_pipe_decomp.c example program. + + doc/examples/xz_pipe_decomp.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +commit 4c310b8a29bc257e6ccbd2310f12f258678f3fef +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-31 15:53:25 +0300 + + Translations: Update the Italian translation. + + Thanks to Milo Casagrande. + + po/it.po | 311 ++++++++++++++++++++++++++++++--------------------------------- + 1 file changed, 146 insertions(+), 165 deletions(-) + +commit ec32b79366dc47a55ea877589df9e8509ba113a7 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-30 23:15:07 +0300 + + Translations: Update the French translation. + + Thanks to Adrien Nader. + + po/fr.po | 237 +++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 118 insertions(+), 119 deletions(-) + +commit dd06f40e4dd7649525e4f28d890dc238a3aa37e5 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-29 22:26:27 +0300 + + Translations: Update the German translation. + + po/de.po | 169 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 91 insertions(+), 78 deletions(-) + +commit c66808d1f55d0149ed57c536cc9b52e9c8b583bc +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-29 22:12:57 +0300 + + Translations: Update Polish translation. + + po/pl.po | 150 ++++++++++++++++++++++++++++++++++----------------------------- + 1 file changed, 82 insertions(+), 68 deletions(-) + +commit 556c22dfed195c1466b298183b850d6c28544900 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-29 13:10:36 +0300 + + Preliminary NEWS for 5.0.4. + + NEWS | 24 ++++++++++++++++++++++++ + 1 file changed, 24 insertions(+) + +commit dd13b66bf582f49d3aec36e3410ff8541b7506da +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-28 20:42:11 +0300 + + liblzma: Fix possibility of incorrect LZMA_BUF_ERROR. + + lzma_code() could incorrectly return LZMA_BUF_ERROR if + all of the following was true: + + - The caller knows how many bytes of output to expect + and only provides that much output space. + + - When the last output bytes are decoded, the + caller-provided input buffer ends right before + the LZMA2 end of payload marker. So LZMA2 won't + provide more output anymore, but it won't know it + yet and thus won't return LZMA_STREAM_END yet. + + - A BCJ filter is in use and it hasn't left any + unfiltered bytes in the temp buffer. This can happen + with any BCJ filter, but in practice it's more likely + with filters other than the x86 BCJ. + + Another situation where the bug can be triggered happens + if the uncompressed size is zero bytes and no output space + is provided. In this case the decompression can fail even + if the whole input file is given to lzma_code(). + + A similar bug was fixed in XZ Embedded on 2011-09-19. + + src/liblzma/simple/simple_coder.c | 2 +- + tests/Makefile.am | 4 +- + tests/test_bcj_exact_size.c | 112 ++++++++++++++++++++++++++++++++++++++ + 3 files changed, 116 insertions(+), 2 deletions(-) + +commit a0223bf796fdaad51a11ad02c4195c694849cc78 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-28 15:38:32 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 86e57e4bfefe3fd8e13615c41604165bb2359501 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-28 15:37:43 +0300 + + xz: Don't show a huge number in -vv when memory limit is disabled. + + src/xz/message.c | 12 +++++++++++- + 1 file changed, 11 insertions(+), 1 deletion(-) + +commit 13e44a94da19d1ef14832ff12d3877a6fd2c54c0 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-27 22:30:17 +0300 + + xz: Document the "summary" lines of --robot -lvv. + + This documents only the columns that are in v5.0. + The new columns added in the master branch aren't + necessarily stable yet. + + src/xz/xz.1 | 19 +++++++++++++++++++ + 1 file changed, 19 insertions(+) + +commit 2f90345e13ab8fea4de45a4f1caa73ebc63a62e7 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-27 21:53:20 +0300 + + xz: Fix output of verbose --robot --list modes. + + It printed the filename in "filename (x/y)" format + which it obviously shouldn't do in robot mode. + + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 8d4864f53ffae5d862c691a0b334a6b69bc5366e +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-10 21:15:17 +0300 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 35e9c58abb0ce3993da844aaeaa3e7231cd2be8f +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-10 21:14:16 +0300 + + Docs: Cleanup line wrapping a bit. + + README | 12 ++++++------ + doc/history.txt | 49 +++++++++++++++++++++++++------------------------ + 2 files changed, 31 insertions(+), 30 deletions(-) + +commit 532b3e4c568a228309b56f95c13435fd078dbe02 +Author: Benno Schulenberg <bensberg@justemail.net> +Date: 2012-03-13 22:04:04 +0100 + + Fix a few typos and add some missing articles in some documents. + + Also hyphenate several compound adjectives. + + Signed-off-by: Benno Schulenberg <bensberg@justemail.net> + + AUTHORS | 6 +++--- + README | 42 ++++++++++++++++++++--------------------- + doc/faq.txt | 24 ++++++++++++------------ + doc/history.txt | 58 ++++++++++++++++++++++++++++----------------------------- + 4 files changed, 65 insertions(+), 65 deletions(-) + +commit afb6ce8c82ffef8f2505a3759da72a733c7b0b8f +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-04-29 11:51:25 +0300 + + Windows: Update notes about static linking with MSVC. + + windows/README-Windows.txt | 13 +++++++++---- + 1 file changed, 9 insertions(+), 4 deletions(-) + +commit 7c3ba2ed5c3c878d4a14ca549b46dbff60c6d565 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-04-19 15:25:26 +0300 + + liblzma: Remove outdated comments. + + src/liblzma/simple/simple_coder.c | 3 --- + src/liblzma/simple/simple_private.h | 3 +-- + 2 files changed, 1 insertion(+), 5 deletions(-) + +commit f55db9c187651094f43881c49db2b2d9ffee6b80 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-04-19 14:17:52 +0300 + + DOS: Link against DJGPP's libemu to support FPU emulation. + + This way xz should work on 386SX and 486SX. Floating point + only is needed for verbose output in xz. + + dos/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 203edff4c761dbd7cac76ea66e4eed501c23e7a3 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-04-19 13:58:55 +0300 + + Docs: Update MINIX 3 information in INSTALL. + + INSTALL | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) + +commit f0a8f95c215628967b7cf9bd9b0a9e4172f50bb4 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-02-22 14:23:13 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit b7ad23fa78646036c0290cd91eada939c9a31526 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-02-22 14:02:34 +0200 + + Fix exit status of xzgrep when grepping binary files. + + When grepping binary files, grep may exit before it has + read all the input. In this case, gzip -q returns 2 (eating + SIGPIPE), but xz and bzip2 show SIGPIPE as the exit status + (e.g. 141). This causes wrong exit status when grepping + xz- or bzip2-compressed binary files. + + The fix checks for the special exit status that indicates SIGPIPE. + It uses kill -l which should be supported everywhere since it + is in both SUSv2 (1997) and POSIX.1-2008. + + Thanks to James Buren for the bug report. + + src/scripts/xzgrep.in | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit 4e19fbb04a0035030406482319e264426459eb24 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-02-22 12:08:43 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit c6fa03a427e3d1320794102cee3ff4f5ae00eb36 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-24 18:47:52 +0300 + + Fix compiling with IBM XL C on AIX. + + INSTALL | 36 ++++++++++++++++++++++-------------- + configure.ac | 6 +++++- + 2 files changed, 27 insertions(+), 15 deletions(-) + +commit 7b6ffc98645e1b3b302b6680be0a901d1ebf7358 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-05-24 18:37:08 +0300 + + Build: Upgrade m4/acx_pthread.m4 to the latest version. + + It was renamed to ax_pthread.m4 in Autoconf Archive. + + configure.ac | 2 +- + m4/acx_pthread.m4 | 279 ------------------------------------------------ + m4/ax_pthread.m4 | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 310 insertions(+), 280 deletions(-) + +commit bfac2be5023994fcc53de2844e7dd3af61910dc2 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2012-01-10 17:13:03 +0200 + + Tests: Fix a compiler warning with _FORTIFY_SOURCE. + + Reported here: + http://sourceforge.net/projects/lzmautils/forums/forum/708858/topic/4927385 + + tests/create_compress_files.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +commit df85e156716a4eecb7e2978691f03f729444d998 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-12-19 21:21:29 +0200 + + Docs: Explain the stable releases better in README. + + README | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +commit d06d32f108c8278c25c24b2e8666bda7b2ec23b5 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-11-04 17:57:16 +0200 + + xz: Fix a typo in a comment. + + Thanks to Bela Lubkin. + + src/xz/args.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 636fdcfbf542f1e84db2c4736004d84be4b12c84 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-11-03 17:08:02 +0200 + + Update THANKS. + + THANKS | 1 + + 1 file changed, 1 insertion(+) + +commit 55fd02f83ecd6cbd6925a3e8a3d43b8d4ef2a17c +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-11-03 17:07:22 +0200 + + xz: Fix xz on EBCDIC systems. + + Thanks to Chris Donawa. + + src/xz/coder.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +commit 4052f36053b931bad847a36aabf1a07d0034e297 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-09-06 12:03:41 +0300 + + Build: Fix "make check" on Windows. + + tests/Makefile.am | 7 +++++-- + windows/build.bash | 2 ++ + 2 files changed, 7 insertions(+), 2 deletions(-) + +commit 0f25758459c74c366a73f35d47ee12b75890bb79 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-08-09 21:19:13 +0300 + + Update THANKS. + + THANKS | 2 ++ + 1 file changed, 2 insertions(+) + +commit 70f03b51ffcb783646b20de8d97b6986c4280eec +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-08-09 21:16:44 +0300 + + Workaround unusual SIZE_MAX on SCO OpenServer. + + src/common/sysdefs.h | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +commit f138bdf76a70029e8360062a0b227936b83b24c9 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-08-06 20:37:28 +0300 + + Run the scripts with the correct shell in test_scripts.sh. + + The scripts are now made executable in the build tree. + This way the scripts can be run like programs in + test_scripts.sh. Previously test_scripts.sh always + used sh but it's not correct if @POSIX_SHELL@ is set + to something else by configure. + + Thanks to Jonathan Nieder for the patch. + + configure.ac | 8 ++++---- + tests/test_scripts.sh | 8 ++++---- + 2 files changed, 8 insertions(+), 8 deletions(-) + +commit 2c144a0365c84dbf1b6722466746d42f2563a319 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-07-31 11:01:47 +0300 + + Fix exit status of "xzdiff foo.xz bar.xz". + + xzdiff was clobbering the exit status from diff in a case + statement used to analyze the exit statuses from "xz" when + its operands were two compressed files. Save and restore + diff's exit status to fix this. + + The bug is inherited from zdiff in GNU gzip and was fixed + there on 2009-10-09. + + Thanks to Jonathan Nieder for the patch and + to Peter Pallinger for reporting the bug. + + src/scripts/xzdiff.in | 2 ++ + tests/Makefile.am | 4 +++- + tests/test_scripts.sh | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 59 insertions(+), 1 deletion(-) + +commit edf339227a966f24aebe1845fcca9429b8f6e318 +Author: Anders F Bjorklund <afb@users.sourceforge.net> +Date: 2010-11-05 12:56:11 +0100 + + add build script for macosx universal + + macosx/build.sh | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 92 insertions(+) + +commit 7fcc6334ea8923550ba6b5347ff99dc8432234b0 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-06-16 12:15:29 +0300 + + liblzma: Remove unneeded semicolon. + + src/liblzma/lz/lz_encoder_hash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +commit 631f4d3ae6adfda84d1a110781d9402c12e16cfc +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-05-28 16:43:26 +0300 + + Don't call close(-1) in tuklib_open_stdxxx() on error. + + Thanks to Jim Meyering. + + src/common/tuklib_open_stdxxx.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +commit c89faf4c9e5970e7f7f8a25521ed9aa62d1a2d9a +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-05-28 09:47:56 +0300 + + Translations: Update Italian translation. + + Thanks to Milo Casagrande. + + po/it.po | 333 +++++++++++++++++++++++++++++++++++---------------------------- + 1 file changed, 184 insertions(+), 149 deletions(-) + +commit 6fe2fc9b6ab5bf6848140823e9536370834f42fb +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-05-28 08:46:04 +0300 + + Tests: Add a test file for the bug in the previous commit. + + tests/files/README | 4 ++++ + tests/files/bad-1-block_header-6.xz | Bin 0 -> 72 bytes + 2 files changed, 4 insertions(+) + +commit 6c4d4db2bc8d8b682bd927144d37daa2ab21a6d6 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-05-27 22:25:44 +0300 + + xz: Fix error handling in xz -lvv. + + It could do an invalid free() and read past the end + of the uninitialized filters array. + + src/xz/list.c | 21 ++++++--------------- + 1 file changed, 6 insertions(+), 15 deletions(-) + +commit 844f84fcad9670c543550edf7c7e42630c8f7715 +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-05-27 22:09:49 +0300 + + liblzma: Handle allocation failures correctly in lzma_index_init(). + + Thanks to Jim Meyering. + + src/liblzma/common/index.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +commit 240e8b9791df597063a3b68d04ffcb3aa4f2de6a +Author: Lasse Collin <lasse.collin@tukaani.org> +Date: 2011-05-23 18:30:30 +0300 + + Build: Set GZIP_ENV=-9n in top-level Makefile.am. + + Makefile.am | 3 +++ + 1 file changed, 3 insertions(+) + commit e32cb264ea72a4459810f30abad70dae5a4fa17d Author: Lasse Collin <lasse.collin@tukaani.org> Date: 2011-05-21 16:59:22 +0300 Bump version and soname for 5.0.3. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 65cff45f8fd1c250491557157cce0f5f38481082 @@ -14,8 +1014,8 @@ Date: 2011-05-21 16:56:53 +0300 Update NEWS for 5.0.3. - NEWS | 36 ++++++++++++++++++++++++++++++++++-- - 1 files changed, 34 insertions(+), 2 deletions(-) + NEWS | 36 ++++++++++++++++++++++++++++++++++-- + 1 file changed, 34 insertions(+), 2 deletions(-) commit 316c67ffdae1f811ac95e838d5290a013bff4ca7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -26,9 +1026,9 @@ Date: 2011-05-21 16:28:44 +0300 It is known that the BCJ filter --help text is only partially translated. - po/LINGUAS | 1 + - po/fr.po | 864 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 865 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + po/fr.po | 864 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 865 insertions(+) commit 1931175eea6d09c0845d6e8e334a7333647f11c0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -38,8 +1038,8 @@ Date: 2011-05-21 15:12:10 +0300 French needs a space before a colon, e.g. "xz : foo error". - src/xz/message.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + src/xz/message.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) commit 841dc1f891b48b23f84c0f0e0c86c7c4e4bdcdf5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -47,8 +1047,8 @@ Date: 2011-05-17 12:26:28 +0300 Update THANKS. - THANKS | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + THANKS | 3 +++ + 1 file changed, 3 insertions(+) commit 0f7e2d36240ebf1159d5fb85d8cd7422337a0d3f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -56,8 +1056,8 @@ Date: 2011-05-17 12:21:33 +0300 Update INSTALL with a note about linker problem on OpenSolaris x86. - INSTALL | 23 +++++++++++++++++------ - 1 files changed, 17 insertions(+), 6 deletions(-) + INSTALL | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) commit 793d857e01e1725f16fc0c8af8172c91a9e38617 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -70,8 +1070,8 @@ Date: 2011-05-17 12:01:37 +0300 Thanks to Wim Lewis. - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit afcff45cee04c5c7d9c333504046ffb63d1418b5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -79,31 +1079,31 @@ Date: 2011-05-17 11:54:38 +0300 Add underscores to attributes (__attribute((__foo__))). - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/alone_encoder.c | 2 +- - src/liblzma/common/block_encoder.c | 2 +- - src/liblzma/common/common.c | 2 +- - src/liblzma/common/common.h | 2 +- - src/liblzma/common/index_decoder.c | 9 +++++---- - src/liblzma/common/index_encoder.c | 11 ++++++----- - src/liblzma/delta/delta_encoder.c | 2 +- - src/liblzma/lz/lz_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/simple/arm.c | 2 +- - src/liblzma/simple/armthumb.c | 2 +- - src/liblzma/simple/ia64.c | 2 +- - src/liblzma/simple/powerpc.c | 2 +- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/simple/sparc.c | 2 +- - src/lzmainfo/lzmainfo.c | 4 ++-- - src/xz/coder.c | 2 +- - src/xz/hardware.h | 2 +- - src/xz/message.c | 2 +- - src/xz/message.h | 18 +++++++++--------- - src/xz/options.c | 6 +++--- - src/xz/signals.c | 2 +- - src/xz/util.h | 6 +++--- - src/xzdec/xzdec.c | 6 +++--- + src/liblzma/common/alone_decoder.c | 2 +- + src/liblzma/common/alone_encoder.c | 2 +- + src/liblzma/common/block_encoder.c | 2 +- + src/liblzma/common/common.c | 2 +- + src/liblzma/common/common.h | 2 +- + src/liblzma/common/index_decoder.c | 9 +++++---- + src/liblzma/common/index_encoder.c | 11 ++++++----- + src/liblzma/delta/delta_encoder.c | 2 +- + src/liblzma/lz/lz_decoder.c | 2 +- + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/simple/arm.c | 2 +- + src/liblzma/simple/armthumb.c | 2 +- + src/liblzma/simple/ia64.c | 2 +- + src/liblzma/simple/powerpc.c | 2 +- + src/liblzma/simple/simple_coder.c | 2 +- + src/liblzma/simple/sparc.c | 2 +- + src/lzmainfo/lzmainfo.c | 4 ++-- + src/xz/coder.c | 2 +- + src/xz/hardware.h | 2 +- + src/xz/message.c | 2 +- + src/xz/message.h | 18 +++++++++--------- + src/xz/options.c | 6 +++--- + src/xz/signals.c | 2 +- + src/xz/util.h | 6 +++--- + src/xzdec/xzdec.c | 6 +++--- 25 files changed, 49 insertions(+), 47 deletions(-) commit 22159c6ba2300a006f2e46ce85ae132e2d2f7d57 @@ -112,8 +1112,8 @@ Date: 2011-04-18 19:35:49 +0300 Update THANKS. - THANKS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + THANKS | 2 ++ + 1 file changed, 2 insertions(+) commit 5e3499059515033d1ce44b6fb0fa49183c7ac633 Author: Martin Väth <vaeth@mathematik.uni-wuerzburg.de> @@ -125,8 +1125,8 @@ Date: 2011-04-15 04:54:49 -0400 Signed-off-by: Martin Väth <vaeth@mathematik.uni-wuerzburg.de> Signed-off-by: Mike Frysinger <vapier@gentoo.org> - src/scripts/xzgrep.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/scripts/xzgrep.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 1125611b9b8d4a209b6a73d2c76e1b39c065972a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -141,12 +1141,12 @@ Date: 2011-04-12 11:59:49 +0300 Thanks to Jim Meyering for the original patch. - doc/lzma-file-format.txt | 4 ++-- - src/liblzma/common/alone_encoder.c | 2 +- - src/liblzma/lzma/lzma2_encoder.c | 2 +- - src/xz/file_io.c | 2 +- - src/xz/xz.1 | 2 +- - windows/INSTALL-Windows.txt | 2 +- + doc/lzma-file-format.txt | 4 ++-- + src/liblzma/common/alone_encoder.c | 2 +- + src/liblzma/lzma/lzma2_encoder.c | 2 +- + src/xz/file_io.c | 2 +- + src/xz/xz.1 | 2 +- + windows/INSTALL-Windows.txt | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) commit 3f8fa53837bae8b44f3addf19923e26401336c3d @@ -155,8 +1155,8 @@ Date: 2011-04-11 21:04:13 +0300 liblzma: Document lzma_easy_(enc|dec)oder_memusage() better too. - src/liblzma/api/lzma/container.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/container.h | 9 +++++++++ + 1 file changed, 9 insertions(+) commit 320d734c20d0776e3eb80f6b5984ddeb494715b5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -167,8 +1167,8 @@ Date: 2011-04-11 20:59:07 +0300 It didn't mention the return value that is used if an error occurs. - src/liblzma/api/lzma/filter.h | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + src/liblzma/api/lzma/filter.h | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) commit 2ee4edeffc8d9734bf68230df31b20ac6a94c9b5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -183,8 +1183,8 @@ Date: 2011-04-11 13:59:50 +0300 files to be corrupt. I thought that no encoder creates empty Blocks when releasing 5.0.2 but I was wrong. - src/liblzma/common/stream_buffer_encoder.c | 20 +++++++++++++------- - 1 files changed, 13 insertions(+), 7 deletions(-) + src/liblzma/common/stream_buffer_encoder.c | 20 +++++++++++++------- + 1 file changed, 13 insertions(+), 7 deletions(-) commit 73f56fb87d54091d0c4fd22d70e6f042902e3b63 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -195,9 +1195,9 @@ Date: 2011-04-11 13:28:40 +0300 This return value was missing from the API comments of four functions. - src/liblzma/api/lzma/block.h | 1 + - src/liblzma/api/lzma/container.h | 3 +++ - 2 files changed, 4 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/block.h | 1 + + src/liblzma/api/lzma/container.h | 3 +++ + 2 files changed, 4 insertions(+) commit 4ce1cf97a88ae1640a380dd19cbc255d729f966b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -212,9 +1212,9 @@ Date: 2011-04-11 13:21:28 +0300 an unsupport Check ID, so this bug is unlikely to cause many real-world problems. - src/liblzma/common/block_buffer_encoder.c | 18 ++++++++++++------ - src/liblzma/common/block_encoder.c | 5 +++++ - src/liblzma/common/stream_buffer_encoder.c | 3 +++ + src/liblzma/common/block_buffer_encoder.c | 18 ++++++++++++------ + src/liblzma/common/block_encoder.c | 5 +++++ + src/liblzma/common/stream_buffer_encoder.c | 3 +++ 3 files changed, 20 insertions(+), 6 deletions(-) commit 972f05d7a4268dbe42573701f83faa45d03249eb @@ -223,8 +1223,8 @@ Date: 2011-04-09 18:29:30 +0300 Update THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 28154eeaf6e3442cd1e174f4e81266d60c4dac60 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -237,8 +1237,8 @@ Date: 2011-04-09 18:28:58 +0300 Thanks to Jason Gorski for the patch. - src/liblzma/common/filter_common.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/liblzma/common/filter_common.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit aa95516d3d509c6b7895ee519004afcf500a0759 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -250,8 +1250,8 @@ Date: 2011-04-02 14:49:56 +0300 every time the lzma_stream is reinitialized. With the xz tool, this happens when compressing multiple files. - src/liblzma/common/stream_encoder.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/stream_encoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 58f52c72f49562a08042da9a2f4bbdf4dd162d0c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -259,8 +1259,8 @@ Date: 2011-04-01 08:47:46 +0300 Bumped version and liblzma soname to 5.0.2. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 162779682e01d15f0ce386ef7f40d1be05ad0053 @@ -269,8 +1269,8 @@ Date: 2011-04-01 08:47:20 +0300 Updated NEWS for 5.0.2. - NEWS | 18 ++++++++++++++++++ - 1 files changed, 18 insertions(+), 0 deletions(-) + NEWS | 18 ++++++++++++++++++ + 1 file changed, 18 insertions(+) commit 45553f9b4b0175c292023010dc41520347004852 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -278,8 +1278,8 @@ Date: 2011-03-31 15:06:58 +0300 Update INSTALL with another note about IRIX. - INSTALL | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + INSTALL | 4 ++++ + 1 file changed, 4 insertions(+) commit af9d48d5515eadef689b1ce9ffb91e4dbcbc7f35 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -287,9 +1287,9 @@ Date: 2011-03-31 12:22:55 +0300 Tests: Add a new file to test empty LZMA2 streams. - tests/files/README | 4 ++++ - tests/files/good-1-lzma2-5.xz | Bin 0 -> 52 bytes - 2 files changed, 4 insertions(+), 0 deletions(-) + tests/files/README | 4 ++++ + tests/files/good-1-lzma2-5.xz | Bin 0 -> 52 bytes + 2 files changed, 4 insertions(+) commit d099ef9f517b59ab8e3b6f6aa0543c3643983470 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -302,8 +1302,8 @@ Date: 2011-03-31 11:54:48 +0300 creates empty LZMA2 streams in .xz. This bug is more likely to cause problems in applications that use raw LZMA2 streams. - src/liblzma/lzma/lzma2_decoder.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + src/liblzma/lzma/lzma2_decoder.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit df87249b26e79a75fd91041e85512944fc247b57 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -315,8 +1315,8 @@ Date: 2011-03-24 01:42:49 +0200 Thanks to Gregory Margo. - src/scripts/xzgrep.in | 8 ++++++-- - 1 files changed, 6 insertions(+), 2 deletions(-) + src/scripts/xzgrep.in | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) commit 68c453e1c7b09dc9c7d2ef9d994c46f5b367f5d3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -324,8 +1324,8 @@ Date: 2011-03-24 01:22:18 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit b441d39855516ae618faffd5156261b8b413394f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -341,8 +1341,8 @@ Date: 2011-03-24 01:21:32 +0200 Thanks to Gregory Margo. - src/scripts/xzgrep.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/scripts/xzgrep.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 82d5164839517f55daeadd9ee88c76425db30224 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -353,8 +1353,8 @@ Date: 2011-02-04 22:49:31 +0200 struct suffix_pair isn't needed in compresed_name() so get rid of it there. - src/xz/suffix.c | 44 ++++++++++++++++++++------------------------ - 1 files changed, 20 insertions(+), 24 deletions(-) + src/xz/suffix.c | 44 ++++++++++++++++++++------------------------ + 1 file changed, 20 insertions(+), 24 deletions(-) commit 6decc8b41882c2250f0450eb87b83c9fbf495e95 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -366,8 +1366,8 @@ Date: 2011-02-04 11:29:47 +0200 file because it already has the suffix .test. The man page had it documented this way already. - src/xz/suffix.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/xz/suffix.c | 9 +++++++++ + 1 file changed, 9 insertions(+) commit ecda90061df8d39399e707e5c76c2ec0a0f400e5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -375,8 +1375,8 @@ Date: 2011-02-02 23:01:51 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 0fda1ae5b1aa0a5c629a09e5228db8ba1cd0dd5f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -386,9 +1386,9 @@ Date: 2011-02-02 23:00:33 +0200 Thanks to Jakub Bogusz. - po/LINGUAS | 1 + - po/pl.po | 825 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 826 insertions(+), 0 deletions(-) + po/LINGUAS | 1 + + po/pl.po | 825 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 826 insertions(+) commit 00be32978fedc5038748438bf685ac1713d1db83 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -396,8 +1396,8 @@ Date: 2011-02-02 22:24:00 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 7232fcf96bf4bd5f9cd4fc6c93ca2912c665e004 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -405,8 +1405,8 @@ Date: 2011-01-28 20:26:38 +0200 Bump package version and liblzma soname to 5.0.1. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 5fbce0b8d96dc96775aa0215e3581addc830e23d @@ -415,8 +1415,8 @@ Date: 2011-01-28 20:16:57 +0200 Update NEWS for 5.0.1. - NEWS | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + NEWS | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) commit 03ebd1bbb314f9f204940219a835c883bf442475 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -430,8 +1430,8 @@ Date: 2011-01-26 12:19:08 +0200 Thanks to Charles Wilson. - src/xz/file_io.c | 15 +++++++-------- - 1 files changed, 7 insertions(+), 8 deletions(-) + src/xz/file_io.c | 15 +++++++-------- + 1 file changed, 7 insertions(+), 8 deletions(-) commit 7bd0a5e7ccc354f7c2e95c8bc27569c820f6a136 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -439,8 +1439,8 @@ Date: 2011-01-18 21:25:24 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit f71c4e16e913f660977526f0ef8d2acdf458d7c9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -450,9 +1450,9 @@ Date: 2011-01-18 21:23:50 +0200 Thanks to Cristian Rodríguez for the original patch. - src/common/sysdefs.h | 6 ++++++ - src/liblzma/common/common.h | 2 +- - src/xz/util.h | 5 +++-- + src/common/sysdefs.h | 6 ++++++ + src/liblzma/common/common.h | 2 +- + src/xz/util.h | 5 +++-- 3 files changed, 10 insertions(+), 3 deletions(-) commit 316cbe24465143edde8f6ffb7532834b7b2ea93f @@ -461,8 +1461,8 @@ Date: 2010-12-13 16:36:33 +0200 Scripts: Fix gzip and bzip2 support in xzdiff. - src/scripts/xzdiff.in | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + src/scripts/xzdiff.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) commit 9311774c493c19deab51ded919dcd2e9c4aa2829 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -470,8 +1470,8 @@ Date: 2010-12-12 21:23:55 +0200 Build: Enable ASM on DJGPP by default. - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4a42aaee282fc73b482581684d65110506d5efdd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -479,8 +1479,8 @@ Date: 2010-12-12 16:09:42 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit ce56f63c41ee210e6308090eb6d49221fdf67d6c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -492,8 +1492,8 @@ Date: 2010-12-12 16:07:11 +0200 Thanks to Juan Manuel Guerrero. - src/common/sysdefs.h | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/common/sysdefs.h | 9 +++++++++ + 1 file changed, 9 insertions(+) commit e6baedddcf54e7da049ebc49183565b99facd4c7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -504,8 +1504,8 @@ Date: 2010-12-12 14:50:04 +0200 Juan Manuel Guerrero had fixed this in his XZ Utils port to DOS/DJGPP. The bug affects also Windows and OS/2. - src/xz/suffix.c | 33 +++++++++++++++++++++++++++++---- - 1 files changed, 29 insertions(+), 4 deletions(-) + src/xz/suffix.c | 33 +++++++++++++++++++++++++++++---- + 1 file changed, 29 insertions(+), 4 deletions(-) commit b7afd3e22a8fac115b75c738d40d3eb1de7e286f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -515,8 +1515,8 @@ Date: 2010-12-07 18:52:04 +0200 Thanks to Petr Hubený and Marek Černocký. - po/cs.po | 88 +++++++++++++++++++++++++++++++------------------------------- - 1 files changed, 44 insertions(+), 44 deletions(-) + po/cs.po | 88 ++++++++++++++++++++++++++++++++-------------------------------- + 1 file changed, 44 insertions(+), 44 deletions(-) commit 3e564704bc6f463cb2db11e3f3f0dbd71d85992e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -524,8 +1524,8 @@ Date: 2010-11-15 14:28:26 +0200 liblzma: Document the return value of lzma_lzma_preset(). - src/liblzma/api/lzma/lzma.h | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/lzma.h | 3 +++ + 1 file changed, 3 insertions(+) commit 2964d8d691ed92abdcf214888d79ad6d79774735 Author: Jonathan Nieder <jrnieder@gmail.com> @@ -549,8 +1549,8 @@ Date: 2010-11-12 15:22:13 -0600 Fixes: http://bugs.debian.org/572273 - Doxyfile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 37c25658efd25b034266daf87cd381d20d1df776 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -563,9 +1563,9 @@ Date: 2010-10-26 15:48:48 +0300 Makefile.am. Thus, they didn't get included in the source package at all by "make dist". - Makefile.am | 5 +++++ - windows/build.bash | 3 ++- - 2 files changed, 7 insertions(+), 1 deletions(-) + Makefile.am | 5 +++++ + windows/build.bash | 3 ++- + 2 files changed, 7 insertions(+), 1 deletion(-) commit e45929260cd902036efd40c5610a8d0a50d5712b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -573,8 +1573,8 @@ Date: 2010-10-23 17:25:52 +0300 Build: Fix mydist rule when .git doesn't exist. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit 6e1326fcdf6b6209949be57cfe3ad4b781b65168 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -582,8 +1582,8 @@ Date: 2010-10-23 14:15:35 +0300 Add NEWS for 5.0.0. - NEWS | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 62 insertions(+), 0 deletions(-) + NEWS | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 62 insertions(+) commit b667a3ef6338a2c1db7b7706b1f6c99ea392221c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -591,8 +1591,8 @@ Date: 2010-10-23 14:02:53 +0300 Bump version to 5.0.0 and liblzma version-info to 5:0:0. - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/version.h | 8 ++++---- + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/version.h | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) commit 8c947e9291691629714dafb4536c718b6cc24fbd @@ -607,8 +1607,8 @@ Date: 2010-10-23 12:30:54 +0300 a reserved member to some other value, so the old liblzma version need to catch it as an unsupported feature. - src/liblzma/common/common.c | 14 ++++++++++++++ - 1 files changed, 14 insertions(+), 0 deletions(-) + src/liblzma/common/common.c | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) commit e61d85e082743ebd2dd0ff28fc0a82482ede0538 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -622,8 +1622,8 @@ Date: 2010-10-23 12:26:33 +0300 good to use the better replacements provided by MinGW(-w64) runtime. - src/common/sysdefs.h | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + src/common/sysdefs.h | 5 +++++ + 1 file changed, 5 insertions(+) commit 23e23f1dc029146714c9a98313ab3ea93d71a2fc Author: Lasse Collin <lasse.collin@tukaani.org> @@ -633,8 +1633,8 @@ Date: 2010-10-23 12:21:32 +0300 This lets compiler use shifting instead of 64-bit division. - src/liblzma/common/index.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/index.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 613939fc82603b75b59eee840871a05bc8dd08e0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -642,9 +1642,9 @@ Date: 2010-10-23 12:20:11 +0300 liblzma: A few ABI tweaks to reserve space in structures. - src/liblzma/api/lzma/base.h | 7 ++++++- - src/liblzma/api/lzma/lzma.h | 4 ++-- - src/liblzma/api/lzma/stream_flags.h | 4 ---- + src/liblzma/api/lzma/base.h | 7 ++++++- + src/liblzma/api/lzma/lzma.h | 4 ++-- + src/liblzma/api/lzma/stream_flags.h | 4 ---- 3 files changed, 8 insertions(+), 7 deletions(-) commit 68b83f252df3d27480a9f6f03445d16f6506fef1 @@ -653,8 +1653,8 @@ Date: 2010-10-21 23:16:11 +0300 xz: Make sure that message_strm() can never return NULL. - src/xz/message.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + src/xz/message.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) commit d09c5753e33ff96ee57edb6d1e98e34041203695 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -665,20 +1665,20 @@ Date: 2010-10-21 23:06:31 +0300 Adding support for LZMA_FINISH for Index encoding and decoding needed tiny additions to the relevant .c files too. - src/liblzma/api/lzma.h | 4 +- - src/liblzma/api/lzma/base.h | 38 +++++++++++++------------- - src/liblzma/api/lzma/bcj.h | 4 +- - src/liblzma/api/lzma/block.h | 4 +- - src/liblzma/api/lzma/container.h | 26 +++++++++++------ - src/liblzma/api/lzma/filter.h | 51 +++++++++++++++++------------------ - src/liblzma/api/lzma/hardware.h | 3 +- - src/liblzma/api/lzma/index.h | 28 +++++++++++------- - src/liblzma/api/lzma/index_hash.h | 2 +- - src/liblzma/api/lzma/lzma.h | 46 +++++++++++++++++++++---------- - src/liblzma/api/lzma/stream_flags.h | 4 +- - src/liblzma/api/lzma/vli.h | 31 ++++++++++----------- - src/liblzma/common/index_decoder.c | 1 + - src/liblzma/common/index_encoder.c | 1 + + src/liblzma/api/lzma.h | 4 +-- + src/liblzma/api/lzma/base.h | 38 +++++++++++++-------------- + src/liblzma/api/lzma/bcj.h | 4 +-- + src/liblzma/api/lzma/block.h | 4 +-- + src/liblzma/api/lzma/container.h | 26 ++++++++++++------- + src/liblzma/api/lzma/filter.h | 51 ++++++++++++++++++------------------- + src/liblzma/api/lzma/hardware.h | 3 +-- + src/liblzma/api/lzma/index.h | 28 ++++++++++++-------- + src/liblzma/api/lzma/index_hash.h | 2 +- + src/liblzma/api/lzma/lzma.h | 46 ++++++++++++++++++++++----------- + src/liblzma/api/lzma/stream_flags.h | 4 +-- + src/liblzma/api/lzma/vli.h | 31 +++++++++++----------- + src/liblzma/common/index_decoder.c | 1 + + src/liblzma/common/index_encoder.c | 1 + 14 files changed, 136 insertions(+), 107 deletions(-) commit 33c1c0e102eb529588503b8beea0903a45488fad @@ -687,8 +1687,8 @@ Date: 2010-10-19 12:08:30 +0300 Update INSTALL.generic. - INSTALL.generic | 99 +++++++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 81 insertions(+), 18 deletions(-) + INSTALL.generic | 99 ++++++++++++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 81 insertions(+), 18 deletions(-) commit 0076e03641f201c4b77dddd5a6db5880be19a78c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -699,12 +1699,12 @@ Date: 2010-10-19 11:44:37 +0300 lzma_chunk_size() was commented out because it is currently useless. - src/liblzma/common/filter_encoder.c | 2 ++ - src/liblzma/common/filter_encoder.h | 4 ++-- - src/liblzma/lzma/lzma2_decoder.c | 1 - - src/liblzma/lzma/lzma_decoder.c | 4 ++-- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/xz/message.h | 2 +- + src/liblzma/common/filter_encoder.c | 2 ++ + src/liblzma/common/filter_encoder.h | 4 ++-- + src/liblzma/lzma/lzma2_decoder.c | 1 - + src/liblzma/lzma/lzma_decoder.c | 4 ++-- + src/liblzma/lzma/lzma_encoder.c | 2 +- + src/xz/message.h | 2 +- 6 files changed, 8 insertions(+), 7 deletions(-) commit ce34ec4f54ff8b753da236f371ad8dd23c8135c9 @@ -713,10 +1713,10 @@ Date: 2010-10-19 10:21:08 +0300 Update docs. - INSTALL | 192 +++++++++++++++++++++++++++++++++++++++++------------------- - PACKAGERS | 104 +++++++++------------------------ - TODO | 17 ++++-- - dos/README | 2 +- + INSTALL | 192 +++++++++++++++++++++++++++++++++++++++++-------------------- + PACKAGERS | 104 +++++++++------------------------ + TODO | 17 ++++-- + dos/README | 2 +- 4 files changed, 172 insertions(+), 143 deletions(-) commit f0fa880d247e73264d2c04fe31fb3412318a0026 @@ -728,8 +1728,8 @@ Date: 2010-10-12 15:13:30 +0300 This is similar to DOS/DJGPP that killing the program with a signal will print a backtrace or a similar message. - src/xz/signals.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/signals.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit ac462b1c47c451f5c62e428306314c4bdad8ae7f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -741,9 +1741,9 @@ Date: 2010-10-11 21:26:19 +0300 at least from OpenVMS, QNX, and DJGPP). Luckily we can do fine without SA_RESTART. - src/xz/message.c | 38 +++++++++++++++----------------------- - src/xz/message.h | 4 ++++ - src/xz/signals.c | 6 ++++++ + src/xz/message.c | 38 +++++++++++++++----------------------- + src/xz/message.h | 4 ++++ + src/xz/signals.c | 6 ++++++ 3 files changed, 25 insertions(+), 23 deletions(-) commit d52b411716a614c202e89ba732492efb9916cd3f @@ -752,8 +1752,8 @@ Date: 2010-10-10 17:58:58 +0300 xz: Use "%"PRIu32 instead of "%d" in a format string. - src/xz/message.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit ae74d1bdeb075c3beefe76e1136c5741804e7e91 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -766,8 +1766,8 @@ Date: 2010-10-10 17:43:26 +0300 Thanks to Elbert Pol. - tests/test_files.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/test_files.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d492b80ddd6f9a13419de6d102df7374d8f448e8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -775,8 +1775,8 @@ Date: 2010-10-10 16:49:01 +0300 lzmainfo: Use "%"PRIu32 instead of "%u" for uint32_t. - src/lzmainfo/lzmainfo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzmainfo/lzmainfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 825e859a9054bd91202e5723c41a17e72f63040a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -784,8 +1784,8 @@ Date: 2010-10-10 16:47:01 +0300 lzmainfo: Use fileno(stdin) instead of STDIN_FILENO. - src/lzmainfo/lzmainfo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzmainfo/lzmainfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit acbc4cdecbeec2a4dfaac04f185ece49b2ff17c8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -793,8 +1793,8 @@ Date: 2010-10-09 23:20:51 +0300 lzmainfo: Use setmode() on DOS-like systems. - src/lzmainfo/lzmainfo.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/lzmainfo/lzmainfo.c | 9 +++++++++ + 1 file changed, 9 insertions(+) commit ef364d3abc5647111c5424ea0d83a567e184a23b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -806,8 +1806,8 @@ Date: 2010-10-09 21:51:03 +0300 is a bit verbose on OS/2 and DOS/DJGPP. Instead of calling raise(), set only the exit status to 1. - src/xz/signals.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + src/xz/signals.c | 7 +++++++ + 1 file changed, 7 insertions(+) commit 5629c4be07b6c67e79842b2569da1cedc9c0d69a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -817,9 +1817,9 @@ Date: 2010-10-09 19:28:49 +0300 This is now simpler and builds only xz.exe. - dos/Makefile | 211 ++++++++++++++-------------------------------------------- - dos/README | 73 +++++++-------------- - dos/config.h | 45 +++--------- + dos/Makefile | 211 +++++++++++++++-------------------------------------------- + dos/README | 73 +++++++-------------- + dos/config.h | 45 ++++--------- 3 files changed, 86 insertions(+), 243 deletions(-) commit f25a77e6b9bc48a243ddfbbd755b7960eec7e0ac @@ -828,8 +1828,8 @@ Date: 2010-10-09 18:57:55 +0300 Windows: Put some license info into README-Windows.txt. - windows/README-Windows.txt | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + windows/README-Windows.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit e75100f549f85d231df25c07aa94d63e78e2d668 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -837,8 +1837,8 @@ Date: 2010-10-09 18:57:04 +0300 Windows: Fix a diagnostics bug in build.bash. - windows/build.bash | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + windows/build.bash | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit efeb998a2b1025df1c1d202cc7d21d866cd1c336 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -846,9 +1846,9 @@ Date: 2010-10-09 13:02:15 +0300 lzmainfo: Add Windows resource file. - src/lzmainfo/Makefile.am | 9 +++++++++ - src/lzmainfo/lzmainfo_w32res.rc | 12 ++++++++++++ - 2 files changed, 21 insertions(+), 0 deletions(-) + src/lzmainfo/Makefile.am | 9 +++++++++ + src/lzmainfo/lzmainfo_w32res.rc | 12 ++++++++++++ + 2 files changed, 21 insertions(+) commit 389d418445f1623593dfdbba55d52fbb6d1205f5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -856,8 +1856,8 @@ Date: 2010-10-09 12:57:25 +0300 Add missing public domain notice to lzmadec_w32res.rc. - src/xzdec/lzmadec_w32res.rc | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + src/xzdec/lzmadec_w32res.rc | 7 +++++++ + 1 file changed, 7 insertions(+) commit 6389c773a4912dd9f111256d74ba1605230a7957 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -865,8 +1865,8 @@ Date: 2010-10-09 12:52:12 +0300 Windows: Update common_w32res.rc. - src/common/common_w32res.rc | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) + src/common/common_w32res.rc | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) commit 71275457ca24c9b01721f5cfc3638cf094daf454 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -884,8 +1884,8 @@ Date: 2010-10-09 12:27:08 +0300 though MinGW's home page claims that it is public domain. See <http://marc.info/?l=mingw-users&m=126489506214078>. - windows/build.bash | 18 +++++++++--------- - 1 files changed, 9 insertions(+), 9 deletions(-) + windows/build.bash | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) commit 3ac35719d8433af937af6491383d4a50e343099b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -896,8 +1896,8 @@ Date: 2010-10-09 11:33:21 +0300 Also, put README-Windows.txt to the doc directory like the other documentation files. - windows/build.bash | 14 ++++++++++++-- - 1 files changed, 12 insertions(+), 2 deletions(-) + windows/build.bash | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) commit 7b5db576fd7a4a67813b8437a9ccd4dbc94bbaae Author: Lasse Collin <lasse.collin@tukaani.org> @@ -907,8 +1907,8 @@ Date: 2010-10-08 21:42:37 +0300 630a8beda34af0ac153c8051b1bf01230558e422 wasn't good. - windows/build.bash | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + windows/build.bash | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit d3cd7abe85ec7c2f46cf198b15c00d5d119df3dd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -924,8 +1924,8 @@ Date: 2010-10-08 16:53:20 +0300 This change affects only lzmainfo. Other tools were already using LZMA_VERSION_STRING. - src/lzmainfo/lzmainfo.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzmainfo/lzmainfo.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 084c60d318f2dbaef4078d9b100b4a373d0c3a7f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -933,8 +1933,8 @@ Date: 2010-10-08 15:59:25 +0300 configure.ac: Remove two unused defines. - configure.ac | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) + configure.ac | 4 ---- + 1 file changed, 4 deletions(-) commit 11f51b6714357cb67ec7e56ed9575c199b5581fe Author: Lasse Collin <lasse.collin@tukaani.org> @@ -942,9 +1942,9 @@ Date: 2010-10-08 15:32:29 +0300 Make tests accommodate missing xz or xzdec. - tests/test_compress.sh | 45 +++++++++++++++++++++++++++++---------------- - tests/test_files.sh | 28 ++++++++++++++++++++++++++-- - 2 files changed, 55 insertions(+), 18 deletions(-) + tests/test_compress.sh | 47 ++++++++++++++++++++++++++++++----------------- + tests/test_files.sh | 28 ++++++++++++++++++++++++++-- + 2 files changed, 56 insertions(+), 19 deletions(-) commit b1c7368f95e93ccdefdd0748e04398c26766f47f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -952,11 +1952,11 @@ Date: 2010-10-08 15:25:45 +0300 Build: Add options to disable individual command line tools. - configure.ac | 38 ++++++++++++++++++++++++++++ - src/Makefile.am | 15 ++++++++++- - src/scripts/Makefile.am | 62 +++++++++++++++++++--------------------------- - src/xz/Makefile.am | 6 ++++- - src/xzdec/Makefile.am | 12 +++++++- + configure.ac | 38 ++++++++++++++++++++++++++++++ + src/Makefile.am | 15 +++++++++++- + src/scripts/Makefile.am | 62 +++++++++++++++++++++---------------------------- + src/xz/Makefile.am | 6 ++++- + src/xzdec/Makefile.am | 12 ++++++++-- 5 files changed, 93 insertions(+), 40 deletions(-) commit 630a8beda34af0ac153c8051b1bf01230558e422 @@ -965,8 +1965,8 @@ Date: 2010-10-07 00:44:53 +0300 Windows: Make build.bash work without --enable-dynamic=no. - windows/build.bash | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + windows/build.bash | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit f9907503f882a745dce9d84c2968f6c175ba966a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -986,12 +1986,12 @@ Date: 2010-10-05 14:13:16 +0300 needs to support some other toolchain on Windows in the future, this may need some rethinking. - configure.ac | 74 ---------------------------------------------- - debug/Makefile.am | 5 +-- - src/lzmainfo/Makefile.am | 4 +-- - src/xz/Makefile.am | 4 +-- - src/xzdec/Makefile.am | 4 +-- - tests/Makefile.am | 5 +-- + configure.ac | 74 ------------------------------------------------ + debug/Makefile.am | 5 +--- + src/lzmainfo/Makefile.am | 4 +-- + src/xz/Makefile.am | 4 +-- + src/xzdec/Makefile.am | 4 +-- + tests/Makefile.am | 5 +--- 6 files changed, 5 insertions(+), 91 deletions(-) commit fda4724d8114fccfa31c1839c15479f350c2fb4c @@ -1000,8 +2000,8 @@ Date: 2010-10-05 12:18:58 +0300 configure.ac: Silence a warning from Autoconf 2.68. - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 80b5675fa62c87426fe86f8fcd20feeabc4361b9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1011,8 +2011,8 @@ Date: 2010-10-04 19:43:01 +0300 Thanks to Jonathan Nieder. - src/xz/xz.1 | 45 ++++++++++++++++++++++++--------------------- - 1 files changed, 24 insertions(+), 21 deletions(-) + src/xz/xz.1 | 45 ++++++++++++++++++++++++--------------------- + 1 file changed, 24 insertions(+), 21 deletions(-) commit f9722dbeca4dc4c43cfd15d122dafaac50b0a0bb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1020,8 +2020,8 @@ Date: 2010-10-02 12:07:33 +0300 Update the FAQ. - doc/faq.txt | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 100 insertions(+), 4 deletions(-) + doc/faq.txt | 104 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 100 insertions(+), 4 deletions(-) commit 61ae593661e8dc402394e84d567ca2044a51572b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1029,8 +2029,8 @@ Date: 2010-10-02 11:38:20 +0300 liblzma: Small fixes to comments in the API headers. - src/liblzma/api/lzma/lzma.h | 10 +++++++--- - 1 files changed, 7 insertions(+), 3 deletions(-) + src/liblzma/api/lzma/lzma.h | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) commit 9166682dc601fd42c1b9510572e3f917d18de504 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1038,8 +2038,8 @@ Date: 2010-09-28 11:40:12 +0300 Create the PDF versions of the man pages better. - Makefile.am | 14 +++++++----- - build-aux/manconv.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 14 +++++++------ + build-aux/manconv.sh | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 66 insertions(+), 6 deletions(-) commit 17d3c61edd35de8fa884944fc70d1db86daa5dd8 @@ -1048,11 +2048,11 @@ Date: 2010-09-28 10:59:53 +0300 Move version.sh to build-aux. - Makefile.am | 4 ++-- - build-aux/version.sh | 24 ++++++++++++++++++++++++ - configure.ac | 2 +- - version.sh | 24 ------------------------ - windows/build.bash | 2 +- + Makefile.am | 4 ++-- + build-aux/version.sh | 24 ++++++++++++++++++++++++ + configure.ac | 2 +- + version.sh | 24 ------------------------ + windows/build.bash | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) commit 84af9d8770451339a692e9b70f96cf56156a6069 @@ -1061,8 +2061,8 @@ Date: 2010-09-28 10:53:02 +0300 Update .gitignore. - .gitignore | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) + .gitignore | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) commit 31575a449ac64c523da3bab8d0c0b522cdc7c780 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1070,8 +2070,8 @@ Date: 2010-09-28 01:17:14 +0300 Fix accomodate -> accommodate on the xz man page. - src/xz/xz.1 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit cec0ddc8ec4ce81685a51998b978e22167e461f9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1094,7 +2094,7 @@ Date: 2010-09-27 23:29:34 +0300 src/scripts/xzgrep.1 | 11 +- src/scripts/xzless.1 | 13 +- src/scripts/xzmore.1 | 9 +- - src/xz/xz.1 | 1964 ++++++++++++++++++++++++++++++++-------------- + src/xz/xz.1 | 1964 ++++++++++++++++++++++++++++++++--------------- src/xzdec/xzdec.1 | 39 +- 7 files changed, 1435 insertions(+), 641 deletions(-) @@ -1106,8 +2106,8 @@ Date: 2010-09-26 18:10:31 +0300 depth=0 was missing. - src/liblzma/lzma/lzma_encoder_presets.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/lzma/lzma_encoder_presets.c | 1 + + 1 file changed, 1 insertion(+) commit 2577da9ebdba13fbe99ae5ee8bde35f7ed60f6d1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1118,8 +2118,8 @@ Date: 2010-09-23 14:03:10 +0300 translations.bash prints some messages from xz, which hopefully makes it a bit easier to test translations. - README | 96 ++++++++++++++++++++++++++++++++++++++++++++-- - debug/translation.bash | 100 ++++++++++++++++++++++++++++++++++++++++++++++++ + README | 96 +++++++++++++++++++++++++++++++++++++++++++++-- + debug/translation.bash | 100 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 4 deletions(-) commit a3c5997c57e5b1a20aae6d1071b584b4f17d0b23 @@ -1130,8 +2130,8 @@ Date: 2010-09-17 22:14:30 +0300 Thanks to Marek Černocký. - po/cs.po | 202 ++++++++++++++++++++++++++++++++++++++++---------------------- - 1 files changed, 131 insertions(+), 71 deletions(-) + po/cs.po | 202 +++++++++++++++++++++++++++++++++++++++++---------------------- + 1 file changed, 131 insertions(+), 71 deletions(-) commit a1766af582dc23fddd9da1eeb4b9d61e3eb4c2e6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1141,10 +2141,10 @@ Date: 2010-09-16 23:40:41 +0300 Thanks to Milo Casagrande and Lorenzo De Liso. - THANKS | 2 + - po/LINGUAS | 1 + - po/it.po | 902 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 905 insertions(+), 0 deletions(-) + THANKS | 2 + + po/LINGUAS | 1 + + po/it.po | 902 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 905 insertions(+) commit 21088018554e2b0e02914205377ceb6e34a090bd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1152,8 +2152,8 @@ Date: 2010-09-15 00:34:13 +0300 xz: Edit a translators comment. - src/xz/list.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/list.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit be16e28ece1b492b8f93382b7fa1cc4da23c6ff6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1163,10 +2163,10 @@ Date: 2010-09-14 22:47:14 +0300 Thanks to Andre Noll. - THANKS | 1 + - po/LINGUAS | 1 + - po/de.po | 903 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 905 insertions(+), 0 deletions(-) + THANKS | 1 + + po/LINGUAS | 1 + + po/de.po | 903 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 905 insertions(+) commit e23ea74f3240e6b69683f9e69d1716e0f9e9092b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1174,8 +2174,8 @@ Date: 2010-09-10 14:30:25 +0300 Updated README. - README | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + README | 2 -- + 1 file changed, 2 deletions(-) commit 8dad2fd69336985adb9f774fa96dc9c0efcb5a71 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1183,8 +2183,8 @@ Date: 2010-09-10 14:30:07 +0300 Updated INSTALL. - INSTALL | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + INSTALL | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit 0b5f07fe3728c27cce416ddc40f7e4803ae96ac2 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1192,8 +2192,8 @@ Date: 2010-09-10 14:26:20 +0300 Updated the git repository address in ChangeLog. - ChangeLog | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + ChangeLog | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit a8760203f93a69bc39fd14520a6e9e7b7d70be06 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1201,8 +2201,8 @@ Date: 2010-09-10 14:09:33 +0300 xz: Add a comment to translators about "literal context bits". - src/xz/message.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/xz/message.c | 4 ++++ + 1 file changed, 4 insertions(+) commit bb0b1004f83cdc4d309e1471c2ecaf9f95ce60c5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1238,18 +2238,18 @@ Date: 2010-09-10 10:30:33 +0300 Thanks to Marek Černocký for reporting the bug about misaligned table columns in --list output. - configure.ac | 1 + - m4/tuklib_mbstr.m4 | 30 ++++++ - src/common/tuklib_mbstr.h | 66 +++++++++++++ - src/common/tuklib_mbstr_fw.c | 31 ++++++ - src/common/tuklib_mbstr_width.c | 64 ++++++++++++ - src/xz/Makefile.am | 4 +- - src/xz/list.c | 205 ++++++++++++++++++++++++++------------- - src/xz/message.c | 56 +++++++---- - src/xz/message.h | 10 ++- - src/xz/private.h | 1 + - src/xz/util.c | 136 +++++++++----------------- - src/xz/util.h | 7 -- + configure.ac | 1 + + m4/tuklib_mbstr.m4 | 30 ++++++ + src/common/tuklib_mbstr.h | 66 +++++++++++++ + src/common/tuklib_mbstr_fw.c | 31 ++++++ + src/common/tuklib_mbstr_width.c | 64 +++++++++++++ + src/xz/Makefile.am | 4 +- + src/xz/list.c | 205 +++++++++++++++++++++++++++------------- + src/xz/message.c | 56 +++++++---- + src/xz/message.h | 10 +- + src/xz/private.h | 1 + + src/xz/util.c | 136 +++++++++----------------- + src/xz/util.h | 7 -- 12 files changed, 424 insertions(+), 187 deletions(-) commit 639f8e2af33cf8a184d59ba56b6df7c098679d61 @@ -1260,8 +2260,8 @@ Date: 2010-09-08 08:49:22 +0300 Thanks to Marek Černocký. - po/cs.po | 655 +++++++++++++++++++++++++++++++++++++++++++------------------- - 1 files changed, 454 insertions(+), 201 deletions(-) + po/cs.po | 655 +++++++++++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 454 insertions(+), 201 deletions(-) commit 41bc9956ebfd7c86777d33676acf34c45e7ca7c7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1269,8 +2269,8 @@ Date: 2010-09-07 12:31:40 +0300 xz: Add a note to translators. - src/xz/hardware.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + src/xz/hardware.c | 2 ++ + 1 file changed, 2 insertions(+) commit 77a7746616e555fc08028e883a56d06bf0088b81 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1283,8 +2283,8 @@ Date: 2010-09-07 10:42:13 +0300 This also fixes a missing \n from a call to ngettext(). - src/common/tuklib_gettext.h | 4 ++-- - src/xz/list.c | 4 ++-- + src/common/tuklib_gettext.h | 4 ++-- + src/xz/list.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit e6ad39335842343e622ab51207d1d3cb9caad801 @@ -1293,8 +2293,8 @@ Date: 2010-09-06 19:43:12 +0300 Add missing files to POTFILES.in. - po/POTFILES.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + po/POTFILES.in | 3 +++ + 1 file changed, 3 insertions(+) commit 58f55131820d2e08a1a6beb9ec0ee2378044eb30 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1302,8 +2302,8 @@ Date: 2010-09-06 10:16:24 +0300 xz: Improve a comment. - src/xz/file_io.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + src/xz/file_io.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit bcb1b898341f7073f51660d7052d7ed6c5461a66 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1313,8 +2313,8 @@ Date: 2010-09-05 21:34:29 +0300 Thanks to Joerg Sonnenberger. - src/xz/file_io.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + src/xz/file_io.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit da014d55972f5addbf6b4360d3d8ed2ef4282170 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1324,8 +2324,8 @@ Date: 2010-09-05 21:11:33 +0300 Thanks Joerg Sonnenberger. - src/xz/args.c | 2 +- - src/xz/args.h | 2 +- + src/xz/args.c | 2 +- + src/xz/args.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 8c7d3d1a0781c296c6b6e2465becaffd2132f7ee @@ -1334,8 +2334,8 @@ Date: 2010-09-05 12:16:17 +0300 xz: Hopefully ease translating the messages in list.c. - src/xz/list.c | 33 +++++++++++++++++++++++---------- - 1 files changed, 23 insertions(+), 10 deletions(-) + src/xz/list.c | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) commit ef840950ad99cf2955c754875af0e01acf125079 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1343,8 +2343,8 @@ Date: 2010-09-04 23:14:44 +0300 xz: Fix grammar. - src/xz/options.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + src/xz/options.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) commit c46afd6edc04ea140db6c59e8486f5707c810c13 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1352,8 +2352,8 @@ Date: 2010-09-04 23:12:20 +0300 xz: Use lzma_lzma_preset() to initialize the options structure. - src/xz/options.c | 14 ++------------ - 1 files changed, 2 insertions(+), 12 deletions(-) + src/xz/options.c | 14 ++------------ + 1 file changed, 2 insertions(+), 12 deletions(-) commit 8fd3ac046d0b1416a2094fecc456d9e0f4d5d065 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1365,8 +2365,8 @@ Date: 2010-09-04 22:16:28 +0300 compression worse. On the other hand, some other files may now benefit slightly less from --extreme. - src/liblzma/lzma/lzma_encoder_presets.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + src/liblzma/lzma/lzma_encoder_presets.c | 1 - + 1 file changed, 1 deletion(-) commit 474bac0c33e94aeaca8ada17ab19972b1424bc2b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1374,8 +2374,8 @@ Date: 2010-09-04 22:10:32 +0300 xz: Minor improvements to --help and --long-help. - src/xz/message.c | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) + src/xz/message.c | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) commit 373ee26f955617295c5c537b04a153a1969140d2 Author: Jonathan Nieder <jrnieder@gmail.com> @@ -1388,8 +2388,8 @@ Date: 2010-09-03 16:49:15 -0500 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> - tests/test_compress.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/test_compress.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2fce9312f36727ea82f3430cc5d3a7d243c5f087 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1397,8 +2397,8 @@ Date: 2010-09-03 15:54:40 +0300 xz: Make -vv show also decompressor memory usage. - src/xz/coder.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + src/xz/coder.c | 7 +++++++ + 1 file changed, 7 insertions(+) commit b4b1cbcb53624ab832f8b3189c74450dc7ea29b6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1409,8 +2409,8 @@ Date: 2010-09-03 15:13:12 +0300 "Extreme" mode might need some further tweaking still. Docs were not updated yet. - src/liblzma/lzma/lzma_encoder_presets.c | 29 +++++++++++++++++++---------- - 1 files changed, 19 insertions(+), 10 deletions(-) + src/liblzma/lzma/lzma_encoder_presets.c | 29 +++++++++++++++++++---------- + 1 file changed, 19 insertions(+), 10 deletions(-) commit 77fe5954cd3d10fb1837372684cbc133b56b6a87 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1423,8 +2423,8 @@ Date: 2010-09-03 12:28:41 +0300 even though it seems that I won't use automatic depth calcuation with HC3 and HC4 in the presets. - src/liblzma/lz/lz_encoder.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + src/liblzma/lz/lz_encoder.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit fce69059cf901ce8075a78c7607d591f144a3b5a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1436,8 +2436,8 @@ Date: 2010-09-03 11:11:25 +0300 options that take arguments, so "Mandatory arguments to..." can be omitted. - src/xz/message.c | 7 +++++-- - 1 files changed, 5 insertions(+), 2 deletions(-) + src/xz/message.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) commit a848e47ced6e5e2a564b5c454b2f5a19c2f40298 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1448,8 +2448,8 @@ Date: 2010-09-02 19:22:35 +0300 This is more logical behavior than ignoring preset level options once a custom filter chain has been specified. - src/xz/coder.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/xz/coder.c | 9 +++++++++ + 1 file changed, 9 insertions(+) commit b3ff7ba044eaeab3e424d7b51fe914daf681b1a3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1457,8 +2457,8 @@ Date: 2010-09-02 19:09:57 +0300 xz: Always warn if adjusting dictionary size due to memlimit. - src/xz/coder.c | 28 +++++++++------------------- - 1 files changed, 9 insertions(+), 19 deletions(-) + src/xz/coder.c | 28 +++++++++------------------- + 1 file changed, 9 insertions(+), 19 deletions(-) commit d5653ba8a1ea9c00de4fddc617aba3c51e18139d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1470,8 +2470,8 @@ Date: 2010-08-10 11:04:30 +0300 Thanks to Jonathan Nieder. - tests/test_compress.sh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + tests/test_compress.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 792331bdee706aa852a78b171040ebf814c6f3ae Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1506,16 +2506,16 @@ Date: 2010-08-07 20:45:18 +0300 xz's man page was updated to match the above changes. Various unrelated fixes were also made to the man page. - src/xz/args.c | 87 +++++++++----- - src/xz/coder.c | 8 +- - src/xz/hardware.c | 96 ++++++++++----- - src/xz/hardware.h | 23 ++-- - src/xz/list.c | 2 +- - src/xz/message.c | 39 ++----- - src/xz/message.h | 4 - - src/xz/xz.1 | 341 +++++++++++++++++++++++++++++++++-------------------- - src/xzdec/xzdec.1 | 45 +------- - src/xzdec/xzdec.c | 176 +--------------------------- + src/xz/args.c | 87 +++++++++----- + src/xz/coder.c | 8 +- + src/xz/hardware.c | 96 +++++++++------ + src/xz/hardware.h | 23 ++-- + src/xz/list.c | 2 +- + src/xz/message.c | 39 ++----- + src/xz/message.h | 4 - + src/xz/xz.1 | 341 ++++++++++++++++++++++++++++++++++-------------------- + src/xzdec/xzdec.1 | 45 +------ + src/xzdec/xzdec.c | 176 +--------------------------- 10 files changed, 373 insertions(+), 448 deletions(-) commit 4a45dd4c39f75d25c7a37b6400cb24d4010ca801 @@ -1524,8 +2524,8 @@ Date: 2010-08-06 20:22:16 +0300 Add missing const to a global constant in xz. - src/xz/args.c | 2 +- - src/xz/args.h | 2 +- + src/xz/args.c | 2 +- + src/xz/args.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 01aa4869cb220b7fdad6d1acbabb2233045daa8f @@ -1536,8 +2536,8 @@ Date: 2010-07-28 11:44:55 +0300 Thanks to A. Costa and Jonathan Nieder. - src/lzmainfo/lzmainfo.1 | 4 ++-- - src/xz/xz.1 | 6 +++--- + src/lzmainfo/lzmainfo.1 | 4 ++-- + src/xz/xz.1 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) commit ce1f0deafe8504e1492bf1b1efb3e3ec950b1a2b @@ -1546,8 +2546,8 @@ Date: 2010-07-27 20:47:12 +0300 Windows: Add a note about building a Git repository snapshot - windows/INSTALL-Windows.txt | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + windows/INSTALL-Windows.txt | 9 +++++++++ + 1 file changed, 9 insertions(+) commit 507a4a4dea1e5462f12f7ed4b076c34e02054a38 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1555,10 +2555,10 @@ Date: 2010-07-27 20:45:03 +0300 Windows: build.sh is a bash script so name it correctly. - INSTALL | 2 +- - windows/INSTALL-Windows.txt | 6 +- - windows/build.bash | 189 +++++++++++++++++++++++++++++++++++++++++++ - windows/build.sh | 189 ------------------------------------------- + INSTALL | 2 +- + windows/INSTALL-Windows.txt | 6 +- + windows/build.bash | 189 ++++++++++++++++++++++++++++++++++++++++++++ + windows/build.sh | 189 -------------------------------------------- 4 files changed, 193 insertions(+), 193 deletions(-) commit b1cbfd40f049a646a639eb78a3e41e9e3ef73339 @@ -1567,8 +2567,8 @@ Date: 2010-07-27 20:27:32 +0300 Windows: Don't strip liblzma.a too much. - windows/build.sh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + windows/build.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit a540198ffb25fad36380c5e92ac20c2d28eec46a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1576,8 +2576,8 @@ Date: 2010-07-13 20:07:26 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit bab0f01ed931f606b4675aa9f9331a17cec09bad Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1592,9 +2592,9 @@ Date: 2010-07-13 19:55:50 +0300 The examples were written by Daniel Mealha Cabrita. Thanks. - doc/examples/xz_pipe_comp.c | 127 +++++++++++++++++++++++++++++++++++++++++ - doc/examples/xz_pipe_decomp.c | 115 +++++++++++++++++++++++++++++++++++++ - 2 files changed, 242 insertions(+), 0 deletions(-) + doc/examples/xz_pipe_comp.c | 127 ++++++++++++++++++++++++++++++++++++++++++ + doc/examples/xz_pipe_decomp.c | 115 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 242 insertions(+) commit c15c42abb3c8c6e77c778ef06c97a4a10b8b5d00 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1602,11 +2602,11 @@ Date: 2010-06-15 14:06:29 +0300 Add --no-adjust. - src/xz/args.c | 6 ++++++ - src/xz/coder.c | 8 ++------ - src/xz/coder.h | 4 ++++ - src/xz/message.c | 6 +++++- - src/xz/xz.1 | 13 +++++++++++-- + src/xz/args.c | 6 ++++++ + src/xz/coder.c | 8 ++------ + src/xz/coder.h | 4 ++++ + src/xz/message.c | 6 +++++- + src/xz/xz.1 | 13 +++++++++++-- 5 files changed, 28 insertions(+), 9 deletions(-) commit 2130926dd1c839280358172dfadd8d3054bde2b4 @@ -1615,8 +2615,8 @@ Date: 2010-06-11 21:51:32 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit bc612d0e0c9e4504c59d49168e87a7ae3e458443 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1626,8 +2626,8 @@ Date: 2010-06-11 21:48:32 +0300 Thanks to Denis Excoffier. - src/xz/xz.1 | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/xz/xz.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit e1b6935d60a00405e6b5b455a3426d2248cc926c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1637,8 +2637,8 @@ Date: 2010-06-11 21:43:28 +0300 Thanks to Denis Excoffier for the bug report. - src/xz/util.c | 10 ++++++++-- - src/xzdec/xzdec.c | 13 +++++++++++-- + src/xz/util.c | 10 ++++++++-- + src/xzdec/xzdec.c | 13 +++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) commit 3e49c8acb0f5312948eddb2342dbb5802d4571d0 @@ -1647,8 +2647,8 @@ Date: 2010-06-11 10:40:28 +0300 Put the git commit to the filename in mydist rule. - Makefile.am | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + Makefile.am | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) commit d8b41eedce486d400f701b757b7b5e4e32276618 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1656,8 +2656,8 @@ Date: 2010-06-02 23:13:55 +0300 Fix compiling with -Werror. - src/xz/message.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/xz/message.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit b5fbab6123a39c9a55cd5d7af410e9aae067d5f8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1673,8 +2673,8 @@ Date: 2010-06-02 23:09:22 +0300 uninitialized variable. A few people find this annoying so do things a bit differently to avoid the warning. - src/liblzma/lz/lz_encoder.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + src/liblzma/lz/lz_encoder.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) commit 29a7b250e685852f2f97615493ec49acaf528623 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1682,9 +2682,9 @@ Date: 2010-06-02 21:32:12 +0300 Fix a Windows-specific FIXME in signal handling code. - src/xz/main.c | 40 +++++++++++++++++++++++++++++++++++----- - src/xz/private.h | 5 +++++ - src/xz/signals.c | 16 ++++++++-------- + src/xz/main.c | 40 +++++++++++++++++++++++++++++++++++----- + src/xz/private.h | 5 +++++ + src/xz/signals.c | 16 ++++++++-------- 3 files changed, 48 insertions(+), 13 deletions(-) commit e89d987056cee7d4e279be3ef3a6cc690bfc0e6d @@ -1696,8 +2696,8 @@ Date: 2010-06-02 17:46:58 +0300 I want to get a bug report if something else than DJGPP lacks SA_RESTART. - src/xz/message.c | 14 +++++++------- - 1 files changed, 7 insertions(+), 7 deletions(-) + src/xz/message.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) commit e243145c84ab5c3be8259fd486ead0de5235b3f0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1710,8 +2710,8 @@ Date: 2010-06-01 16:02:30 +0300 - Robot mode - A few examples (but many more are needed) - src/xz/xz.1 | 385 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- - 1 files changed, 366 insertions(+), 19 deletions(-) + src/xz/xz.1 | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 366 insertions(+), 19 deletions(-) commit ce6dc3c0a891f23a862f80ec08d3b6f0beb2a562 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1719,8 +2719,8 @@ Date: 2010-06-01 15:51:44 +0300 Major update to xz --list. - src/xz/list.c | 652 +++++++++++++++++++++++++++++++++++++++++---------------- - 1 files changed, 471 insertions(+), 181 deletions(-) + src/xz/list.c | 652 ++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 471 insertions(+), 181 deletions(-) commit 905e54804a899e4ad526d38fdba7e803ab9b71bd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1728,8 +2728,8 @@ Date: 2010-06-01 14:13:03 +0300 Rename message_filters_get() to message_filters_to_str(). - src/xz/message.c | 4 ++-- - src/xz/message.h | 2 +- + src/xz/message.c | 4 ++-- + src/xz/message.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 4b346ae8af20045027ae5efb068c6d69da3324d2 @@ -1738,8 +2738,8 @@ Date: 2010-06-01 14:09:12 +0300 Fix a comment. - src/liblzma/api/lzma/index.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/index.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 07dc34f6da45c9ab757dad7fd5eef522ad27d296 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1747,8 +2747,8 @@ Date: 2010-05-27 16:17:42 +0300 Fix lzma_block_compressed_size(). - src/liblzma/common/block_util.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/liblzma/common/block_util.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 44d70cb154225e47eebf15a3cfbdf3794cbb4593 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1759,8 +2759,8 @@ Date: 2010-05-27 14:32:51 +0300 This change is no-op, but good to have just in case for the future. - src/xz/signals.c | 2 +- - src/xz/signals.h | 4 ++-- + src/xz/signals.c | 2 +- + src/xz/signals.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit a334348dc02803241cf4e0a539eecdc0e7ad2cc7 @@ -1771,9 +2771,9 @@ Date: 2010-05-27 13:42:44 +0300 Thanks to Jonathan Nieder. - src/xz/message.c | 9 --------- - tests/test_filter_flags.c | 23 ----------------------- - 2 files changed, 0 insertions(+), 32 deletions(-) + src/xz/message.c | 9 --------- + tests/test_filter_flags.c | 23 ----------------------- + 2 files changed, 32 deletions(-) commit 70e5e2f6a7084e6af909deee88ceac2f6efa7893 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1783,8 +2783,8 @@ Date: 2010-05-27 13:35:36 +0300 Thanks to Jonathan Nieder for the reminder. - src/liblzma/common/chunk_size.c | 67 --------------------------------------- - 1 files changed, 0 insertions(+), 67 deletions(-) + src/liblzma/common/chunk_size.c | 67 ----------------------------------------- + 1 file changed, 67 deletions(-) commit 01a414eaf4be6352c06b48001b041b47e8202faa Author: Jonathan Nieder <jrnieder@gmail.com> @@ -1795,8 +2795,8 @@ Date: 2010-05-27 02:31:33 -0500 This should have been done in 920a69a8d8e4203c5edddd829d932130eac188ea. - src/xz/list.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/list.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 920a69a8d8e4203c5edddd829d932130eac188ea Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1806,22 +2806,22 @@ Date: 2010-05-26 10:36:46 +0300 This should avoid some minor portability issues. - debug/full_flush.c | 2 +- - debug/sync_flush.c | 2 +- - src/common/sysdefs.h | 12 +++++------- - src/liblzma/common/block_buffer_encoder.c | 2 +- - src/liblzma/common/common.c | 2 +- - src/liblzma/common/stream_buffer_encoder.c | 2 +- - src/liblzma/delta/delta_encoder.c | 2 +- - src/liblzma/lz/lz_decoder.c | 7 ++++--- - src/liblzma/lz/lz_decoder.h | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- - src/liblzma/lz/lz_encoder_mf.c | 4 ++-- - src/liblzma/lzma/lzma2_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 14 +++++++------- - src/xz/args.c | 3 ++- + debug/full_flush.c | 2 +- + debug/sync_flush.c | 2 +- + src/common/sysdefs.h | 12 +++++------- + src/liblzma/common/block_buffer_encoder.c | 2 +- + src/liblzma/common/common.c | 2 +- + src/liblzma/common/stream_buffer_encoder.c | 2 +- + src/liblzma/delta/delta_encoder.c | 2 +- + src/liblzma/lz/lz_decoder.c | 7 ++++--- + src/liblzma/lz/lz_decoder.h | 2 +- + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lz/lz_encoder.h | 2 +- + src/liblzma/lz/lz_encoder_mf.c | 4 ++-- + src/liblzma/lzma/lzma2_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 14 +++++++------- + src/xz/args.c | 3 ++- 16 files changed, 31 insertions(+), 31 deletions(-) commit 019ae27c24d0c694545a6a46f8b9fb552198b015 @@ -1830,8 +2830,8 @@ Date: 2010-05-26 10:30:20 +0300 Fix compilation of debug/known_sizes.c. - debug/known_sizes.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + debug/known_sizes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 98a4856a6ea84f79c790057a6eb89a25bc45b074 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1839,8 +2839,8 @@ Date: 2010-05-26 10:28:54 +0300 Remove references to Subblock filter in debug/sync_flush.c. - debug/sync_flush.c | 13 ------------- - 1 files changed, 0 insertions(+), 13 deletions(-) + debug/sync_flush.c | 13 ------------- + 1 file changed, 13 deletions(-) commit 703d2c33c095c41ae0693ee8c27c45e3847e4535 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1848,8 +2848,8 @@ Date: 2010-05-26 10:16:57 +0300 Better #error message. - src/common/sysdefs.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/common/sysdefs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit d8a55c48b39703dd83f11089ad01e1ff2ac102e0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1861,25 +2861,25 @@ Date: 2010-05-26 09:55:47 +0300 It won't be included in XZ Utils 5.0.0. It's easy to get it back once the spec is done. - configure.ac | 6 +- - src/liblzma/Makefile.am | 5 - - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/subblock.h | 200 ----- - src/liblzma/common/common.h | 6 - - src/liblzma/common/filter_common.c | 9 - - src/liblzma/common/filter_decoder.c | 16 - - src/liblzma/common/filter_encoder.c | 12 - - src/liblzma/subblock/Makefile.inc | 20 - - src/liblzma/subblock/subblock_decoder.c | 630 --------------- - src/liblzma/subblock/subblock_decoder.h | 22 - - src/liblzma/subblock/subblock_decoder_helper.c | 70 -- - src/liblzma/subblock/subblock_decoder_helper.h | 29 - - src/liblzma/subblock/subblock_encoder.c | 984 ------------------------ - src/liblzma/subblock/subblock_encoder.h | 21 - - src/xz/args.c | 9 +- - src/xz/options.c | 61 -- - src/xz/options.h | 7 - + configure.ac | 6 +- + src/liblzma/Makefile.am | 5 - + src/liblzma/api/Makefile.am | 1 - + src/liblzma/api/lzma.h | 1 - + src/liblzma/api/lzma/subblock.h | 200 ----- + src/liblzma/common/common.h | 6 - + src/liblzma/common/filter_common.c | 9 - + src/liblzma/common/filter_decoder.c | 16 - + src/liblzma/common/filter_encoder.c | 12 - + src/liblzma/subblock/Makefile.inc | 20 - + src/liblzma/subblock/subblock_decoder.c | 630 ---------------- + src/liblzma/subblock/subblock_decoder.h | 22 - + src/liblzma/subblock/subblock_decoder_helper.c | 70 -- + src/liblzma/subblock/subblock_decoder_helper.h | 29 - + src/liblzma/subblock/subblock_encoder.c | 984 ------------------------- + src/liblzma/subblock/subblock_encoder.h | 21 - + src/xz/args.c | 9 +- + src/xz/options.c | 61 -- + src/xz/options.h | 7 - 19 files changed, 4 insertions(+), 2105 deletions(-) commit b6377fc990f9b8651149cae0fecb8b9c5904e26d @@ -1895,9 +2895,9 @@ Date: 2010-05-16 18:42:22 +0300 uint32_to_optstr() was also added to show the dictionary size in nicer format when possible. - src/xz/coder.c | 2 +- - src/xz/message.c | 187 ++++++++++++++++++++++++++++++++++------------------- - src/xz/message.h | 14 ++++- + src/xz/coder.c | 2 +- + src/xz/message.c | 187 +++++++++++++++++++++++++++++++++++-------------------- + src/xz/message.h | 14 ++++- 3 files changed, 134 insertions(+), 69 deletions(-) commit d9986db782d6cf0f314342127280519339378fa0 @@ -1909,9 +2909,9 @@ Date: 2010-05-14 23:17:20 +0300 It isn't really useful so omitting it makes things shorter and slightly more readable. - src/liblzma/api/lzma.h | 12 ------------ - src/liblzma/api/lzma/index.h | 5 ++--- - src/liblzma/api/lzma/vli.h | 11 +++++------ + src/liblzma/api/lzma.h | 12 ------------ + src/liblzma/api/lzma/index.h | 5 ++--- + src/liblzma/api/lzma/vli.h | 11 +++++------ 3 files changed, 7 insertions(+), 21 deletions(-) commit 0d3489efca0a723dca0394809fa3e6170843af4b @@ -1920,8 +2920,8 @@ Date: 2010-05-10 19:57:24 +0300 Updated INSTALL. - INSTALL | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) + INSTALL | 5 ----- + 1 file changed, 5 deletions(-) commit 3fb3d594a2b53886adee161b6261e92277f05f7c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1929,8 +2929,8 @@ Date: 2010-05-10 19:54:52 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 6548e304657e77d3a972053db3c41c5daf591113 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1952,10 +2952,10 @@ Date: 2010-05-10 19:54:15 +0300 Thanks a lot to Peter O'Gorman for initial patches, testing, and debugging these fixes. - m4/tuklib_cpucores.m4 | 33 ++++++++++++++++--- - m4/tuklib_physmem.m4 | 72 ++++++++++++++++++++++++++++++++++++++++- - src/common/tuklib_cpucores.c | 14 +++++++- - src/common/tuklib_physmem.c | 33 ++++++++++++++++++- + m4/tuklib_cpucores.m4 | 33 ++++++++++++++++---- + m4/tuklib_physmem.m4 | 72 ++++++++++++++++++++++++++++++++++++++++++-- + src/common/tuklib_cpucores.c | 14 +++++++-- + src/common/tuklib_physmem.c | 33 +++++++++++++++++++- 4 files changed, 141 insertions(+), 11 deletions(-) commit a290cfee3e23f046889c022aa96b4eca2016fdda @@ -1973,8 +2973,8 @@ Date: 2010-04-12 21:55:56 +0300 Thanks to Trent W. Buck for <http://bugs.debian.org/574583> and Jonathan Nieder for suggestions how to fix it. - THANKS | 1 + - src/xz/message.c | 86 ++++++++++++++++++++++++------------------------------ + THANKS | 1 + + src/xz/message.c | 86 +++++++++++++++++++++++++------------------------------- 2 files changed, 39 insertions(+), 48 deletions(-) commit a1f7a986b8d708f9290da9799ca1b8d7082fad3e @@ -1985,9 +2985,9 @@ Date: 2010-03-31 16:47:25 +0300 Thanks to Gilles Espinasse. - THANKS | 1 + - doc/faq.txt | 6 ++++++ - 2 files changed, 7 insertions(+), 0 deletions(-) + THANKS | 1 + + doc/faq.txt | 6 ++++++ + 2 files changed, 7 insertions(+) commit c737eec91d200d730aa82662affd6b06ebb0bff0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -1995,8 +2995,8 @@ Date: 2010-03-22 21:03:03 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit f4b2b52624b802c786e4e2a8eb6895794dd93b24 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2006,8 +3006,8 @@ Date: 2010-03-07 19:52:25 +0200 Thanks to someone who reported the bug on IRC. - src/scripts/xzgrep.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/scripts/xzgrep.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit cf38da00a140bd3bd65b192390ae5553380fd774 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2022,9 +3022,9 @@ Date: 2010-03-07 13:59:32 +0200 KiB, Ki, k, K, kB, and KB, and interpret them all as 1024. The recommended spelling of the suffixes are still KiB, MiB, and GiB. - src/xz/util.c | 53 +++++++++++++++++++++++------------------------------ - src/xz/xz.1 | 48 ++++++++++++++++++++++++++++-------------------- - src/xzdec/xzdec.c | 42 ++++++++++++++++-------------------------- + src/xz/util.c | 53 +++++++++++++++++++++++------------------------------ + src/xz/xz.1 | 48 ++++++++++++++++++++++++++++-------------------- + src/xzdec/xzdec.c | 42 ++++++++++++++++-------------------------- 3 files changed, 67 insertions(+), 76 deletions(-) commit 00fc1211ae7b687ac912098f4479112059deccbd @@ -2037,8 +3037,8 @@ Date: 2010-03-07 13:50:23 +0200 at least it is now done consistently so that the same byte value is always rounded the same way to MiB. - src/xz/message.c | 5 +++-- - src/xzdec/xzdec.c | 7 +++++-- + src/xz/message.c | 5 +++-- + src/xzdec/xzdec.c | 7 +++++-- 2 files changed, 8 insertions(+), 4 deletions(-) commit 9886d436ff5615fc70eef32ff757b1e934069621 @@ -2050,8 +3050,8 @@ Date: 2010-03-07 13:34:34 +0200 This is to allow files created with "xz -9" to be decompressed if the amount of RAM cannot be determined. - INSTALL | 5 ++--- - configure.ac | 11 ++++++----- + INSTALL | 5 ++--- + configure.ac | 11 ++++++----- 2 files changed, 8 insertions(+), 8 deletions(-) commit 2672bcc9f85ba28ff648e092e9eb4cd9e69ce418 @@ -2086,10 +3086,10 @@ Date: 2010-03-07 13:29:28 +0200 very slowly and thus it's good that user has to override the limit in that case. - src/xz/hardware.c | 43 +++++++++++++++++++++++++++++++------------ - src/xz/xz.1 | 21 +++++++++++++++------ - src/xzdec/xzdec.1 | 8 ++++---- - src/xzdec/xzdec.c | 42 ++++++++++++++++++++++++++++++------------ + src/xz/hardware.c | 43 +++++++++++++++++++++++++++++++------------ + src/xz/xz.1 | 21 +++++++++++++++------ + src/xzdec/xzdec.1 | 8 ++++---- + src/xzdec/xzdec.c | 42 ++++++++++++++++++++++++++++++------------ 4 files changed, 80 insertions(+), 34 deletions(-) commit 5527b7269a997e7f335d60f237a64bbf225d9dc7 @@ -2098,8 +3098,8 @@ Date: 2010-03-06 21:36:19 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit d0d1c51aea4351288a7e533cce28cb7f852f6b05 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2119,8 +3119,8 @@ Date: 2010-03-06 21:17:20 +0200 This fixes <http://bugs.gentoo.org/show_bug.cgi?id=305591>. Thanks to Rafał Mużyło for helping to debug it on IRC. - src/liblzma/common/common.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/common/common.c | 1 + + 1 file changed, 1 insertion(+) commit eb7d51a3faf9298c0c7aa9aaeae1023dcf9e37ea Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2130,53 +3130,53 @@ Date: 2010-02-12 13:16:15 +0200 Thanks to Jonathan Nieder. - README | 2 +- - configure.ac | 2 +- - doc/faq.txt | 2 +- - extra/7z2lzma/7z2lzma.bash | 2 +- - src/common/tuklib_progname.c | 2 +- - src/common/tuklib_progname.h | 2 +- - src/liblzma/api/lzma/base.h | 8 ++++---- - src/liblzma/api/lzma/bcj.h | 2 +- - src/liblzma/api/lzma/block.h | 2 +- - src/liblzma/api/lzma/check.h | 2 +- - src/liblzma/api/lzma/filter.h | 4 ++-- - src/liblzma/api/lzma/index.h | 6 +++--- - src/liblzma/api/lzma/lzma.h | 2 +- - src/liblzma/api/lzma/version.h | 2 +- - src/liblzma/api/lzma/vli.h | 2 +- - src/liblzma/common/block_header_encoder.c | 2 +- - src/liblzma/common/chunk_size.c | 4 ++-- - src/liblzma/common/common.h | 4 ++-- - src/liblzma/common/filter_buffer_decoder.c | 2 +- - src/liblzma/common/filter_encoder.c | 4 ++-- - src/liblzma/common/index.c | 6 +++--- - src/liblzma/common/index_encoder.c | 2 +- - src/liblzma/common/stream_encoder.c | 2 +- - src/liblzma/common/vli_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- - src/liblzma/lzma/lzma2_encoder.c | 2 +- - src/liblzma/lzma/lzma_decoder.c | 4 ++-- - src/liblzma/lzma/lzma_decoder.h | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- - src/liblzma/lzma/lzma_encoder_private.h | 2 +- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/subblock/subblock_encoder.c | 2 +- - src/scripts/xzdiff.1 | 2 +- - src/scripts/xzless.1 | 10 +++++----- - src/xz/coder.c | 2 +- - src/xz/file_io.c | 2 +- - src/xz/main.c | 6 +++--- - src/xz/main.h | 2 +- - src/xz/message.c | 10 +++++----- - src/xz/message.h | 2 +- - src/xz/xz.1 | 16 ++++++++-------- - src/xzdec/lzmadec_w32res.rc | 2 +- - src/xzdec/xzdec_w32res.rc | 2 +- - tests/test_index.c | 2 +- - windows/build.sh | 4 ++-- + README | 2 +- + configure.ac | 2 +- + doc/faq.txt | 2 +- + extra/7z2lzma/7z2lzma.bash | 2 +- + src/common/tuklib_progname.c | 2 +- + src/common/tuklib_progname.h | 2 +- + src/liblzma/api/lzma/base.h | 8 ++++---- + src/liblzma/api/lzma/bcj.h | 2 +- + src/liblzma/api/lzma/block.h | 2 +- + src/liblzma/api/lzma/check.h | 2 +- + src/liblzma/api/lzma/filter.h | 4 ++-- + src/liblzma/api/lzma/index.h | 6 +++--- + src/liblzma/api/lzma/lzma.h | 2 +- + src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/api/lzma/vli.h | 2 +- + src/liblzma/common/block_header_encoder.c | 2 +- + src/liblzma/common/chunk_size.c | 4 ++-- + src/liblzma/common/common.h | 4 ++-- + src/liblzma/common/filter_buffer_decoder.c | 2 +- + src/liblzma/common/filter_encoder.c | 4 ++-- + src/liblzma/common/index.c | 6 +++--- + src/liblzma/common/index_encoder.c | 2 +- + src/liblzma/common/stream_encoder.c | 2 +- + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lz/lz_encoder.h | 2 +- + src/liblzma/lzma/lzma2_encoder.c | 2 +- + src/liblzma/lzma/lzma_decoder.c | 4 ++-- + src/liblzma/lzma/lzma_decoder.h | 2 +- + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 2 +- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- + src/liblzma/lzma/lzma_encoder_private.h | 2 +- + src/liblzma/simple/simple_coder.c | 2 +- + src/liblzma/subblock/subblock_encoder.c | 2 +- + src/scripts/xzdiff.1 | 2 +- + src/scripts/xzless.1 | 10 +++++----- + src/xz/coder.c | 2 +- + src/xz/file_io.c | 2 +- + src/xz/main.c | 6 +++--- + src/xz/main.h | 2 +- + src/xz/message.c | 10 +++++----- + src/xz/message.h | 2 +- + src/xz/xz.1 | 16 ++++++++-------- + src/xzdec/lzmadec_w32res.rc | 2 +- + src/xzdec/xzdec_w32res.rc | 2 +- + tests/test_index.c | 2 +- + windows/build.sh | 4 ++-- 47 files changed, 77 insertions(+), 77 deletions(-) commit 4785f2021aa6a23f1caf724fcc823e562584f225 @@ -2185,8 +3185,8 @@ Date: 2010-02-12 12:41:20 +0200 Fix jl -> jb in ASM files. - src/liblzma/check/crc32_x86.S | 2 +- - src/liblzma/check/crc64_x86.S | 4 ++-- + src/liblzma/check/crc32_x86.S | 2 +- + src/liblzma/check/crc64_x86.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) commit 6b50c9429bf85521d355adc61745d06ee017f8c8 @@ -2199,8 +3199,8 @@ Date: 2010-02-12 12:31:22 +0200 Thanks to Jonathan Nieder. - src/liblzma/check/crc32_x86.S | 8 ++++---- - src/liblzma/check/crc64_x86.S | 8 ++++---- + src/liblzma/check/crc32_x86.S | 8 ++++---- + src/liblzma/check/crc64_x86.S | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) commit 6503fde658a5cdbdd907a788865470dd64771601 @@ -2222,8 +3222,8 @@ Date: 2010-02-07 19:48:06 +0200 break in the future if a new version of the Block options is ever needed. - src/liblzma/api/lzma/block.h | 39 +++++++++++++++------------------- - src/liblzma/common/stream_decoder.c | 3 ++ + src/liblzma/api/lzma/block.h | 39 ++++++++++++++++--------------------- + src/liblzma/common/stream_decoder.c | 3 +++ 2 files changed, 20 insertions(+), 22 deletions(-) commit dd7c3841ff78cb94ce02b0220c6e4748460970f7 @@ -2234,8 +3234,8 @@ Date: 2010-02-02 11:50:11 +0200 This was added in 455e68c030fde8a8c2f5e254c3b3ab9489bf3735. - src/xz/main.c | 5 +++-- - 1 files changed, 3 insertions(+), 2 deletions(-) + src/xz/main.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) commit 9d67588c1597849504a3e5ac8bf6f06e7d2ee8be Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2243,8 +3243,8 @@ Date: 2010-02-01 22:48:42 +0200 Updated TODO. - TODO | 4 ---- - 1 files changed, 0 insertions(+), 4 deletions(-) + TODO | 4 ---- + 1 file changed, 4 deletions(-) commit fef6333f52c8801308c3b78acb7942988541d137 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2252,8 +3252,8 @@ Date: 2010-02-01 22:47:54 +0200 Fix typos in comments. - src/xz/list.c | 2 +- - windows/build.sh | 2 +- + src/xz/list.c | 2 +- + windows/build.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 455e68c030fde8a8c2f5e254c3b3ab9489bf3735 @@ -2262,8 +3262,8 @@ Date: 2010-02-01 22:46:56 +0200 Fix signal handling for --list. - src/xz/main.c | 19 ++++++++++++++----- - 1 files changed, 14 insertions(+), 5 deletions(-) + src/xz/main.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) commit 82220a149015616f75641ee8bbea415137535b9b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2275,8 +3275,8 @@ Date: 2010-02-01 11:44:45 +0200 them after successful compression. Instead, an error message was displayed. - src/xz/file_io.c | 14 +++++++++++++- - 1 files changed, 13 insertions(+), 1 deletions(-) + src/xz/file_io.c | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) commit d4da177d5ba3d2ef7323a6f1e06ca16e0478810e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2284,8 +3284,8 @@ Date: 2010-02-01 10:20:57 +0200 Fix a comment. - windows/build.sh | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + windows/build.sh | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) commit f9dd797a423a148903cf345b4146cb1fe1eab11d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2293,8 +3293,8 @@ Date: 2010-01-31 23:43:54 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit ee5ddb8b28419fe4923ded5c18a50570a762dcab Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2302,8 +3302,8 @@ Date: 2010-01-31 23:41:29 +0200 Updated TODO. - TODO | 17 +++++++++++------ - 1 files changed, 11 insertions(+), 6 deletions(-) + TODO | 17 +++++++++++------ + 1 file changed, 11 insertions(+), 6 deletions(-) commit 11936ad3f5a2e97bda3463c7a56a2f4bb9265ea6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2311,8 +3311,8 @@ Date: 2010-01-31 23:35:04 +0200 Mention TODO in README. - README | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + README | 1 + + 1 file changed, 1 insertion(+) commit 2901a8e7e82af05675b8cd8758a8ceddb111359f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2320,8 +3320,8 @@ Date: 2010-01-31 23:31:14 +0200 Updated INSTALL. - INSTALL | 52 ++++++++++++++++++++++++++-------------------------- - 1 files changed, 26 insertions(+), 26 deletions(-) + INSTALL | 52 ++++++++++++++++++++++++++-------------------------- + 1 file changed, 26 insertions(+), 26 deletions(-) commit 8884e16864ba53fb4b58623d7537d7ef30c28e11 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2348,12 +3348,12 @@ Date: 2010-01-31 23:28:51 +0200 "autoreconf -fi && ./configure && make mydist" on a UN*X box and then copy the resulting .tar.gz to a Windows. - windows/INSTALL-Windows.txt | 131 ++++++++++++++++++ - windows/Makefile | 320 ------------------------------------------- - windows/README | 155 --------------------- - windows/README-Windows.txt | 115 ++++++++++++++++ - windows/build.sh | 189 +++++++++++++++++++++++++ - windows/config.h | 170 ----------------------- + windows/INSTALL-Windows.txt | 131 ++++++++++++++++++ + windows/Makefile | 320 -------------------------------------------- + windows/README | 155 --------------------- + windows/README-Windows.txt | 115 ++++++++++++++++ + windows/build.sh | 189 ++++++++++++++++++++++++++ + windows/config.h | 170 ----------------------- 6 files changed, 435 insertions(+), 645 deletions(-) commit 34eb5e201d62f7f46bbe6fe97cfe08cb31b3b88c @@ -2365,8 +3365,8 @@ Date: 2010-01-31 19:52:38 +0200 Previously it was set statically to CRC64 or CRC32 depending on options passed to the configure script. - src/xz/coder.c | 19 ++++++++++++++----- - 1 files changed, 14 insertions(+), 5 deletions(-) + src/xz/coder.c | 19 ++++++++++++++----- + 1 file changed, 14 insertions(+), 5 deletions(-) commit 96a4f840e3b9ca5c81e5711ff9c267b194f93ef1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2374,10 +3374,10 @@ Date: 2010-01-31 18:17:50 +0200 Improve displaying of the memory usage limit. - src/xz/coder.c | 8 +++----- - src/xz/message.c | 37 +++++++++++++++++++++++++++++-------- - src/xz/util.c | 7 +++++++ - src/xz/util.h | 6 ++++++ + src/xz/coder.c | 8 +++----- + src/xz/message.c | 37 +++++++++++++++++++++++++++++-------- + src/xz/util.c | 7 +++++++ + src/xz/util.h | 6 ++++++ 4 files changed, 45 insertions(+), 13 deletions(-) commit b3cc4d8edd68a0250cc69680c99b9f7343f99cf2 @@ -2390,8 +3390,8 @@ Date: 2010-01-31 12:53:56 +0200 useless to try to block them, especially since the sigset_t used for blocking hasn't been initialized yet. - src/xz/signals.c | 34 ++++++++++++++++++++++++---------- - 1 files changed, 24 insertions(+), 10 deletions(-) + src/xz/signals.c | 34 ++++++++++++++++++++++++---------- + 1 file changed, 24 insertions(+), 10 deletions(-) commit 231c3c7098f1099a56abb8afece76fc9b8699f05 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2415,12 +3415,12 @@ Date: 2010-01-31 12:01:54 +0200 A useless check for user_abort was removed from file_io.c. - src/xz/coder.c | 64 ++++++++++++++++++++++---------- - src/xz/file_io.c | 107 ++++++++++++++++++++++++++---------------------------- - src/xz/file_io.h | 8 +++- - src/xz/list.c | 28 +++++---------- - src/xz/message.c | 46 +++++++++++++---------- - src/xz/message.h | 29 ++++++++++----- + src/xz/coder.c | 64 ++++++++++++++++++++++----------- + src/xz/file_io.c | 107 +++++++++++++++++++++++++++---------------------------- + src/xz/file_io.h | 8 +++-- + src/xz/list.c | 28 +++++---------- + src/xz/message.c | 46 +++++++++++++----------- + src/xz/message.h | 29 ++++++++++----- 6 files changed, 157 insertions(+), 125 deletions(-) commit 0dbd0641db99d5e73d51d04ce7a71e52dc6b4105 @@ -2432,8 +3432,8 @@ Date: 2010-01-29 22:48:04 +0200 This should have been already in 0bc9eab243dee3be764b3530433a7fcdc3f7c6a1. - src/xz/Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/xz/Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit b4b1a56e0cbd597157858264f5c7189201ac9018 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2441,8 +3441,8 @@ Date: 2010-01-29 13:24:27 +0200 Add lzmainfo.1 to manfiles list to convert to .txt and .pdf. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit 5574d64e03ad3a3d6e00e4b0d3e81c7b5529ec95 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2450,9 +3450,9 @@ Date: 2010-01-27 16:42:11 +0200 Silence two compiler warnings on DOS-like systems. - src/common/tuklib_open_stdxxx.c | 6 +++++- - src/xz/file_io.c | 3 +++ - 2 files changed, 8 insertions(+), 1 deletions(-) + src/common/tuklib_open_stdxxx.c | 6 +++++- + src/xz/file_io.c | 3 +++ + 2 files changed, 8 insertions(+), 1 deletion(-) commit b063cc34a30a4edf109343ff373b2b62b8ca72d3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2460,11 +3460,11 @@ Date: 2010-01-27 13:31:03 +0200 Use PACKAGE_URL instead of custom PACKAGE_HOMEPAGE. - configure.ac | 9 ++------- - src/liblzma/liblzma.pc.in | 2 +- - src/lzmainfo/lzmainfo.c | 2 +- - src/xz/message.c | 2 +- - src/xzdec/xzdec.c | 2 +- + configure.ac | 9 ++------- + src/liblzma/liblzma.pc.in | 2 +- + src/lzmainfo/lzmainfo.c | 2 +- + src/xz/message.c | 2 +- + src/xzdec/xzdec.c | 2 +- 5 files changed, 6 insertions(+), 11 deletions(-) commit 38b8035b5cb5f56457c5fa5a891d6900fcf5984f @@ -2475,8 +3475,8 @@ Date: 2010-01-26 23:37:46 +0200 Thanks to Robert Readman. - src/xz/args.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/args.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e5496f9628ff5979392a80421d0b63a4de8015b4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2488,8 +3488,8 @@ Date: 2010-01-26 22:53:37 +0200 Thanks to Robert Readman. - THANKS | 1 + - src/xz/file_io.c | 14 ++++++++++++-- + THANKS | 1 + + src/xz/file_io.c | 14 ++++++++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) commit d9a9800597ea540090e434132c3b511217df0a2b @@ -2501,8 +3501,8 @@ Date: 2010-01-26 15:42:24 +0200 This was introduced in 0dd6d007669b946543ca939a44243833c79e08f4 two days ago. - src/xz/util.c | 9 ++++----- - 1 files changed, 4 insertions(+), 5 deletions(-) + src/xz/util.c | 9 ++++----- + 1 file changed, 4 insertions(+), 5 deletions(-) commit d0b4bbf5da068503c099cd456e294d7673548cc0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2510,8 +3510,8 @@ Date: 2010-01-26 14:46:43 +0200 Minor comment fix. - src/xz/main.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/xz/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 0bc9eab243dee3be764b3530433a7fcdc3f7c6a1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2528,11 +3528,11 @@ Date: 2010-01-24 23:50:54 +0200 The man page hasn't been updated yet. - src/xz/Makefile.am | 1 + - src/xz/list.c | 988 +++++++++++++++++++++++++++++++++------------------- - src/xz/list.h | 18 + - src/xz/main.c | 19 +- - src/xz/private.h | 1 + + src/xz/Makefile.am | 1 + + src/xz/list.c | 988 ++++++++++++++++++++++++++++++++++------------------- + src/xz/list.h | 18 + + src/xz/main.c | 19 +- + src/xz/private.h | 1 + 5 files changed, 668 insertions(+), 359 deletions(-) commit df254ce03be016e217b511e7acd5d493f9929ca5 @@ -2543,9 +3543,9 @@ Date: 2010-01-24 22:46:11 +0200 It will be used by --list. - src/xz/file_io.c | 25 +++++++++++++++++++++++++ - src/xz/file_io.h | 17 +++++++++++++++++ - 2 files changed, 42 insertions(+), 0 deletions(-) + src/xz/file_io.c | 25 +++++++++++++++++++++++++ + src/xz/file_io.h | 17 +++++++++++++++++ + 2 files changed, 42 insertions(+) commit ef68dd4a92976276304de2aedfbe34ae91a86abb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2556,8 +3556,8 @@ Date: 2010-01-24 22:45:14 +0200 It is to ensure that floating point numbers will always have a dot as the decimal separator. - src/xz/args.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/xz/args.c | 4 ++++ + 1 file changed, 4 insertions(+) commit 0dd6d007669b946543ca939a44243833c79e08f4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2565,11 +3565,11 @@ Date: 2010-01-24 16:57:40 +0200 Some improvements to printing sizes in xz. - src/xz/coder.c | 56 ++++++++++++++----------------------- - src/xz/message.c | 80 +++++++++++++++++------------------------------------- - src/xz/message.h | 4 +++ - src/xz/util.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/util.h | 44 +++++++++++++++++++++++++++++ + src/xz/coder.c | 56 +++++++++++++++------------------------ + src/xz/message.c | 80 ++++++++++++++++++-------------------------------------- + src/xz/message.h | 4 +++ + src/xz/util.c | 72 ++++++++++++++++++++++++++++++++++++++++++++++++++ + src/xz/util.h | 44 +++++++++++++++++++++++++++++++ 5 files changed, 166 insertions(+), 90 deletions(-) commit 2a98fdffd68c66371279c211c29153c808ad5c1d @@ -2580,8 +3580,8 @@ Date: 2010-01-20 22:02:35 +0200 Thanks to R. Bijker. - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 07a11dad44e041b01dcfc73e8d4e00731158c06d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2596,8 +3596,8 @@ Date: 2010-01-17 11:59:54 +0200 works well with both 32-bit and 64-bit MinGW (I just need to update the docs). - windows/Makefile | 38 +++++++++++++++++++++++++------------- - windows/config.h | 2 ++ + windows/Makefile | 38 +++++++++++++++++++++++++------------- + windows/config.h | 2 ++ 2 files changed, 27 insertions(+), 13 deletions(-) commit 37f31ead9d2b4e467df11450cf29ed7d7e3e25f3 @@ -2606,8 +3606,8 @@ Date: 2010-01-15 11:05:11 +0200 Update the xz man page to match the previous two commits. - src/xz/xz.1 | 9 +++------ - 1 files changed, 3 insertions(+), 6 deletions(-) + src/xz/xz.1 | 9 +++------ + 1 file changed, 3 insertions(+), 6 deletions(-) commit 3ffd5d81a43210c8da56da5c5b3637d3f8bc63c7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2620,8 +3620,8 @@ Date: 2010-01-13 19:10:25 +0200 The new behavior matches bzip2. The old one matched gzip. - src/xz/main.c | 20 +++++++++----------- - src/xz/util.c | 8 ++++---- + src/xz/main.c | 20 +++++++++----------- + src/xz/util.c | 8 ++++---- 2 files changed, 13 insertions(+), 15 deletions(-) commit 23ac2c44c3ac76994825adb7f9a8f719f78b5ee4 @@ -2637,8 +3637,8 @@ Date: 2010-01-13 18:12:40 +0200 The new way simply seems more reasonable. It matches gzip's behavior while the old one matched bzip2's behavior. - src/xz/file_io.c | 15 ++++++++++----- - 1 files changed, 10 insertions(+), 5 deletions(-) + src/xz/file_io.c | 15 ++++++++++----- + 1 file changed, 10 insertions(+), 5 deletions(-) commit cee12aa852ec0902983dc1f153346ef750157fb9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2646,8 +3646,8 @@ Date: 2010-01-12 16:30:33 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 153c7740c54b3c90129dbd3d6153ac1303c4d605 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2660,10 +3660,10 @@ Date: 2010-01-12 16:18:14 +0200 Thanks to Stuart Shelton. - m4/tuklib_cpucores.m4 | 11 +++++++++-- - m4/tuklib_physmem.m4 | 22 +++++++++++++++++++++- - src/common/tuklib_cpucores.c | 6 ++++++ - src/common/tuklib_physmem.c | 19 +++++++++++++++++++ + m4/tuklib_cpucores.m4 | 11 +++++++++-- + m4/tuklib_physmem.m4 | 22 +++++++++++++++++++++- + src/common/tuklib_cpucores.c | 6 ++++++ + src/common/tuklib_physmem.c | 19 +++++++++++++++++++ 4 files changed, 55 insertions(+), 3 deletions(-) commit 8ea8dc754a7a5bc2d60db1eac201839cabdab6a1 @@ -2674,10 +3674,10 @@ Date: 2010-01-01 00:29:10 +0200 This affects lzma_memusage() and lzma_memlimit_get(). - src/liblzma/api/lzma/index.h | 7 ------- - src/liblzma/common/alone_decoder.c | 11 +++++++---- - src/liblzma/common/index_decoder.c | 10 ++++++---- - src/liblzma/common/stream_decoder.c | 11 +++++++---- + src/liblzma/api/lzma/index.h | 7 ------- + src/liblzma/common/alone_decoder.c | 11 +++++++---- + src/liblzma/common/index_decoder.c | 10 ++++++---- + src/liblzma/common/stream_decoder.c | 11 +++++++---- 4 files changed, 20 insertions(+), 19 deletions(-) commit 1a7ec87c8ee61dfc2e496d2e1fb7ab0939804691 @@ -2709,7 +3709,7 @@ Date: 2009-12-31 22:45:53 +0200 function in the first place other than test_index.c, which now has its own code to compare lzma_indexes. - src/liblzma/api/lzma/index.h | 572 ++++++++--- + src/liblzma/api/lzma/index.h | 572 +++++++--- src/liblzma/common/index.c | 1553 ++++++++++++++++++---------- src/liblzma/common/index.h | 6 + src/liblzma/common/index_decoder.c | 12 +- @@ -2717,7 +3717,7 @@ Date: 2009-12-31 22:45:53 +0200 src/liblzma/common/index_encoder.h | 2 +- src/liblzma/common/stream_buffer_encoder.c | 6 +- src/liblzma/common/stream_encoder.c | 3 +- - tests/test_index.c | 371 +++++--- + tests/test_index.c | 371 ++++--- 9 files changed, 1703 insertions(+), 858 deletions(-) commit f29997a846e673cb3b8cbd57de47ed313b3978bb @@ -2728,8 +3728,8 @@ Date: 2009-12-31 21:13:25 +0200 It was fixed in the C code earlier. - po/cs.po | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + po/cs.po | 1 - + 1 file changed, 1 deletion(-) commit 097bad000363e0bf29f8274ad2d7ab59f7dbf644 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2737,8 +3737,8 @@ Date: 2009-12-31 21:11:05 +0200 Add missing lzma_nothrow in filter.h. - src/liblzma/api/lzma/filter.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/api/lzma/filter.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit b56cb1fc31fa2381f92eefc040df85667048d626 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2746,8 +3746,8 @@ Date: 2009-12-09 18:13:44 +0200 Remove redefinition of _(msgid) macro from lzmainfo.c. - src/lzmainfo/lzmainfo.c | 7 ------- - 1 files changed, 0 insertions(+), 7 deletions(-) + src/lzmainfo/lzmainfo.c | 7 ------- + 1 file changed, 7 deletions(-) commit 171b03febfe09d9fae6ac8be6aa4518bcaf427d2 Author: Jonathan Nieder <jrnieder@gmail.com> @@ -2769,8 +3769,8 @@ Date: 2009-12-08 19:41:57 -0600 Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> - po/.gitignore | 28 ++++++++++++++++++++++------ - 1 files changed, 22 insertions(+), 6 deletions(-) + po/.gitignore | 28 ++++++++++++++++++++++------ + 1 file changed, 22 insertions(+), 6 deletions(-) commit f7e44c6c11f630519072971b8b07a5729c096c36 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2783,8 +3783,8 @@ Date: 2009-12-09 00:38:55 +0200 Thanks to Charles Wilson and Keith Marshall. - src/liblzma/api/lzma.h | 16 +++++++++------- - 1 files changed, 9 insertions(+), 7 deletions(-) + src/liblzma/api/lzma.h | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) commit 7b76a3e2336f25088957cba92b0dbd854d9caa3c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2797,8 +3797,8 @@ Date: 2009-12-07 21:46:53 +0200 Thanks to Charles Wilson. - src/xz/file_io.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/xz/file_io.c | 4 ++++ + 1 file changed, 4 insertions(+) commit 0696f5d268362221380e039bad48a86e29067c6a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2813,10 +3813,10 @@ Date: 2009-12-07 20:54:21 +0200 are still welcome, just be prepared to some extra work in case there are changes. - THANKS | 1 + - po/LINGUAS | 1 + - po/cs.po | 637 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 639 insertions(+), 0 deletions(-) + THANKS | 1 + + po/LINGUAS | 1 + + po/cs.po | 637 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 639 insertions(+) commit 5e817a50d276f0a3607638c1c1d449d50b9aa4e5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2825,8 +3825,8 @@ Date: 2009-12-07 20:32:08 +0200 Add a note for translators to add a bug reporting address for translation bugs. - src/xz/message.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/xz/message.c | 4 ++++ + 1 file changed, 4 insertions(+) commit 6db1c35be9e1e364cdacff6878910e1b7aac2a37 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2836,8 +3836,8 @@ Date: 2009-12-07 20:07:02 +0200 Thanks to Marek Černocký. - src/xz/message.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e0c2776b6ffbd2b1900fde353aceac734edc93d7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2847,8 +3847,8 @@ Date: 2009-11-28 17:45:22 +0200 Fix a missing _() in the error message too. - src/xz/file_io.c | 9 +-------- - 1 files changed, 1 insertions(+), 8 deletions(-) + src/xz/file_io.c | 9 +-------- + 1 file changed, 1 insertion(+), 8 deletions(-) commit f057a33c6f7c5992389479f2d4feabf2900ba7ee Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2858,8 +3858,8 @@ Date: 2009-11-26 10:11:23 +0200 Thanks to Jonathan Nieder. - src/common/sysdefs.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/common/sysdefs.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8767b41534eafdf5e742e12190646bf5740b0cdb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2872,8 +3872,8 @@ Date: 2009-11-26 10:10:36 +0200 Thanks to Jim Meyering for noticing it. - tests/test_index.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + tests/test_index.c | 2 ++ + 1 file changed, 2 insertions(+) commit 919fbaff860acdaa4bcd216500a0b1c960a6db92 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2884,8 +3884,8 @@ Date: 2009-11-25 14:22:19 +0200 With bad luck this could cause a segfault due to reading (but not writing) past the end of the buffer. - src/xz/coder.c | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) + src/xz/coder.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) commit bd13b04e202b6f495a68eb0766f97085b7c50a06 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2903,8 +3903,8 @@ Date: 2009-11-25 13:04:10 +0200 These bugs didn't affect the xz command line tool or most users of liblzma in any way. - src/liblzma/common/index.c | 30 +++++++++++++++++++----------- - tests/test_index.c | 28 +++++++++++++++++++++++++--- + src/liblzma/common/index.c | 30 +++++++++++++++++++----------- + tests/test_index.c | 28 +++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 14 deletions(-) commit 1f196909143b888e062bd9a0c4ba8c34d3019bfa @@ -2923,8 +3923,8 @@ Date: 2009-11-25 12:52:56 +0200 This simplifies applications too, since it avoids dangling pointers. - src/liblzma/api/lzma/index.h | 23 ++++++++++++----------- - src/liblzma/common/index_decoder.c | 26 ++++++++++++++++++++------ + src/liblzma/api/lzma/index.h | 23 ++++++++++++----------- + src/liblzma/common/index_decoder.c | 26 ++++++++++++++++++++------ 2 files changed, 32 insertions(+), 17 deletions(-) commit 465d1b0d6518c5d980f2db4c2d769f9905bdd902 @@ -2941,12 +3941,12 @@ Date: 2009-11-25 11:19:20 +0200 is not good enough, and a more flexible command line option is needed to configure sparse file handling. - src/xz/args.c | 6 ++ - src/xz/coder.c | 33 ++++---- - src/xz/file_io.c | 243 ++++++++++++++++++++++++++++++++++++++++++++++-------- - src/xz/file_io.h | 34 ++++++-- - src/xz/message.c | 1 + - src/xz/xz.1 | 11 +++ + src/xz/args.c | 6 ++ + src/xz/coder.c | 33 ++++---- + src/xz/file_io.c | 243 +++++++++++++++++++++++++++++++++++++++++++++++-------- + src/xz/file_io.h | 34 ++++++-- + src/xz/message.c | 1 + + src/xz/xz.1 | 11 +++ 6 files changed, 272 insertions(+), 56 deletions(-) commit 37de544414fc2dc5039471d1002ebd015eb3e627 @@ -2955,8 +3955,8 @@ Date: 2009-11-22 12:43:06 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit f1a28b96c900c658fe016852ff62f6c24d1f50fa Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2964,8 +3964,8 @@ Date: 2009-11-22 12:05:33 +0200 Add missing consts to pointer casts. - src/liblzma/check/crc32_fast.c | 4 ++-- - src/liblzma/check/crc64_fast.c | 5 +++-- + src/liblzma/check/crc32_fast.c | 4 ++-- + src/liblzma/check/crc64_fast.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) commit b9b5c54cd438b3ae47b44cc211b71f3bc53e35ef @@ -2982,8 +3982,8 @@ Date: 2009-11-22 12:00:30 +0200 Inline assembler (if any) is used if a macro like __i386__ or __x86_64__ is defined. - configure.ac | 26 ++++++++++++-------------- - 1 files changed, 12 insertions(+), 14 deletions(-) + configure.ac | 26 ++++++++++++-------------- + 1 file changed, 12 insertions(+), 14 deletions(-) commit 0733f4c9994db696420a405810d5f02c79ebc404 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -2992,10 +3992,10 @@ Date: 2009-11-22 11:55:03 +0200 Make fastpos.h use tuklib_integer.h instead of bsr.h when --enable-small has been specified. - src/liblzma/common/Makefile.inc | 1 - - src/liblzma/common/bsr.h | 60 --------------------------------------- - src/liblzma/lzma/fastpos.h | 5 +-- - 3 files changed, 1 insertions(+), 65 deletions(-) + src/liblzma/common/Makefile.inc | 1 - + src/liblzma/common/bsr.h | 60 ----------------------------------------- + src/liblzma/lzma/fastpos.h | 5 +--- + 3 files changed, 1 insertion(+), 65 deletions(-) commit 7ac3985d891dcc5773543f84cc5bce6c14841b12 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3005,8 +4005,8 @@ Date: 2009-11-22 11:52:30 +0200 Thanks to Joachim Henke for the original patch. - src/common/tuklib_integer.h | 189 +++++++++++++++++++++++++++++++++++++++++-- - 1 files changed, 181 insertions(+), 8 deletions(-) + src/common/tuklib_integer.h | 189 ++++++++++++++++++++++++++++++++++++++++++-- + 1 file changed, 181 insertions(+), 8 deletions(-) commit c74c132f7f79a842c073c66575a4fdb985e4c2e3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3017,9 +4017,9 @@ Date: 2009-11-20 12:51:19 +0200 configure now warns if there is no method to detect the amount of RAM and recommends using --enable-assume-ram. - configure.ac | 16 +++++++++++++++ - m4/tuklib_cpucores.m4 | 31 +++++++++++++++++------------ - m4/tuklib_physmem.m4 | 50 ++++++++++++++++++++++++++---------------------- + configure.ac | 16 ++++++++++++++++ + m4/tuklib_cpucores.m4 | 31 ++++++++++++++++++------------- + m4/tuklib_physmem.m4 | 50 +++++++++++++++++++++++++++----------------------- 3 files changed, 61 insertions(+), 36 deletions(-) commit d315ca4930ff96e1428c6021c96f209e1abdd83e @@ -3034,12 +4034,12 @@ Date: 2009-11-16 18:16:45 +0200 Thanks to Jonathan Nieder for the original patches. - src/xz/args.c | 85 +++++++++++++++++++++++++++++++---------------------- - src/xz/args.h | 1 + - src/xz/main.c | 11 ++++-- - src/xz/message.c | 47 ++++++++++++++++++++++------- - src/xz/message.h | 4 ++ - src/xz/xz.1 | 40 +++++++++++++++++++++++-- + src/xz/args.c | 85 +++++++++++++++++++++++++++++++++----------------------- + src/xz/args.h | 1 + + src/xz/main.c | 11 +++++--- + src/xz/message.c | 47 +++++++++++++++++++++++-------- + src/xz/message.h | 4 +++ + src/xz/xz.1 | 40 +++++++++++++++++++++++--- 6 files changed, 133 insertions(+), 55 deletions(-) commit e330fb7e6b8162894280c8a3dc22fdc05cd2d85e @@ -3049,9 +4049,9 @@ Date: 2009-11-15 12:54:45 +0200 Fix wrong indentation caused by incorrect settings in the text editor. - src/liblzma/lz/lz_decoder.c | 18 +++++++++--------- - src/liblzma/lzma/lzma2_encoder.c | 6 +++--- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- + src/liblzma/lz/lz_decoder.c | 18 +++++++++--------- + src/liblzma/lzma/lzma2_encoder.c | 6 +++--- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) commit 93e418562cf127a9171e87bcd4e9af8e1bfcdae4 @@ -3069,16 +4069,16 @@ Date: 2009-11-15 12:40:17 +0200 Thanks to Jonathan Nieder for the original patch. - src/liblzma/Makefile.am | 5 ++- - src/liblzma/api/Makefile.am | 1 + - src/liblzma/api/lzma.h | 3 ++ - src/liblzma/api/lzma/hardware.h | 51 +++++++++++++++++++++++++++++++++ - src/liblzma/common/Makefile.inc | 1 + - src/liblzma/common/hardware_physmem.c | 25 ++++++++++++++++ - src/xz/Makefile.am | 1 - - src/xz/hardware.c | 3 +- - src/xzdec/Makefile.am | 6 +-- - src/xzdec/xzdec.c | 3 +- + src/liblzma/Makefile.am | 5 ++-- + src/liblzma/api/Makefile.am | 1 + + src/liblzma/api/lzma.h | 3 +++ + src/liblzma/api/lzma/hardware.h | 51 +++++++++++++++++++++++++++++++++++ + src/liblzma/common/Makefile.inc | 1 + + src/liblzma/common/hardware_physmem.c | 25 +++++++++++++++++ + src/xz/Makefile.am | 1 - + src/xz/hardware.c | 3 +-- + src/xzdec/Makefile.am | 6 ++--- + src/xzdec/xzdec.c | 3 +-- 10 files changed, 88 insertions(+), 11 deletions(-) commit cf39faca59083d38422058c6c97aa757ea7797d0 @@ -3087,8 +4087,8 @@ Date: 2009-11-14 20:21:19 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 2ddcae247c284cc2f396b6cfdab57790c7588b5f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3096,8 +4096,8 @@ Date: 2009-11-14 20:20:03 +0200 Some updates to xz man page. - src/xz/xz.1 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- - 1 files changed, 49 insertions(+), 5 deletions(-) + src/xz/xz.1 | 54 +++++++++++++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 49 insertions(+), 5 deletions(-) commit 19b2674f07f8b588dfaf6638396b4b42866d7e23 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3105,8 +4105,8 @@ Date: 2009-11-14 19:51:03 +0200 Fix description of --memory in --long-help. - src/xz/message.c | 3 +-- - 1 files changed, 1 insertions(+), 2 deletions(-) + src/xz/message.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) commit 2291346f0cccf88e605d84b75c9c5aaaaddb5df8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3114,9 +4114,9 @@ Date: 2009-11-14 19:45:39 +0200 Update the debug programs so that they compile again. - debug/crc32.c | 1 + - debug/memusage.c | 6 ++++-- - debug/sync_flush.c | 14 +++++++++----- + debug/crc32.c | 1 + + debug/memusage.c | 6 ++++-- + debug/sync_flush.c | 14 +++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) commit 418d64a32e8144210f98a810738fed5a897e8367 @@ -3146,26 +4146,26 @@ Date: 2009-11-14 18:59:19 +0200 that Stream encoder used to require keeping the filter chain allocated. - src/liblzma/api/lzma/filter.h | 30 ++++++++++++ - src/liblzma/api/lzma/lzma.h | 13 ----- - src/liblzma/common/block_encoder.c | 14 ++++++ - src/liblzma/common/common.c | 20 ++++++++- - src/liblzma/common/common.h | 22 +++++++++ - src/liblzma/common/easy_encoder.c | 63 ++------------------------ - src/liblzma/common/filter_common.c | 3 + - src/liblzma/common/filter_encoder.c | 27 +++++++++++ - src/liblzma/common/filter_encoder.h | 2 +- - src/liblzma/common/stream_encoder.c | 76 +++++++++++++++++++++++++++---- - src/liblzma/delta/delta_common.c | 5 +-- - src/liblzma/delta/delta_decoder.c | 3 +- - src/liblzma/delta/delta_encoder.c | 17 +++++++- - src/liblzma/delta/delta_private.h | 2 +- - src/liblzma/lz/lz_encoder.c | 17 +++++++ - src/liblzma/lz/lz_encoder.h | 4 ++ - src/liblzma/lzma/lzma2_encoder.c | 59 ++++++++++++++---------- - src/liblzma/lzma/lzma_encoder_presets.c | 1 - - src/liblzma/simple/simple_coder.c | 12 +++++ - src/xz/options.c | 1 - + src/liblzma/api/lzma/filter.h | 30 +++++++++++++ + src/liblzma/api/lzma/lzma.h | 13 ------ + src/liblzma/common/block_encoder.c | 14 ++++++ + src/liblzma/common/common.c | 20 ++++++++- + src/liblzma/common/common.h | 22 ++++++++++ + src/liblzma/common/easy_encoder.c | 63 ++------------------------- + src/liblzma/common/filter_common.c | 3 ++ + src/liblzma/common/filter_encoder.c | 27 ++++++++++++ + src/liblzma/common/filter_encoder.h | 2 +- + src/liblzma/common/stream_encoder.c | 76 ++++++++++++++++++++++++++++----- + src/liblzma/delta/delta_common.c | 5 +-- + src/liblzma/delta/delta_decoder.c | 3 +- + src/liblzma/delta/delta_encoder.c | 17 +++++++- + src/liblzma/delta/delta_private.h | 2 +- + src/liblzma/lz/lz_encoder.c | 17 ++++++++ + src/liblzma/lz/lz_encoder.h | 4 ++ + src/liblzma/lzma/lzma2_encoder.c | 59 ++++++++++++++----------- + src/liblzma/lzma/lzma_encoder_presets.c | 1 - + src/liblzma/simple/simple_coder.c | 12 ++++++ + src/xz/options.c | 1 - 20 files changed, 273 insertions(+), 118 deletions(-) commit f0bf7634b77263a4dd02b20c71861ab67995da68 @@ -3176,8 +4176,8 @@ Date: 2009-10-17 11:11:58 +0300 It was meant to be lzma_filters_copy(), not lzma_filters_dup(). - src/liblzma/api/lzma/filter.h | 2 +- - src/liblzma/common/filter_common.c | 2 +- + src/liblzma/api/lzma/filter.h | 2 +- + src/liblzma/common/filter_common.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 6d118a0b9def82e96afba7386ec8d7da0b59649f @@ -3190,9 +4190,9 @@ Date: 2009-10-17 01:47:07 +0300 a design mistake in the encoder API. This function may be useful to applications too so it's good to export it. - src/liblzma/api/lzma/filter.h | 31 +++++++++++++ - src/liblzma/common/filter_common.c | 82 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 113 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/filter.h | 31 ++++++++++++++ + src/liblzma/common/filter_common.c | 82 ++++++++++++++++++++++++++++++++++++++ + 2 files changed, 113 insertions(+) commit 78e92c18470483e161388e679c1ee556adb3a691 Author: Jonathan Nieder <jrnieder@gmail.com> @@ -3207,8 +4207,8 @@ Date: 2009-10-15 20:44:13 -0500 easier to search for. So use minus signs instead of hyphens to render sample terminal output. - src/scripts/xzmore.1 | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/scripts/xzmore.1 | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 7b7fe902d98da28e5769e2aa1e0c08c92384f7ee Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3219,8 +4219,8 @@ Date: 2009-10-16 20:35:39 +0300 Thanks to Jim Meyering for noticing this. - src/xz/message.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit ebfb2c5e1f344e5c6e549b9dedaa49b0749a4a24 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3235,34 +4235,34 @@ Date: 2009-10-04 22:57:12 +0300 on Solaris, which may contain optimized code like inline assembly. - configure.ac | 54 +----- - m4/tuklib_integer.m4 | 74 ++++++ - src/common/bswap.h | 52 ----- - src/common/integer.h | 170 -------------- - src/common/tuklib_config.h | 8 +- - src/common/tuklib_integer.h | 350 +++++++++++++++++++++++++++++ - src/liblzma/check/check.c | 4 +- - src/liblzma/check/crc32_fast.c | 4 +- - src/liblzma/check/crc32_tablegen.c | 8 +- - src/liblzma/check/crc64_fast.c | 4 +- - src/liblzma/check/crc64_tablegen.c | 8 +- - src/liblzma/check/crc_macros.h | 2 - - src/liblzma/check/sha256.c | 18 +-- - src/liblzma/common/alone_encoder.c | 2 +- - src/liblzma/common/block_header_decoder.c | 2 +- - src/liblzma/common/block_header_encoder.c | 2 +- - src/liblzma/common/common.h | 2 +- - src/liblzma/common/stream_flags_decoder.c | 6 +- - src/liblzma/common/stream_flags_encoder.c | 6 +- - src/liblzma/lz/lz_encoder_hash.h | 2 +- - src/liblzma/lzma/lzma_decoder.c | 2 +- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_private.h | 2 +- - src/liblzma/simple/simple_decoder.c | 2 +- - src/liblzma/simple/simple_encoder.c | 2 +- - tests/test_block_header.c | 4 +- - tests/test_stream_flags.c | 6 +- - tests/tests.h | 2 +- + configure.ac | 54 +---- + m4/tuklib_integer.m4 | 74 +++++++ + src/common/bswap.h | 52 ----- + src/common/integer.h | 170 --------------- + src/common/tuklib_config.h | 8 +- + src/common/tuklib_integer.h | 350 ++++++++++++++++++++++++++++++ + src/liblzma/check/check.c | 4 +- + src/liblzma/check/crc32_fast.c | 4 +- + src/liblzma/check/crc32_tablegen.c | 8 +- + src/liblzma/check/crc64_fast.c | 4 +- + src/liblzma/check/crc64_tablegen.c | 8 +- + src/liblzma/check/crc_macros.h | 2 - + src/liblzma/check/sha256.c | 18 +- + src/liblzma/common/alone_encoder.c | 2 +- + src/liblzma/common/block_header_decoder.c | 2 +- + src/liblzma/common/block_header_encoder.c | 2 +- + src/liblzma/common/common.h | 2 +- + src/liblzma/common/stream_flags_decoder.c | 6 +- + src/liblzma/common/stream_flags_encoder.c | 6 +- + src/liblzma/lz/lz_encoder_hash.h | 2 +- + src/liblzma/lzma/lzma_decoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder_private.h | 2 +- + src/liblzma/simple/simple_decoder.c | 2 +- + src/liblzma/simple/simple_encoder.c | 2 +- + tests/test_block_header.c | 4 +- + tests/test_stream_flags.c | 6 +- + tests/tests.h | 2 +- 28 files changed, 467 insertions(+), 333 deletions(-) commit 29fd321033276261b87da7be5223db33d879a4c7 @@ -3271,10 +4271,10 @@ Date: 2009-10-02 14:35:56 +0300 Add support for --enable-assume-ram=SIZE. - INSTALL | 16 ++++++++++++++++ - configure.ac | 24 ++++++++++++++++++++++++ - src/xz/hardware.c | 7 +++---- - src/xzdec/xzdec.c | 5 +++-- + INSTALL | 16 ++++++++++++++++ + configure.ac | 24 ++++++++++++++++++++++++ + src/xz/hardware.c | 7 +++---- + src/xzdec/xzdec.c | 5 +++-- 4 files changed, 46 insertions(+), 6 deletions(-) commit 3782b3fee4812b0dd4ffdfa6563ed49f73060f25 @@ -3284,8 +4284,8 @@ Date: 2009-10-02 11:28:17 +0300 Use unaligned access (if possible) on both endiannesses in lz_encoder_hash.h. - src/liblzma/lz/lz_encoder_hash.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/lz/lz_encoder_hash.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit c5f68b5cc79085a87f950fea53843e27f328068e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3302,12 +4302,12 @@ Date: 2009-10-02 11:03:26 +0300 This commit bloatens the code on big endian systems by 1 KiB, which should be OK since liblzma is bloated already. ;-) - src/liblzma/check/crc32_tablegen.c | 30 ++++++++++++++ - src/liblzma/lz/Makefile.inc | 1 + - src/liblzma/lz/lz_encoder.c | 7 +++- - src/liblzma/lz/lz_encoder_hash.h | 35 +++++++++++------ - src/liblzma/lz/lz_encoder_hash_table.h | 68 ++++++++++++++++++++++++++++++++ - src/liblzma/lz/lz_encoder_mf.c | 1 - + src/liblzma/check/crc32_tablegen.c | 30 +++++++++++++++ + src/liblzma/lz/Makefile.inc | 1 + + src/liblzma/lz/lz_encoder.c | 7 +++- + src/liblzma/lz/lz_encoder_hash.h | 35 +++++++++++------ + src/liblzma/lz/lz_encoder_hash_table.h | 68 ++++++++++++++++++++++++++++++++++ + src/liblzma/lz/lz_encoder_mf.c | 1 - 6 files changed, 128 insertions(+), 14 deletions(-) commit 4a84d1adfda35e4fb4d41ecf0feb8223b100517a @@ -3318,8 +4318,8 @@ Date: 2009-09-26 12:51:50 -0400 Signed-off-by: Mike Frysinger <vapier@gentoo.org> - .gitignore | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + .gitignore | 2 ++ + 1 file changed, 2 insertions(+) commit 188a1dcd0cc7867810ed3a55c598d0680922c63b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3327,8 +4327,8 @@ Date: 2009-09-27 11:53:36 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit db9119b9181b307e7ac5d2bae82444d04b902b59 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3338,8 +4338,8 @@ Date: 2009-09-27 11:48:54 +0300 Thanks to Markus Duft for the patch. - src/common/sysdefs.h | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + src/common/sysdefs.h | 6 ++++++ + 1 file changed, 6 insertions(+) commit b3d105e69786a45963176fd2193abe75e05ba738 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3349,8 +4349,8 @@ Date: 2009-09-24 17:50:17 +0300 Thanks to Jouk Jansen. - src/xz/file_io.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/file_io.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 5e000ff00d4d01e559397b49eb648ad3f159d496 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3358,8 +4358,8 @@ Date: 2009-09-22 18:59:56 +0300 Added OpenVMS-specific information to INSTALL. - INSTALL | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) + INSTALL | 11 +++++++++++ + 1 file changed, 11 insertions(+) commit 932b2e204463d70f3eee5b8a1ea5a23bf9d001a4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3369,8 +4369,8 @@ Date: 2009-09-22 14:03:02 +0300 Thanks to Jouk Jansen. - src/xz/file_io.c | 19 ++++++++++++++++--- - 1 files changed, 16 insertions(+), 3 deletions(-) + src/xz/file_io.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) commit 4c3630ec4179fe9265407a35c4db1374ffc82372 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3380,8 +4380,8 @@ Date: 2009-09-22 13:40:19 +0300 Thanks to Jouk Jansen. - src/common/tuklib_common.h | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) + src/common/tuklib_common.h | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) commit 0deb1bb60addd1306b525e0ac0ad2a84eb0390d9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3391,8 +4391,8 @@ Date: 2009-09-21 19:50:09 +0300 Thanks to Charles Wilson. - src/common/tuklib_common.h | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + src/common/tuklib_common.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit e599bba4216c0edb8cc8f40adad3a6dba88685f4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3413,47 +4413,47 @@ Date: 2009-09-19 09:47:30 +0300 building XZ Utils on OpenVMS. Thanks to Jouk Jansen for the original patch. - THANKS | 1 + - configure.ac | 12 +-- - m4/lc_cpucores.m4 | 57 --------------- - m4/lc_physmem.m4 | 84 ---------------------- - m4/tuklib_common.m4 | 22 ++++++ - m4/tuklib_cpucores.m4 | 72 +++++++++++++++++++ - m4/tuklib_physmem.m4 | 119 +++++++++++++++++++++++++++++++ - m4/tuklib_progname.m4 | 25 +++++++ - src/common/cpucores.h | 51 -------------- - src/common/open_stdxxx.h | 49 ------------- - src/common/physmem.h | 144 -------------------------------------- - src/common/sysdefs.h | 4 - - src/common/tuklib_common.h | 67 ++++++++++++++++++ - src/common/tuklib_config.h | 1 + - src/common/tuklib_cpucores.c | 46 ++++++++++++ - src/common/tuklib_cpucores.h | 23 ++++++ - src/common/tuklib_exit.c | 57 +++++++++++++++ - src/common/tuklib_exit.h | 25 +++++++ - src/common/tuklib_gettext.h | 44 ++++++++++++ - src/common/tuklib_open_stdxxx.c | 51 ++++++++++++++ - src/common/tuklib_open_stdxxx.h | 23 ++++++ - src/common/tuklib_physmem.c | 146 +++++++++++++++++++++++++++++++++++++++ - src/common/tuklib_physmem.h | 28 ++++++++ - src/common/tuklib_progname.c | 50 +++++++++++++ - src/common/tuklib_progname.h | 32 +++++++++ - src/lzmainfo/Makefile.am | 5 +- - src/lzmainfo/lzmainfo.c | 65 +++++------------ - src/xz/Makefile.am | 7 ++- - src/xz/args.c | 8 +-- - src/xz/file_io.c | 43 ++++++------ - src/xz/hardware.c | 8 +- - src/xz/main.c | 100 ++++++--------------------- - src/xz/main.h | 7 -- - src/xz/message.c | 30 ++++---- - src/xz/message.h | 8 +- - src/xz/private.h | 11 +-- - src/xz/signals.c | 2 + - src/xz/signals.h | 17 ++--- - src/xz/suffix.c | 2 +- - src/xzdec/Makefile.am | 13 +++- - src/xzdec/xzdec.c | 55 ++++----------- + THANKS | 1 + + configure.ac | 12 ++-- + m4/lc_cpucores.m4 | 57 ---------------- + m4/lc_physmem.m4 | 84 ----------------------- + m4/tuklib_common.m4 | 22 ++++++ + m4/tuklib_cpucores.m4 | 72 ++++++++++++++++++++ + m4/tuklib_physmem.m4 | 119 ++++++++++++++++++++++++++++++++ + m4/tuklib_progname.m4 | 25 +++++++ + src/common/cpucores.h | 51 -------------- + src/common/open_stdxxx.h | 49 -------------- + src/common/physmem.h | 144 --------------------------------------- + src/common/sysdefs.h | 4 -- + src/common/tuklib_common.h | 67 ++++++++++++++++++ + src/common/tuklib_config.h | 1 + + src/common/tuklib_cpucores.c | 46 +++++++++++++ + src/common/tuklib_cpucores.h | 23 +++++++ + src/common/tuklib_exit.c | 57 ++++++++++++++++ + src/common/tuklib_exit.h | 25 +++++++ + src/common/tuklib_gettext.h | 44 ++++++++++++ + src/common/tuklib_open_stdxxx.c | 51 ++++++++++++++ + src/common/tuklib_open_stdxxx.h | 23 +++++++ + src/common/tuklib_physmem.c | 146 ++++++++++++++++++++++++++++++++++++++++ + src/common/tuklib_physmem.h | 28 ++++++++ + src/common/tuklib_progname.c | 50 ++++++++++++++ + src/common/tuklib_progname.h | 32 +++++++++ + src/lzmainfo/Makefile.am | 5 +- + src/lzmainfo/lzmainfo.c | 65 ++++++------------ + src/xz/Makefile.am | 7 +- + src/xz/args.c | 8 +-- + src/xz/file_io.c | 43 ++++++------ + src/xz/hardware.c | 8 +-- + src/xz/main.c | 100 ++++++--------------------- + src/xz/main.h | 7 -- + src/xz/message.c | 30 +++++---- + src/xz/message.h | 8 +-- + src/xz/private.h | 11 +-- + src/xz/signals.c | 2 + + src/xz/signals.h | 17 +++-- + src/xz/suffix.c | 2 +- + src/xzdec/Makefile.am | 13 +++- + src/xzdec/xzdec.c | 55 +++++---------- 41 files changed, 974 insertions(+), 640 deletions(-) commit 49cfc8d392cf535f8dd10233225b1fc726fec9ef @@ -3462,9 +4462,9 @@ Date: 2009-09-15 21:07:23 +0300 Fix incorrect use of "restrict". - src/liblzma/api/lzma/vli.h | 4 ++-- - src/liblzma/common/vli_decoder.c | 2 +- - src/liblzma/common/vli_encoder.c | 2 +- + src/liblzma/api/lzma/vli.h | 4 ++-- + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/common/vli_encoder.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) commit 15ffd675ab7af84592eb1c23b0e9f4699aa0fd8c @@ -3473,8 +4473,8 @@ Date: 2009-09-12 14:09:17 +0300 Fix GCC version check for nothrow attribute. - src/liblzma/api/lzma.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6bfdd3a88a819f04c8f202e7d3c6f88a01c7d224 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3482,8 +4482,8 @@ Date: 2009-09-12 14:08:15 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 4ab7b16b9573bdfa32279e4adadff684d5cd58ac Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3493,13 +4493,13 @@ Date: 2009-09-12 14:07:36 +0300 Thanks to Christian Weisgerber for pointing out some of these. - src/liblzma/api/lzma.h | 4 ++-- - src/liblzma/api/lzma/vli.h | 4 ++-- - src/liblzma/common/block_header_encoder.c | 2 +- - src/liblzma/common/filter_common.c | 2 +- - src/liblzma/lz/lz_encoder.h | 10 +++++----- - src/xz/message.c | 22 +++++++++++----------- - src/xzdec/xzdec.c | 2 +- + src/liblzma/api/lzma.h | 4 ++-- + src/liblzma/api/lzma/vli.h | 4 ++-- + src/liblzma/common/block_header_encoder.c | 2 +- + src/liblzma/common/filter_common.c | 2 +- + src/liblzma/lz/lz_encoder.h | 10 +++++----- + src/xz/message.c | 22 +++++++++++----------- + src/xzdec/xzdec.c | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) commit 8905a33daadcd2d6557c83c81c490b827d566c94 @@ -3508,8 +4508,8 @@ Date: 2009-09-11 17:08:15 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 68059334ff435300ab1ce2c616b0eee1b0d88dd9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3517,9 +4517,9 @@ Date: 2009-09-11 17:06:32 +0300 Add PACKAGE_HOMEPAGE to {windows,dos}/config.h to fix build errors. - dos/config.h | 3 +++ - windows/config.h | 3 +++ - 2 files changed, 6 insertions(+), 0 deletions(-) + dos/config.h | 3 +++ + windows/config.h | 3 +++ + 2 files changed, 6 insertions(+) commit 221be761f467da76875247bc02d7a1716682075d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3534,8 +4534,8 @@ Date: 2009-09-11 10:24:09 +0300 .exe suffix even though the executables themselves have. Thanks to Charles Wilson. - configure.ac | 9 +++++++++ - src/xz/Makefile.am | 4 ++-- + configure.ac | 9 +++++++++ + src/xz/Makefile.am | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) commit 18a4233a53d9b82abac7db7d7804684c5fea9c2c @@ -3544,11 +4544,11 @@ Date: 2009-09-11 09:25:09 +0300 Fix a couple of warnings. - src/liblzma/common/stream_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 5 +---- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 8 ++++---- - tests/tests.h | 2 +- + src/liblzma/common/stream_decoder.c | 2 +- + src/liblzma/lz/lz_encoder.c | 5 +---- + src/liblzma/lzma/lzma_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 8 ++++---- + tests/tests.h | 2 +- 5 files changed, 8 insertions(+), 11 deletions(-) commit 429910b2ba67611d8df60d1a9da9641bdb5f82b4 @@ -3560,8 +4560,8 @@ Date: 2009-09-05 18:39:21 +0300 Also move DJGPP-specific code near the code meant for other DOS-like systems. - src/common/physmem.h | 32 +++++++++++++++++++++----------- - 1 files changed, 21 insertions(+), 11 deletions(-) + src/common/physmem.h | 32 +++++++++++++++++++++----------- + 1 file changed, 21 insertions(+), 11 deletions(-) commit 7aca7b3174bcbba4a4915682ff0cd405d63f5740 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3569,8 +4569,8 @@ Date: 2009-09-05 01:21:15 +0300 Updated THANKS. - THANKS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + THANKS | 2 ++ + 1 file changed, 2 insertions(+) commit 60ccb80c9c4a0d771acc5b7d9d6f32b17fed1071 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3586,8 +4586,8 @@ Date: 2009-09-05 01:20:29 +0300 Thanks to Robert Elz and Thomas Klausner. - src/common/cpucores.h | 2 +- - src/common/physmem.h | 2 +- + src/common/cpucores.h | 2 +- + src/common/physmem.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 173368911cf09ab0b03fc4db8f3d4b81d86dce32 @@ -3596,8 +4596,8 @@ Date: 2009-09-02 09:43:51 +0300 Mention in INSTALL that --enable-small doesn't modify CFLAGS. - INSTALL | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + INSTALL | 4 ++++ + 1 file changed, 4 insertions(+) commit 319a0fd7d7e9ebbb71ca6930abfc20777cb4aacc Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3605,8 +4605,8 @@ Date: 2009-09-01 20:40:01 +0300 Refactored option parsing. - src/xz/options.c | 70 +++++++++++++++++++++++++++--------------------------- - 1 files changed, 35 insertions(+), 35 deletions(-) + src/xz/options.c | 70 ++++++++++++++++++++++++++++---------------------------- + 1 file changed, 35 insertions(+), 35 deletions(-) commit 25adaaa56e2e51a47a910a8d73452414619a2e53 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3617,8 +4617,8 @@ Date: 2009-09-01 20:23:30 +0300 xz used to reject "xz --lzma2=pb=2," while "xz --lzma2=pb=2,," worked. Now both work. - src/xz/options.c | 6 ++---- - 1 files changed, 2 insertions(+), 4 deletions(-) + src/xz/options.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) commit 5f6dddc6c911df02ba660564e78e6de80947c947 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3626,8 +4626,8 @@ Date: 2009-09-01 20:20:19 +0300 Updated TODO. - TODO | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + TODO | 3 +++ + 1 file changed, 3 insertions(+) commit 655457b9ada5ec7db398c5392e41290f3f332ea8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3640,8 +4640,8 @@ Date: 2009-08-31 21:59:25 +0300 Maybe the assembler code is used e.g. on Solaris x86 but let's worry about it if this doesn't work on it. - src/liblzma/check/crc32_x86.S | 7 ++----- - src/liblzma/check/crc64_x86.S | 7 ++----- + src/liblzma/check/crc32_x86.S | 7 ++----- + src/liblzma/check/crc64_x86.S | 7 ++----- 2 files changed, 4 insertions(+), 10 deletions(-) commit 162189c3477953805a28f96d3a75cb9ab9417928 @@ -3650,8 +4650,8 @@ Date: 2009-08-30 17:29:19 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 2331f5f97af3e5897e23da45d9df3d664099c7f8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3659,8 +4659,8 @@ Date: 2009-08-30 17:28:52 +0300 Add more OS/2 specific info to INSTALL. - INSTALL | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + INSTALL | 5 +++++ + 1 file changed, 5 insertions(+) commit 94c66b3297b3ad307eee93cf6b160e3c43997f11 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3684,8 +4684,8 @@ Date: 2009-08-29 14:43:52 +0300 recompilation in case the system libc starts to support the thousand separator. - src/xz/util.c | 36 +++++++++++++++++++++++++----------- - 1 files changed, 25 insertions(+), 11 deletions(-) + src/xz/util.c | 36 +++++++++++++++++++++++++----------- + 1 file changed, 25 insertions(+), 11 deletions(-) commit 3432e9c6aab851da1227b63dce645d7f190c04d8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3693,8 +4693,8 @@ Date: 2009-08-29 13:42:56 +0300 Updated THANKS. - THANKS | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + THANKS | 3 +++ + 1 file changed, 3 insertions(+) commit 27414daadf5727e8ab942374b5ec1c8990122878 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3707,10 +4707,10 @@ Date: 2009-08-29 13:39:21 +0300 Thanks to Jukka Salmi for the patches. Richard Koch reported the problem too. - m4/lc_cpucores.m4 | 2 +- - m4/lc_physmem.m4 | 2 +- - src/common/cpucores.h | 2 +- - src/common/physmem.h | 2 +- + m4/lc_cpucores.m4 | 2 +- + m4/lc_physmem.m4 | 2 +- + src/common/cpucores.h | 2 +- + src/common/physmem.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 43f44160b1ddcbf7e5205c37db09b3bebe7226f9 @@ -3721,8 +4721,8 @@ Date: 2009-08-29 13:35:23 +0300 Thanks to Karl Berry. - src/liblzma/check/crc32_x86.S | 7 +++++-- - src/liblzma/check/crc64_x86.S | 7 +++++-- + src/liblzma/check/crc32_x86.S | 7 +++++-- + src/liblzma/check/crc64_x86.S | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) commit 682efdc1f9492fdd76c9ce82e7c00ca0768067e8 @@ -3731,8 +4731,8 @@ Date: 2009-08-27 18:36:59 +0300 "make dist" fixes - Makefile.am | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) + Makefile.am | 13 ++++++------- + 1 file changed, 6 insertions(+), 7 deletions(-) commit c8c184db1c95bf70f78256ec6237845a57f342af Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3740,8 +4740,8 @@ Date: 2009-08-27 17:08:33 +0300 Update xz man page date. - src/xz/xz.1 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9756fce565e98b8fa5fe6ead296d84e7601ec254 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3753,11 +4753,11 @@ Date: 2009-08-27 17:00:22 +0300 71f18e8a066a01dda0c8e5508b135ef104e43e4c required some changes that weren't applied in debug. - debug/Makefile.am | 5 +++-- - debug/full_flush.c | 1 + - debug/known_sizes.c | 1 + - debug/memusage.c | 1 + - debug/sync_flush.c | 1 + + debug/Makefile.am | 5 +++-- + debug/full_flush.c | 1 + + debug/known_sizes.c | 1 + + debug/memusage.c | 1 + + debug/sync_flush.c | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) commit 77007a7fb20187fcf3d1dd9839c79ace2d63f2ea @@ -3766,8 +4766,8 @@ Date: 2009-08-27 16:36:40 +0300 Add missing files to EXTRA_DIST. - Makefile.am | 11 +++++++---- - 1 files changed, 7 insertions(+), 4 deletions(-) + Makefile.am | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) commit 04dcbfdeb921e5f361a4487134e91e23fffbe09d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3775,8 +4775,8 @@ Date: 2009-08-27 16:21:22 +0300 Bumped version to 4.999.9beta. - src/liblzma/api/lzma/version.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/version.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit fd7618611a22f42a6913bc8d518c9bbc9252d6b4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3784,8 +4784,8 @@ Date: 2009-08-27 16:17:47 +0300 Updated THANKS. - THANKS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + THANKS | 2 ++ + 1 file changed, 2 insertions(+) commit c29e76c0f910fca0a90a50b78d337f6c32623e9d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3796,8 +4796,8 @@ Date: 2009-08-27 16:12:52 +0300 Thanks to Christian von Roques, Peter Lawler, and Jim Meyering for the fixes. - doc/xz-file-format.txt | 26 +++++++++++++++----------- - 1 files changed, 15 insertions(+), 11 deletions(-) + doc/xz-file-format.txt | 26 +++++++++++++++----------- + 1 file changed, 15 insertions(+), 11 deletions(-) commit 696d7ee3953beaf4f0ed18e78917ccf300431966 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3805,8 +4805,8 @@ Date: 2009-08-27 15:43:54 +0300 Require GNU libtool 2.2. - configure.ac | 13 +++---------- - 1 files changed, 3 insertions(+), 10 deletions(-) + configure.ac | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) commit 4c3558aa8305a8f8b6c43b8569eb539717ca9e8d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3814,8 +4814,8 @@ Date: 2009-08-27 15:34:45 +0300 Add "dos" to EXTRA_DIST. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit 35b29e4424ced5a3ababf132283e519080c7b298 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3823,8 +4823,8 @@ Date: 2009-08-27 15:23:27 +0300 Updated TODO. - TODO | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + TODO | 6 ++++++ + 1 file changed, 6 insertions(+) commit 23414377192c21f3f34c84cdfe0ef0fbd06a1dea Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3832,8 +4832,8 @@ Date: 2009-08-27 15:17:00 +0300 Some xz man page improvements. - src/xz/xz.1 | 78 ++++++++++++++++++++++++++++++++++++++++++++++------------ - 1 files changed, 62 insertions(+), 16 deletions(-) + src/xz/xz.1 | 78 ++++++++++++++++++++++++++++++++++++++++++++++++------------- + 1 file changed, 62 insertions(+), 16 deletions(-) commit 371b04e19fc9051dbaeec51ec0badec6a1f0699d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3841,8 +4841,8 @@ Date: 2009-08-27 10:41:01 +0300 Removed doc/bugs.txt. - doc/bugs.txt | 46 ---------------------------------------------- - 1 files changed, 0 insertions(+), 46 deletions(-) + doc/bugs.txt | 46 ---------------------------------------------- + 1 file changed, 46 deletions(-) commit d88c4072b36d3a76f839185799fb1d91037a1b81 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3852,8 +4852,8 @@ Date: 2009-08-27 10:40:25 +0300 It now includes bug reporting instructions/tips. - README | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 55 insertions(+), 10 deletions(-) + README | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 55 insertions(+), 10 deletions(-) commit 92e536d8b8d33a6b12d0802bcd7be4437046f13e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3866,8 +4866,8 @@ Date: 2009-08-27 10:21:18 +0300 (From now on, I try to always remember to put the relevant thanks to commit messages.) - doc/faq.txt | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + doc/faq.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3e2ba8b58585743e59251e69ad2783eb08357079 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3882,18 +4882,18 @@ Date: 2009-08-27 10:13:46 +0300 Lots of comments were improved. - src/liblzma/api/lzma.h | 20 +++++++ - src/liblzma/api/lzma/base.h | 48 +++++++++-------- - src/liblzma/api/lzma/block.h | 38 +++++++------- - src/liblzma/api/lzma/check.h | 22 ++++---- - src/liblzma/api/lzma/container.h | 36 +++++++------ - src/liblzma/api/lzma/filter.h | 81 ++++++++++++++++++----------- - src/liblzma/api/lzma/index.h | 97 +++++++++++++++++++++-------------- - src/liblzma/api/lzma/index_hash.h | 14 +++-- - src/liblzma/api/lzma/lzma.h | 87 ++++++++++++++++--------------- - src/liblzma/api/lzma/stream_flags.h | 12 ++-- - src/liblzma/api/lzma/version.h | 10 ++-- - src/liblzma/api/lzma/vli.h | 7 ++- + src/liblzma/api/lzma.h | 20 ++++++++ + src/liblzma/api/lzma/base.h | 48 +++++++++--------- + src/liblzma/api/lzma/block.h | 38 ++++++++------- + src/liblzma/api/lzma/check.h | 22 +++++---- + src/liblzma/api/lzma/container.h | 36 ++++++++------ + src/liblzma/api/lzma/filter.h | 81 +++++++++++++++++++------------ + src/liblzma/api/lzma/index.h | 97 ++++++++++++++++++++++--------------- + src/liblzma/api/lzma/index_hash.h | 14 ++++-- + src/liblzma/api/lzma/lzma.h | 87 +++++++++++++++++---------------- + src/liblzma/api/lzma/stream_flags.h | 12 ++--- + src/liblzma/api/lzma/version.h | 10 ++-- + src/liblzma/api/lzma/vli.h | 7 +-- 12 files changed, 275 insertions(+), 197 deletions(-) commit 8e8ebc17c535a1f8846718059b48417409c37050 @@ -3902,8 +4902,8 @@ Date: 2009-08-18 00:30:09 +0300 Install faq.txt. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit b198e770a146e4a41f91a93f0b233713f2515848 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3914,8 +4914,8 @@ Date: 2009-08-18 00:26:48 +0300 Some questions worth answering were removed, because I currently don't have good up to date answers to them. - doc/faq.txt | 239 ++++++++++++++++++----------------------------------------- - 1 files changed, 73 insertions(+), 166 deletions(-) + doc/faq.txt | 239 +++++++++++++++++++----------------------------------------- + 1 file changed, 73 insertions(+), 166 deletions(-) commit fe111a25cd788d31b581996e4533910388a7f0a9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3923,8 +4923,8 @@ Date: 2009-08-17 22:45:50 +0300 Some xz man changes. - src/xz/xz.1 | 88 +++++++++++++++++++++++++++++------------------------------ - 1 files changed, 43 insertions(+), 45 deletions(-) + src/xz/xz.1 | 88 ++++++++++++++++++++++++++++++------------------------------- + 1 file changed, 43 insertions(+), 45 deletions(-) commit 10242a21e9abda0c5c6a03501703cc40b8a699a5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3932,8 +4932,8 @@ Date: 2009-08-16 22:15:42 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 3ce1916c83041113b9cad9ead5c97a527cf8aa1d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3943,8 +4943,8 @@ Date: 2009-08-16 22:15:13 +0300 Thanks to Jonathan Stott for the bug report. - src/liblzma/lz/lz_encoder.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/lz/lz_encoder.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 66da129c8ec33dd66acc92f113f7c1ca740ca81a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3953,8 +4953,8 @@ Date: 2009-08-13 15:15:37 +0300 Updated INSTALL and PACKAGERS to match the changes made in --enable-dynamic. - INSTALL | 20 ++++++++++++++++---- - PACKAGERS | 11 ++++++----- + INSTALL | 20 ++++++++++++++++---- + PACKAGERS | 11 ++++++----- 2 files changed, 22 insertions(+), 9 deletions(-) commit 8238c4b2402f952c4e492e5b778aa272e57b6705 @@ -3963,8 +4963,8 @@ Date: 2009-08-13 15:03:46 +0300 Link lzmainfo against shared liblzma by default. - src/lzmainfo/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/lzmainfo/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 71f18e8a066a01dda0c8e5508b135ef104e43e4c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3981,8 +4981,8 @@ Date: 2009-08-13 15:00:21 +0300 This is quite messy compared to how simple thing it is supposed to be. The complexity is mostly due to Windows support. - configure.ac | 77 +++++++++++++++++++++++++++++++++++++++++++--------------- - 1 files changed, 57 insertions(+), 20 deletions(-) + configure.ac | 77 ++++++++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 57 insertions(+), 20 deletions(-) commit 5aa4678b2342dcfc1d2b31aa9fa4f39c539e4b61 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -3992,8 +4992,8 @@ Date: 2009-08-13 12:56:47 +0300 install-exec-hook -> install-data-hook - src/xz/Makefile.am | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + src/xz/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) commit e51b4e49e800bd84e6d589dca2964d3985e88139 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4006,12 +5006,12 @@ Date: 2009-08-13 12:55:45 +0300 against static liblzma by default is dumb. This will be fixed once I have fixed some related issues in configure.ac. - configure.ac | 1 + - src/Makefile.am | 2 +- - src/lzmainfo/Makefile.am | 29 ++++++ - src/lzmainfo/lzmainfo.1 | 55 +++++++++++ - src/lzmainfo/lzmainfo.c | 242 ++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 328 insertions(+), 1 deletions(-) + configure.ac | 1 + + src/Makefile.am | 2 +- + src/lzmainfo/Makefile.am | 29 ++++++ + src/lzmainfo/lzmainfo.1 | 55 +++++++++++ + src/lzmainfo/lzmainfo.c | 242 +++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 328 insertions(+), 1 deletion(-) commit a4165d0584376d948c213ec93c6065d24ff6a5e7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4022,8 +5022,8 @@ Date: 2009-08-13 12:42:36 +0300 Make xz error message translation usable outside xz (at least in upcoming lzmainfo). - src/xz/main.c | 4 ++-- - src/xzdec/xzdec.c | 6 +++--- + src/xz/main.c | 4 ++-- + src/xzdec/xzdec.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) commit df636eb4e066b4e154ce8e66e82c87ba1db652a6 @@ -4032,8 +5032,8 @@ Date: 2009-08-13 09:37:21 +0300 Add xz man page to manfiles in toplevel Makefile.am. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit 180bdf58ea5bb07941e0a99b304d9aa832198748 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4041,8 +5041,8 @@ Date: 2009-08-13 09:37:01 +0300 Fix first line of xz man page. - src/xz/xz.1 | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/xz.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit e1ce2291e759b50ebfcf7cbbcc04cd098f1705a4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4052,7 +5052,7 @@ Date: 2009-08-10 11:22:31 +0300 src/xz/Makefile.am | 15 + src/xz/xz.1 | 1206 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1221 insertions(+), 0 deletions(-) + 2 files changed, 1221 insertions(+) commit e71903fc6101f1c039d702e335b08aad1e1b4100 Author: Jonathan Nieder <jrnieder@gmail.com> @@ -4073,8 +5073,8 @@ Date: 2009-08-09 13:41:20 -0500 descriptor. (This trick is used in all similar contexts elsewhere in xzdiff and in the analogous context in gzip’s zdiff script.) - src/scripts/xzdiff.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/scripts/xzdiff.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1d314b81aa5b0c4530638ffabd4e0edb52e5362c Author: Jonathan Nieder <jrnieder@gmail.com> @@ -4098,8 +5098,8 @@ Date: 2009-08-09 13:22:12 -0500 Check less’s version at runtime so xzless can continue to work with older versions. - src/scripts/xzless.in | 8 +++++++- - 1 files changed, 7 insertions(+), 1 deletions(-) + src/scripts/xzless.in | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) commit a7f5d2fe4826ac68839d00059f05004fb81d5c69 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4107,8 +5107,8 @@ Date: 2009-08-09 20:57:46 +0300 GPLv2+ not GPLv2 for Doxyfile.in is probably OK. - Doxyfile.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + Doxyfile.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit b735cde20cc14857136ae65a0e5d336ed7ddc862 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4121,8 +5121,8 @@ Date: 2009-08-02 00:27:29 +0300 their copyright on generated files, but since it doesn't matter for XZ Utils at all, better safe than sorry. - Doxyfile.in | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + Doxyfile.in | 3 +++ + 1 file changed, 3 insertions(+) commit 0fd157cc008446adfc8f91394f5503868025a642 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4130,8 +5130,8 @@ Date: 2009-08-02 00:11:37 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit b198da96ff9ac8c89b466b4d196c5f3fe1c7904f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4139,8 +5139,8 @@ Date: 2009-08-02 00:10:22 +0300 Updated TODO. - TODO | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + TODO | 4 ++++ + 1 file changed, 4 insertions(+) commit 669413bb2db954bbfde3c4542fddbbab53891eb4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4148,8 +5148,8 @@ Date: 2009-07-30 12:25:55 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit dbbd8fb870ae789d96497911006c869d37148c15 Author: Jonathan Nieder <jrnieder@gmail.com> @@ -4157,8 +5157,8 @@ Date: 2009-07-28 17:37:24 -0500 xzdiff: add missing ;; to case statement - src/scripts/xzdiff.in | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/scripts/xzdiff.in | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit adbad2d16cb5909f85d4a429011005613ea62ffe Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4166,8 +5166,8 @@ Date: 2009-07-24 13:15:06 +0300 Added history.txt to doc_DATA. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit e0236f12569eb36f9b81ce7a1e52e0f73698ac27 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4175,8 +5175,8 @@ Date: 2009-07-24 12:00:40 +0300 Updated .gitignore files. - .gitignore | 36 +++++++++++++++++++----------------- - po/.gitignore | 3 +++ + .gitignore | 36 +++++++++++++++++++----------------- + po/.gitignore | 3 +++ 2 files changed, 22 insertions(+), 17 deletions(-) commit 2f34fb269265e3aba43a2a9c734020a45268826d @@ -4185,8 +5185,8 @@ Date: 2009-07-24 11:34:02 +0300 Minor improvements to COPYING. - COPYING | 11 ++++++++--- - 1 files changed, 8 insertions(+), 3 deletions(-) + COPYING | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) commit 0db1befcfbc120377df4b89923762f16d25f548a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4195,8 +5195,8 @@ Date: 2009-07-23 19:10:55 +0300 Fix incorrect usage of getopt_long(), which caused invalid memory access if XZ_OPT was defined. - src/xz/args.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + src/xz/args.c | 1 - + 1 file changed, 1 deletion(-) commit 8f8ec942d6d21ada2096eaf063411bc8bc7e2d48 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4204,8 +5204,8 @@ Date: 2009-07-20 15:43:32 +0300 Avoid internal error with --format=xz --lzma1. - src/xz/coder.c | 16 ++++++++++++---- - 1 files changed, 12 insertions(+), 4 deletions(-) + src/xz/coder.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) commit 99f9e879a6a8bb54a65da99c12e0f390216c152a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4218,14 +5218,14 @@ Date: 2009-07-19 13:14:20 +0300 Some of the documentation files are now installed to $docdir. - AUTHORS | 35 ++++-- - ChangeLog | 7 +- - INSTALL | 327 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ - INSTALL.generic | 302 ++++++++++++++++++++++++++++++++++++++++++++++++++ - Makefile.am | 11 ++ - PACKAGERS | 278 ++++++++++++++++++++++++++++++++++++++++++++++ - README | 263 +++++++++++++++++++------------------------- - THANKS | 17 ++-- + AUTHORS | 35 +++--- + ChangeLog | 7 +- + INSTALL | 327 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + INSTALL.generic | 302 +++++++++++++++++++++++++++++++++++++++++++++++++++ + Makefile.am | 11 ++ + PACKAGERS | 278 +++++++++++++++++++++++++++++++++++++++++++++++ + README | 263 ++++++++++++++++++++------------------------- + THANKS | 17 +-- 8 files changed, 1070 insertions(+), 170 deletions(-) commit ef4cf1851de89022cba5674784f1a8f6343c15b0 @@ -4234,8 +5234,8 @@ Date: 2009-07-19 11:09:31 +0300 Added missing author notice to xzless.in. - src/scripts/xzless.in | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/scripts/xzless.in | 1 + + 1 file changed, 1 insertion(+) commit 4c9c989d45b188667799a7a1d6c728ed43f7bf77 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4248,9 +5248,9 @@ Date: 2009-07-18 18:54:55 +0300 Added the build-aux directory to .gitignore. - .gitignore | 1 + - Makefile.am | 1 - - configure.ac | 3 ++- + .gitignore | 1 + + Makefile.am | 1 - + configure.ac | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) commit 366e436090a7a87215e9bf0e3ddcd55f05b50587 @@ -4259,8 +5259,8 @@ Date: 2009-07-18 14:34:08 +0300 Updated the totally outdated TODO file. - TODO | 117 +++++++++++++++-------------------------------------------------- - 1 files changed, 27 insertions(+), 90 deletions(-) + TODO | 117 ++++++++++++++++--------------------------------------------------- + 1 file changed, 27 insertions(+), 90 deletions(-) commit 64e498c89d8b9966e8663f43bf64d47c26c55c62 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4268,12 +5268,12 @@ Date: 2009-07-18 11:26:39 +0300 Added public domain notice into a few files. - src/common/common_w32res.rc | 9 ++++++++- - src/liblzma/liblzma.pc.in | 7 +++++++ - src/liblzma/liblzma_w32res.rc | 7 +++++++ - src/xz/xz_w32res.rc | 7 +++++++ - src/xzdec/xzdec_w32res.rc | 7 +++++++ - 5 files changed, 36 insertions(+), 1 deletions(-) + src/common/common_w32res.rc | 9 ++++++++- + src/liblzma/liblzma.pc.in | 7 +++++++ + src/liblzma/liblzma_w32res.rc | 7 +++++++ + src/xz/xz_w32res.rc | 7 +++++++ + src/xzdec/xzdec_w32res.rc | 7 +++++++ + 5 files changed, 36 insertions(+), 1 deletion(-) commit a35755c5de808df027675688855d1b621a4fb428 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4284,8 +5284,8 @@ Date: 2009-07-14 21:10:36 +0300 This may slightly ease writing scripts that construct filter-specific option strings dynamically. - src/xz/options.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + src/xz/options.c | 7 +++++++ + 1 file changed, 7 insertions(+) commit 98f3cac1ad31191c5160a7e48398bf85141e941c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4294,8 +5294,8 @@ Date: 2009-07-14 18:04:31 +0300 Accept --lzma2=preset=6e where "e" is equivalent to --extreme when no custom chain is in use. - src/xz/options.c | 80 +++++++++++++++++++++++++++++++++++++++-------------- - 1 files changed, 59 insertions(+), 21 deletions(-) + src/xz/options.c | 80 +++++++++++++++++++++++++++++++++++++++++--------------- + 1 file changed, 59 insertions(+), 21 deletions(-) commit d873a09e956363e54bf58c577c8f7e487b6fb464 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4305,8 +5305,8 @@ Date: 2009-07-12 19:08:30 +0300 and to conver the man pages to PDF and plain text, which may be convenient to those who cannot render man pages. - Makefile.am | 31 +++++++++++++++++++++++++++++++ - 1 files changed, 31 insertions(+), 0 deletions(-) + Makefile.am | 31 +++++++++++++++++++++++++++++++ + 1 file changed, 31 insertions(+) commit cd69a5a6c16c289f6f8e2823b03c72289472270f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4325,14 +5325,14 @@ Date: 2009-07-10 11:39:38 +0300 so one will get a bit unclear error message if trying to use an invalid start offset. - src/liblzma/simple/arm.c | 2 +- - src/liblzma/simple/armthumb.c | 2 +- - src/liblzma/simple/ia64.c | 2 +- - src/liblzma/simple/powerpc.c | 2 +- - src/liblzma/simple/simple_coder.c | 5 ++++- - src/liblzma/simple/simple_private.h | 3 ++- - src/liblzma/simple/sparc.c | 2 +- - src/liblzma/simple/x86.c | 2 +- + src/liblzma/simple/arm.c | 2 +- + src/liblzma/simple/armthumb.c | 2 +- + src/liblzma/simple/ia64.c | 2 +- + src/liblzma/simple/powerpc.c | 2 +- + src/liblzma/simple/simple_coder.c | 5 ++++- + src/liblzma/simple/simple_private.h | 3 ++- + src/liblzma/simple/sparc.c | 2 +- + src/liblzma/simple/x86.c | 2 +- 8 files changed, 12 insertions(+), 8 deletions(-) commit eed9953732b801f6c97317fb3160445a8754180b @@ -4347,8 +5347,8 @@ Date: 2009-07-10 11:33:21 +0300 --program-transform-name), it doesn't so easily work in wrong mode. - src/xz/args.c | 22 +++++++++++++--------- - 1 files changed, 13 insertions(+), 9 deletions(-) + src/xz/args.c | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) commit 6f62fa88f4ff7ba78565c314c0e6e71c498fa658 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4356,8 +5356,8 @@ Date: 2009-07-08 23:06:46 +0300 Updated THANKS. - THANKS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + THANKS | 2 ++ + 1 file changed, 2 insertions(+) commit 1754b7e03e2aa7e2e0196807fe8b0f3f5a637b0e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4365,8 +5365,8 @@ Date: 2009-07-08 23:05:29 +0300 Portability improvement to version.sh. - version.sh | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + version.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 3bdb53792c0e3e3febe9370e56eda5b08f89410f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4380,9 +5380,9 @@ Date: 2009-07-08 22:50:16 +0300 be wrong. xzdec will not support copying unrecognized data as is to stdout, so it cannot support --force. - src/xzdec/xzdec.1 | 5 ----- - src/xzdec/xzdec.c | 5 +---- - 2 files changed, 1 insertions(+), 9 deletions(-) + src/xzdec/xzdec.1 | 5 ----- + src/xzdec/xzdec.c | 5 +---- + 2 files changed, 1 insertion(+), 9 deletions(-) commit 5f16ef4abf220028a9ddbcb138217597a9455f62 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4393,10 +5393,10 @@ Date: 2009-07-06 10:36:04 +0300 so this should work OK. libtool 2.2 sets SED but 1.5 doesn't, so $(SED) happened to work when using libtool 2.2. - src/liblzma/Makefile.am | 2 +- - src/scripts/Makefile.am | 28 ++++++++++++++-------------- - src/xz/Makefile.am | 6 +++--- - src/xzdec/Makefile.am | 6 +++--- + src/liblzma/Makefile.am | 2 +- + src/scripts/Makefile.am | 28 ++++++++++++++-------------- + src/xz/Makefile.am | 6 +++--- + src/xzdec/Makefile.am | 6 +++--- 4 files changed, 21 insertions(+), 21 deletions(-) commit 96e4b257e101d72072d43e144897d92920270669 @@ -4416,20 +5416,20 @@ Date: 2009-07-05 22:25:17 +0300 The name of the xz executable used in these scripts is now correct even if --program-transform-name has been used. - configure.ac | 14 ++++ - m4/posix-shell.m4 | 63 +++++++++++++++ - src/scripts/Makefile.am | 24 +++--- - src/scripts/xzdiff | 67 ---------------- - src/scripts/xzdiff.1 | 58 +++++++++----- - src/scripts/xzdiff.in | 172 +++++++++++++++++++++++++++++++++++++++++ - src/scripts/xzgrep | 123 ----------------------------- - src/scripts/xzgrep.1 | 85 ++++++++++++-------- - src/scripts/xzgrep.in | 196 +++++++++++++++++++++++++++++++++++++++++++++++ - src/scripts/xzless.1 | 66 ++++++++++++++++ - src/scripts/xzless.in | 51 ++++++++++++ - src/scripts/xzmore | 74 ------------------ - src/scripts/xzmore.1 | 64 ++++++--------- - src/scripts/xzmore.in | 78 +++++++++++++++++++ + configure.ac | 14 ++++ + m4/posix-shell.m4 | 63 ++++++++++++++++ + src/scripts/Makefile.am | 24 +++--- + src/scripts/xzdiff | 67 ----------------- + src/scripts/xzdiff.1 | 58 ++++++++------ + src/scripts/xzdiff.in | 172 ++++++++++++++++++++++++++++++++++++++++++ + src/scripts/xzgrep | 123 ------------------------------ + src/scripts/xzgrep.1 | 85 ++++++++++++--------- + src/scripts/xzgrep.in | 196 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/scripts/xzless.1 | 66 ++++++++++++++++ + src/scripts/xzless.in | 51 +++++++++++++ + src/scripts/xzmore | 74 ------------------ + src/scripts/xzmore.1 | 64 +++++++--------- + src/scripts/xzmore.in | 78 +++++++++++++++++++ 14 files changed, 766 insertions(+), 369 deletions(-) commit 25cc7a6e8c2506a0d80084a4c1c67d33e7439100 @@ -4438,8 +5438,8 @@ Date: 2009-07-05 19:26:53 +0300 Use @PACKAGE_HOMEPAGE@ in liblzma.pc.in. - src/liblzma/liblzma.pc.in | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/liblzma.pc.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 18c10c30d2833f394cd7bce0e6a821044b15832f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4454,8 +5454,8 @@ Date: 2009-07-04 00:40:44 +0300 files of only a few bytes in size. xz now has its own file type detection code and no longer uses lzma_auto_decoder(). - src/xz/coder.c | 213 ++++++++++++++++++++++++++++++++++++++++++++++--------- - 1 files changed, 178 insertions(+), 35 deletions(-) + src/xz/coder.c | 213 +++++++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 178 insertions(+), 35 deletions(-) commit 0a289c01ac821ea9c4250aa906b0ae3cfa953633 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4466,9 +5466,9 @@ Date: 2009-07-02 14:30:38 +0300 Use also PACKAGE_NAME instead of hardcoding "XZ Utils". - configure.ac | 5 +++++ - src/xz/message.c | 4 ++-- - src/xzdec/xzdec.c | 4 ++-- + configure.ac | 5 +++++ + src/xz/message.c | 4 ++-- + src/xzdec/xzdec.c | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) commit 5cc99db5bae8633f85559e5cdaef4cd905a4ee9c @@ -4477,8 +5477,8 @@ Date: 2009-07-01 12:21:24 +0300 Avoid visibility related compiler warnings on Windows. - configure.ac | 20 +++++++++----------- - 1 files changed, 9 insertions(+), 11 deletions(-) + configure.ac | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) commit 7653d1cf48080e63b189ed9d58dea0e82b6b1c5e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4486,8 +5486,8 @@ Date: 2009-06-30 17:14:39 +0300 Use static liblzma by default also for tests. - tests/Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + tests/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) commit f42ee981668b545ab6d06c6072e262c29605273c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4519,27 +5519,27 @@ Date: 2009-06-30 17:09:57 +0300 This commit also adds support for building Windows resources into liblzma and executables. - configure.ac | 34 ++++++++++----- - src/liblzma/Makefile.am | 79 +++++++++++++++++++++++++++------- - src/liblzma/check/Makefile.am | 47 --------------------- - src/liblzma/check/Makefile.inc | 51 ++++++++++++++++++++++ - src/liblzma/common/Makefile.am | 78 ---------------------------------- - src/liblzma/common/Makefile.inc | 67 +++++++++++++++++++++++++++++ - src/liblzma/common/common.h | 16 ++++--- - src/liblzma/delta/Makefile.am | 28 ------------ - src/liblzma/delta/Makefile.inc | 23 ++++++++++ - src/liblzma/lz/Makefile.am | 29 ------------- - src/liblzma/lz/Makefile.inc | 21 +++++++++ - src/liblzma/lzma/Makefile.am | 51 ---------------------- - src/liblzma/lzma/Makefile.inc | 43 +++++++++++++++++++ - src/liblzma/rangecoder/Makefile.am | 26 ----------- - src/liblzma/rangecoder/Makefile.inc | 21 +++++++++ - src/liblzma/simple/Makefile.am | 51 ---------------------- - src/liblzma/simple/Makefile.inc | 47 +++++++++++++++++++++ - src/liblzma/subblock/Makefile.am | 26 ----------- - src/liblzma/subblock/Makefile.inc | 20 +++++++++ - src/xz/Makefile.am | 11 ++++- - src/xzdec/Makefile.am | 20 ++++++++- + configure.ac | 34 ++++++++++------ + src/liblzma/Makefile.am | 79 +++++++++++++++++++++++++++++-------- + src/liblzma/check/Makefile.am | 47 ---------------------- + src/liblzma/check/Makefile.inc | 51 ++++++++++++++++++++++++ + src/liblzma/common/Makefile.am | 78 ------------------------------------ + src/liblzma/common/Makefile.inc | 67 +++++++++++++++++++++++++++++++ + src/liblzma/common/common.h | 16 +++++--- + src/liblzma/delta/Makefile.am | 28 ------------- + src/liblzma/delta/Makefile.inc | 23 +++++++++++ + src/liblzma/lz/Makefile.am | 29 -------------- + src/liblzma/lz/Makefile.inc | 21 ++++++++++ + src/liblzma/lzma/Makefile.am | 51 ------------------------ + src/liblzma/lzma/Makefile.inc | 43 ++++++++++++++++++++ + src/liblzma/rangecoder/Makefile.am | 26 ------------ + src/liblzma/rangecoder/Makefile.inc | 21 ++++++++++ + src/liblzma/simple/Makefile.am | 51 ------------------------ + src/liblzma/simple/Makefile.inc | 47 ++++++++++++++++++++++ + src/liblzma/subblock/Makefile.am | 26 ------------ + src/liblzma/subblock/Makefile.inc | 20 ++++++++++ + src/xz/Makefile.am | 11 +++++- + src/xzdec/Makefile.am | 20 +++++++++- 21 files changed, 417 insertions(+), 372 deletions(-) commit 89dac1db6f168d7469cfbc4432651d4724c5c0de @@ -4548,8 +5548,8 @@ Date: 2009-06-29 22:19:51 +0300 Added a comment about "autoconf -fi" to autogen.sh. - autogen.sh | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + autogen.sh | 3 +++ + 1 file changed, 3 insertions(+) commit 6e685aae4594bc0af1b5032e01bb37d0edaa3ebd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4557,8 +5557,8 @@ Date: 2009-06-28 10:04:24 +0300 Add -no-undefined to get shared liblzma on Windows. - src/liblzma/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 73f560ee5fa064992b76688d9472baf139432540 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4566,8 +5566,8 @@ Date: 2009-06-27 22:57:15 +0300 Make physmem() work on Cygwin 1.5 and older. - src/common/physmem.h | 77 ++++++++++++++++++++++++++------------------------ - 1 files changed, 40 insertions(+), 37 deletions(-) + src/common/physmem.h | 77 +++++++++++++++++++++++++++------------------------- + 1 file changed, 40 insertions(+), 37 deletions(-) commit 7ff0004fbce24ae72eddfe392828ffd7d4639ed1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4576,17 +5576,17 @@ Date: 2009-06-27 17:28:01 +0300 Moved the Windows resource files outside the windows directory to prepare for building them with Autotools. - src/common/common_w32res.rc | 46 +++++++++++++++++++++++++++++++++++++++++ - src/liblzma/liblzma_w32res.rc | 5 ++++ - src/xz/xz_w32res.rc | 5 ++++ - src/xzdec/lzmadec_w32res.rc | 5 ++++ - src/xzdec/xzdec_w32res.rc | 5 ++++ - windows/Makefile | 35 +++++++++++++++++-------------- - windows/common.rc | 46 ----------------------------------------- - windows/liblzma.rc | 5 ---- - windows/lzmadec.rc | 5 ---- - windows/xz.rc | 5 ---- - windows/xzdec.rc | 5 ---- + src/common/common_w32res.rc | 46 +++++++++++++++++++++++++++++++++++++++++++ + src/liblzma/liblzma_w32res.rc | 5 +++++ + src/xz/xz_w32res.rc | 5 +++++ + src/xzdec/lzmadec_w32res.rc | 5 +++++ + src/xzdec/xzdec_w32res.rc | 5 +++++ + windows/Makefile | 35 +++++++++++++++++--------------- + windows/common.rc | 46 ------------------------------------------- + windows/liblzma.rc | 5 ----- + windows/lzmadec.rc | 5 ----- + windows/xz.rc | 5 ----- + windows/xzdec.rc | 5 ----- 11 files changed, 85 insertions(+), 82 deletions(-) commit 449c634674f35336a4815d398172e447659a135e @@ -4595,8 +5595,8 @@ Date: 2009-06-27 13:05:03 +0300 Added missing $(EXEEXT). - src/xz/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 792db79f27ad9ab1fb977e23be65c7761f545752 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4605,9 +5605,9 @@ Date: 2009-06-27 12:32:40 +0300 Create correct symlinks even when --program-{prefix,suffix,transform} is passed to configure. - src/scripts/Makefile.am | 80 +++++++++++++++++++++++++++-------------------- - src/xz/Makefile.am | 21 +++++++----- - src/xzdec/Makefile.am | 9 +++-- + src/scripts/Makefile.am | 80 ++++++++++++++++++++++++++++--------------------- + src/xz/Makefile.am | 21 ++++++++----- + src/xzdec/Makefile.am | 9 ++++-- 3 files changed, 65 insertions(+), 45 deletions(-) commit 0adc72feb84f5b903f6ad9d3f759b1c326fafc6b @@ -4616,8 +5616,8 @@ Date: 2009-06-27 10:02:24 +0300 Silence a compiler warning on DOS-like systems. - src/xz/file_io.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + src/xz/file_io.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) commit ad12edc95254ede3f0cb8dec8645e8789e984c4f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4625,8 +5625,8 @@ Date: 2009-06-27 09:35:15 +0300 Updated the filenames in POTFILES.in too. - po/POTFILES.in | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + po/POTFILES.in | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit b2b1f867532732fe9969131f8713bdd6b0731763 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4635,8 +5635,8 @@ Date: 2009-06-27 00:43:06 +0300 Hopefully improved portability of the assembler code in Autotools based builds on Windows. - src/liblzma/check/crc32_x86.S | 8 +++++++- - src/liblzma/check/crc64_x86.S | 8 +++++++- + src/liblzma/check/crc32_x86.S | 8 +++++++- + src/liblzma/check/crc64_x86.S | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) commit c393055947247627a09b6a6b8f20aa0c32f9be16 @@ -4646,8 +5646,8 @@ Date: 2009-06-26 21:17:29 +0300 Updated THANKS (most of today's commits are based on Charles Wilson's patches). - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit da0af22e4b4139b8a10710945f8b245b3a77c97d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4655,10 +5655,10 @@ Date: 2009-06-26 21:00:35 +0300 Updated comments to match renamed files. - src/xz/coder.c | 2 +- - src/xz/coder.h | 2 +- - src/xz/file_io.c | 2 +- - src/xz/file_io.h | 2 +- + src/xz/coder.c | 2 +- + src/xz/coder.h | 2 +- + src/xz/file_io.c | 2 +- + src/xz/file_io.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) commit 65014fd211dfbd4be48685998cb5a12aaa29c8d2 @@ -4669,18 +5669,18 @@ Date: 2009-06-26 20:49:54 +0300 to avoid problems on systems with system headers with those names. - dos/Makefile | 4 +- - src/xz/Makefile.am | 8 +- - src/xz/coder.c | 488 +++++++++++++++++++++++++++++++++++ - src/xz/coder.h | 57 ++++ - src/xz/file_io.c | 716 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/file_io.h | 86 +++++++ - src/xz/io.c | 716 ---------------------------------------------------- - src/xz/io.h | 86 ------- - src/xz/private.h | 4 +- - src/xz/process.c | 488 ----------------------------------- - src/xz/process.h | 57 ---- - windows/Makefile | 4 +- + dos/Makefile | 4 +- + src/xz/Makefile.am | 8 +- + src/xz/coder.c | 488 ++++++++++++++++++++++++++++++++++++ + src/xz/coder.h | 57 +++++ + src/xz/file_io.c | 716 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + src/xz/file_io.h | 86 +++++++ + src/xz/io.c | 716 ----------------------------------------------------- + src/xz/io.h | 86 ------- + src/xz/private.h | 4 +- + src/xz/process.c | 488 ------------------------------------ + src/xz/process.h | 57 ----- + windows/Makefile | 4 +- 12 files changed, 1357 insertions(+), 1357 deletions(-) commit 5e1257466dcb66f1d7a3f71814a5ad885cba43e8 @@ -4689,9 +5689,9 @@ Date: 2009-06-26 20:43:36 +0300 Rename process_file() to coder_run(). - src/xz/main.c | 6 +++--- - src/xz/process.c | 6 +++--- - src/xz/process.h | 5 ++--- + src/xz/main.c | 6 +++--- + src/xz/process.c | 6 +++--- + src/xz/process.h | 5 ++--- 3 files changed, 8 insertions(+), 9 deletions(-) commit cad62551c5fa9865dbe0841a0b3bc729c4fbe8fc @@ -4702,12 +5702,12 @@ Date: 2009-06-26 20:36:45 +0300 format character with snprintf() on POSIX systems but not on non-POSIX systems and still keep xgettext working. - dos/Makefile | 16 +++------------- - src/xz/message.c | 17 +++++++++-------- - src/xz/process.c | 30 +++++++++++++++--------------- - src/xz/util.c | 34 ++++++++++++++++++++++++++++++++++ - src/xz/util.h | 20 ++++++++++++++++++++ - windows/Makefile | 13 +++---------- + dos/Makefile | 16 +++------------- + src/xz/message.c | 17 +++++++++-------- + src/xz/process.c | 30 +++++++++++++++--------------- + src/xz/util.c | 34 ++++++++++++++++++++++++++++++++++ + src/xz/util.h | 20 ++++++++++++++++++++ + windows/Makefile | 13 +++---------- 6 files changed, 84 insertions(+), 46 deletions(-) commit fe378d47074b16c52b00fe184d119287c68ce2e7 @@ -4716,8 +5716,8 @@ Date: 2009-06-26 15:40:40 +0300 Added missing source files to windows/Makefile. - windows/Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + windows/Makefile | 2 ++ + 1 file changed, 2 insertions(+) commit 390a6408563067613b29de895cb40e4d0386d62c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4727,12 +5727,12 @@ Date: 2009-06-26 15:37:53 +0300 the Autotools based build system. It's not good yet, more fixes will follow. - configure.ac | 7 +++++++ - src/liblzma/api/lzma.h | 7 +++++-- - src/liblzma/check/crc32_x86.S | 7 ++++--- - src/liblzma/check/crc64_x86.S | 7 ++++--- - src/liblzma/common/common.h | 2 +- - windows/Makefile | 16 +++++++--------- + configure.ac | 7 +++++++ + src/liblzma/api/lzma.h | 7 +++++-- + src/liblzma/check/crc32_x86.S | 7 ++++--- + src/liblzma/check/crc64_x86.S | 7 ++++--- + src/liblzma/common/common.h | 2 +- + windows/Makefile | 16 +++++++--------- 6 files changed, 28 insertions(+), 18 deletions(-) commit 1c9360b7d1197457aaad2f8888b99f1149861579 @@ -4743,18 +5743,18 @@ Date: 2009-06-26 14:47:31 +0300 Fix the ordering of libgnu.a and LTLIBINTL on the linker command line and added missing LTLIBINTL to tests/Makefile.am. - debug/Makefile.am | 12 ++++++------ - src/liblzma/check/Makefile.am | 4 ++-- - src/liblzma/common/Makefile.am | 16 ++++++++-------- - src/liblzma/delta/Makefile.am | 4 ++-- - src/liblzma/lz/Makefile.am | 6 +++--- - src/liblzma/lzma/Makefile.am | 8 ++++---- - src/liblzma/rangecoder/Makefile.am | 4 ++-- - src/liblzma/simple/Makefile.am | 4 ++-- - src/liblzma/subblock/Makefile.am | 4 ++-- - src/xz/Makefile.am | 21 +++++++++++---------- - src/xzdec/Makefile.am | 19 ++++++++++--------- - tests/Makefile.am | 12 +++++++----- + debug/Makefile.am | 12 ++++++------ + src/liblzma/check/Makefile.am | 4 ++-- + src/liblzma/common/Makefile.am | 16 ++++++++-------- + src/liblzma/delta/Makefile.am | 4 ++-- + src/liblzma/lz/Makefile.am | 6 +++--- + src/liblzma/lzma/Makefile.am | 8 ++++---- + src/liblzma/rangecoder/Makefile.am | 4 ++-- + src/liblzma/simple/Makefile.am | 4 ++-- + src/liblzma/subblock/Makefile.am | 4 ++-- + src/xz/Makefile.am | 21 +++++++++++---------- + src/xzdec/Makefile.am | 19 ++++++++++--------- + tests/Makefile.am | 12 +++++++----- 12 files changed, 59 insertions(+), 55 deletions(-) commit d45615c555e250209ebb55aa3649abe790f1eeac @@ -4763,8 +5763,8 @@ Date: 2009-06-26 14:20:02 +0300 Allow to explicitly specify autotool versions in autogen.sh. - autogen.sh | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + autogen.sh | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) commit eaf8367368a329afa48785380f9dca6b681f3397 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4772,8 +5772,8 @@ Date: 2009-06-26 14:18:32 +0300 Add version.sh to EXTRA_DIST. - Makefile.am | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit b317b218e2d383dd27a700094c0de4510540ea18 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4781,8 +5781,8 @@ Date: 2009-06-24 20:14:10 +0300 Support HW_PHYSMEM64 - src/common/physmem.h | 30 +++++++++++++++++++----------- - 1 files changed, 19 insertions(+), 11 deletions(-) + src/common/physmem.h | 30 +++++++++++++++++++----------- + 1 file changed, 19 insertions(+), 11 deletions(-) commit ae82dde5d9cc60c80cc89601b6c51cc1611d48e7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4790,8 +5790,8 @@ Date: 2009-06-24 13:01:59 +0300 Cast a char argument to isspace() to unsigned char. - src/xz/args.c | 11 +++++++++-- - 1 files changed, 9 insertions(+), 2 deletions(-) + src/xz/args.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) commit 1735d31ea347210e914df038eeea4b2626e76e42 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4799,8 +5799,8 @@ Date: 2009-06-05 13:46:26 +0300 A few more spelling fixes. Released the .xz spec 1.0.3. - doc/xz-file-format.txt | 12 +++++++----- - 1 files changed, 7 insertions(+), 5 deletions(-) + doc/xz-file-format.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) commit 8ed156ce894966103e895aa08f2a9fb912f6fad5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4808,9 +5808,9 @@ Date: 2009-06-04 23:42:12 +0300 Added xzdec man page. - src/xzdec/Makefile.am | 11 +++ - src/xzdec/xzdec.1 | 173 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 184 insertions(+), 0 deletions(-) + src/xzdec/Makefile.am | 11 ++++ + src/xzdec/xzdec.1 | 173 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 184 insertions(+) commit f6df39afaa84f71439507178a49b2a5dda6e824c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4819,8 +5819,8 @@ Date: 2009-06-04 23:26:47 +0300 Harmonized xzdec --memory with xz --memory and made minor cleanups. - src/xzdec/xzdec.c | 74 ++++++++++++++++++++++++++++++++++++++--------------- - 1 files changed, 53 insertions(+), 21 deletions(-) + src/xzdec/xzdec.c | 74 +++++++++++++++++++++++++++++++++++++++---------------- + 1 file changed, 53 insertions(+), 21 deletions(-) commit 1774f27c61ce294a56712ca2f4785f90a62441bc Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4829,10 +5829,10 @@ Date: 2009-06-04 22:59:55 +0300 Fix purporse -> purpose. Thanks to Andrew Dudman. Released .xz spec 1.0.2 due to this fix too. - THANKS | 1 + - doc/xz-file-format.txt | 8 +++++--- - src/liblzma/liblzma.pc.in | 2 +- - windows/Makefile | 2 +- + THANKS | 1 + + doc/xz-file-format.txt | 8 +++++--- + src/liblzma/liblzma.pc.in | 2 +- + windows/Makefile | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) commit cb613455642f48fb51059e22018615f64c59b70f @@ -4841,8 +5841,8 @@ Date: 2009-06-01 14:53:57 +0300 The .xz file format version 1.0.1 - doc/xz-file-format.txt | 29 ++++++++++++++++++++++------- - 1 files changed, 22 insertions(+), 7 deletions(-) + doc/xz-file-format.txt | 29 ++++++++++++++++++++++------- + 1 file changed, 22 insertions(+), 7 deletions(-) commit 083c23c680ff844846d177cfc58bb7a874e7e6b9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4853,10 +5853,10 @@ Date: 2009-05-26 14:48:48 +0300 This changes ABI but not doesn't break API. - src/liblzma/api/lzma/block.h | 17 ++++++++++++++ - src/liblzma/common/block_buffer_encoder.c | 1 + - src/liblzma/common/block_decoder.c | 34 ++++++++++++---------------- - src/liblzma/common/block_encoder.c | 21 +++++++---------- + src/liblzma/api/lzma/block.h | 17 ++++++++++++++++ + src/liblzma/common/block_buffer_encoder.c | 1 + + src/liblzma/common/block_decoder.c | 34 ++++++++++++++----------------- + src/liblzma/common/block_encoder.c | 21 ++++++++----------- 4 files changed, 42 insertions(+), 31 deletions(-) commit b4f5c814090dc07d4350453576305e41eb9c998d @@ -4866,8 +5866,8 @@ Date: 2009-05-23 16:57:21 +0300 Remove undocumented alternative option names --bcj, --ppc, and --itanium. - src/xz/args.c | 3 --- - 1 files changed, 0 insertions(+), 3 deletions(-) + src/xz/args.c | 3 --- + 1 file changed, 3 deletions(-) commit b1edee2cdc7ef4411b1a21c07094ec763f071281 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4876,10 +5876,10 @@ Date: 2009-05-23 15:12:23 +0300 Add support for specifying the BCJ filter start offset in the xz command line tool. - src/xz/args.c | 36 +++++++++++++++++++++--------------- - src/xz/message.c | 14 ++++++++------ - src/xz/options.c | 40 ++++++++++++++++++++++++++++++++++++++++ - src/xz/options.h | 7 +++++++ + src/xz/args.c | 36 +++++++++++++++++++++--------------- + src/xz/message.c | 14 ++++++++------ + src/xz/options.c | 40 ++++++++++++++++++++++++++++++++++++++++ + src/xz/options.h | 7 +++++++ 4 files changed, 76 insertions(+), 21 deletions(-) commit 72aa0e9c5f4289f10ef5bf240a9448d3017f1ceb @@ -4888,8 +5888,8 @@ Date: 2009-05-23 14:51:09 +0300 Updated THANKS. - THANKS | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + THANKS | 2 ++ + 1 file changed, 2 insertions(+) commit dcedb6998cefeca6597dd1219328a3abf5acf66d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4898,8 +5898,8 @@ Date: 2009-05-22 16:40:50 +0300 Added support for --quiet and --no-warn to xzdec. Cleaned up the --help message a little. - src/xzdec/xzdec.c | 76 ++++++++++++++++++++++++++++++++++------------------- - 1 files changed, 49 insertions(+), 27 deletions(-) + src/xzdec/xzdec.c | 76 +++++++++++++++++++++++++++++++++++-------------------- + 1 file changed, 49 insertions(+), 27 deletions(-) commit 5f735dae80aa629853f4831d7b84ec1c614979eb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4910,8 +5910,8 @@ Date: 2009-05-22 15:11:52 +0300 Update the memory usage info text in --help to match the text in xz --long-help. - src/xzdec/xzdec.c | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + src/xzdec/xzdec.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit b60376249e0c586910c4121fab4f791820cc1289 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4919,11 +5919,11 @@ Date: 2009-05-22 14:43:00 +0300 Add --no-warn. - src/xz/args.c | 8 +++++++- - src/xz/main.c | 17 +++++++++++++++++ - src/xz/main.h | 6 ++++++ - src/xz/message.c | 4 ++++ - 4 files changed, 34 insertions(+), 1 deletions(-) + src/xz/args.c | 8 +++++++- + src/xz/main.c | 17 +++++++++++++++++ + src/xz/main.h | 6 ++++++ + src/xz/message.c | 4 ++++ + 4 files changed, 34 insertions(+), 1 deletion(-) commit b4f92f522d4b854c0adb7c38be7531e1a6a7b008 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4931,8 +5931,8 @@ Date: 2009-05-22 14:27:40 +0300 Fix a comment. - src/xz/main.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/main.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 4dd21d23f22569285ae706b58b0e5904b8db1839 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4940,8 +5940,8 @@ Date: 2009-05-22 14:21:20 +0300 Remove the --info option, which was an alias for --list. - src/xz/args.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + src/xz/args.c | 1 - + 1 file changed, 1 deletion(-) commit 8836139b63ce774bdd62abf17ab69b290e08229e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4953,8 +5953,8 @@ Date: 2009-05-22 12:27:43 +0300 commit it did. The new way is slightly simpler in code and especially in upcoming documentation. - src/xz/args.c | 17 ++++++----------- - 1 files changed, 6 insertions(+), 11 deletions(-) + src/xz/args.c | 17 ++++++----------- + 1 file changed, 6 insertions(+), 11 deletions(-) commit b0063023f8adb06ea735ec4af5c6f5b7bdb8e84d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -4977,11 +5977,11 @@ Date: 2009-05-22 11:29:50 +0300 Cleaned up the output of --help and --long-help. - src/xz/args.c | 28 +++++++++++++---- - src/xz/hardware.c | 86 ++++++++++++++++++++++------------------------------ - src/xz/hardware.h | 10 +++--- - src/xz/message.c | 28 ++++++++--------- - src/xz/process.c | 18 ++++------- + src/xz/args.c | 28 +++++++++++++----- + src/xz/hardware.c | 86 +++++++++++++++++++++++-------------------------------- + src/xz/hardware.h | 10 +++---- + src/xz/message.c | 28 +++++++++--------- + src/xz/process.c | 18 +++++------- 5 files changed, 82 insertions(+), 88 deletions(-) commit 071b825b23911a69dd1cd2f8cda004ef8a781fae @@ -4993,9 +5993,9 @@ Date: 2009-05-21 17:22:01 +0300 an integer overflow and to not give wrong impression that the limit is high enough when it may not actually be. - src/xz/util.c | 4 ++++ - src/xzdec/xzdec.c | 6 +++++- - 2 files changed, 9 insertions(+), 1 deletions(-) + src/xz/util.c | 4 ++++ + src/xzdec/xzdec.c | 6 +++++- + 2 files changed, 9 insertions(+), 1 deletion(-) commit 03ca67fd37dd43fa7f590de340899cd497c10802 Author: ABCD <en.abcd@gmail.com> @@ -5007,8 +6007,8 @@ Date: 2009-05-20 17:31:18 -0400 It also installs symlinks for the manual pages and removes the new symlinks on uninstall. - src/scripts/Makefile.am | 16 ++++++++++++++-- - 1 files changed, 14 insertions(+), 2 deletions(-) + src/scripts/Makefile.am | 16 ++++++++++++++-- + 1 file changed, 14 insertions(+), 2 deletions(-) commit a6f43e64128a6da5cd641de1e1e527433b3e5638 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5017,9 +6017,9 @@ Date: 2009-05-02 16:10:14 +0300 Use a GCC-specific #pragma instead of GCC-specific -Wno-uninitialized to silence a bogus warning. - configure.ac | 13 ------------- - src/liblzma/check/Makefile.am | 5 ----- - src/liblzma/check/sha256.c | 5 +++++ + configure.ac | 13 ------------- + src/liblzma/check/Makefile.am | 5 ----- + src/liblzma/check/sha256.c | 5 +++++ 3 files changed, 5 insertions(+), 18 deletions(-) commit f6ce63ebdb45a857c8949960c83c9580ae888951 @@ -5030,8 +6030,8 @@ Date: 2009-05-02 14:46:50 +0300 given to --enable-encoders and --enable-decoders to determine if any encoder or decoder support is wanted. - configure.ac | 48 ++++++++---------------------------------------- - 1 files changed, 8 insertions(+), 40 deletions(-) + configure.ac | 48 ++++++++---------------------------------------- + 1 file changed, 8 insertions(+), 40 deletions(-) commit be06858d5cf8ba46557395035d821dc332f3f830 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5040,12 +6040,12 @@ Date: 2009-05-01 11:28:52 +0300 Remove docs that are too outdated to be updated (rewrite will be better). - doc/liblzma-advanced.txt | 324 ---------------------------------------------- - doc/liblzma-hacking.txt | 112 ---------------- - doc/liblzma-intro.txt | 194 --------------------------- - doc/liblzma-security.txt | 219 ------------------------------- - doc/lzma-intro.txt | 107 --------------- - 5 files changed, 0 insertions(+), 956 deletions(-) + doc/liblzma-advanced.txt | 324 ----------------------------------------------- + doc/liblzma-hacking.txt | 112 ---------------- + doc/liblzma-intro.txt | 194 ---------------------------- + doc/liblzma-security.txt | 219 -------------------------------- + doc/lzma-intro.txt | 107 ---------------- + 5 files changed, 956 deletions(-) commit 0255401e57c96af87c6b159eca28974e79430a82 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5053,8 +6053,8 @@ Date: 2009-05-01 11:21:46 +0300 Added documentation about the legacy .lzma file format. - doc/lzma-file-format.txt | 166 ++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 166 insertions(+), 0 deletions(-) + doc/lzma-file-format.txt | 166 +++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 166 insertions(+) commit 1496ff437c46f38303e0e94c511ca604b3a11f85 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5084,17 +6084,17 @@ Date: 2009-04-28 23:08:32 +0300 a single xz command. The first file should have e.g. x86+LZMA2 as the filter chain, and the second file just LZMA2. - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/alone_encoder.c | 4 ++-- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_decoder.c | 2 +- - src/liblzma/common/block_encoder.c | 2 +- - src/liblzma/common/common.h | 4 ++-- - src/liblzma/common/easy_encoder.c | 2 +- - src/liblzma/common/index_decoder.c | 2 +- - src/liblzma/common/index_encoder.c | 2 +- - src/liblzma/common/stream_decoder.c | 2 +- - src/liblzma/common/stream_encoder.c | 2 +- + src/liblzma/common/alone_decoder.c | 2 +- + src/liblzma/common/alone_encoder.c | 4 ++-- + src/liblzma/common/auto_decoder.c | 2 +- + src/liblzma/common/block_decoder.c | 2 +- + src/liblzma/common/block_encoder.c | 2 +- + src/liblzma/common/common.h | 4 ++-- + src/liblzma/common/easy_encoder.c | 2 +- + src/liblzma/common/index_decoder.c | 2 +- + src/liblzma/common/index_encoder.c | 2 +- + src/liblzma/common/stream_decoder.c | 2 +- + src/liblzma/common/stream_encoder.c | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) commit e518d167aa5958e469982f4fb3a24b9b6a2b5d1c @@ -5106,8 +6106,8 @@ Date: 2009-04-15 14:13:38 +0300 On 64-bit system it would have gone into infinite loop if a single input buffer was over 4 GiB (unlikely). - src/liblzma/simple/arm.c | 2 +- - src/liblzma/simple/armthumb.c | 2 +- + src/liblzma/simple/arm.c | 2 +- + src/liblzma/simple/armthumb.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 31decdce041581e57c0d8a407d4795b114ef27ca @@ -5116,8 +6116,8 @@ Date: 2009-04-14 11:48:46 +0300 Minor fixes to test files' README. - tests/files/README | 17 +++++++++-------- - 1 files changed, 9 insertions(+), 8 deletions(-) + tests/files/README | 17 +++++++++-------- + 1 file changed, 9 insertions(+), 8 deletions(-) commit 4787d654434891c7df5b43959b0d2873718f06e0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5125,8 +6125,8 @@ Date: 2009-04-13 16:36:41 +0300 Updated history.txt. - doc/history.txt | 123 +++++++++++++++++++++++++++++------------------------- - 1 files changed, 66 insertions(+), 57 deletions(-) + doc/history.txt | 123 ++++++++++++++++++++++++++++++-------------------------- + 1 file changed, 66 insertions(+), 57 deletions(-) commit 2f0bc9cd40f709152a0177c8e585c0757e9af9c9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5134,19 +6134,19 @@ Date: 2009-04-13 14:49:48 +0300 Quick & dirty update to support xz in diff/grep/more scripts. - src/scripts/Makefile.am | 38 +++++++++----- - src/scripts/lzdiff | 67 ------------------------- - src/scripts/lzdiff.1 | 51 ------------------- - src/scripts/lzgrep | 123 ----------------------------------------------- - src/scripts/lzgrep.1 | 61 ----------------------- - src/scripts/lzmore | 74 ---------------------------- - src/scripts/lzmore.1 | 55 --------------------- - src/scripts/xzdiff | 67 +++++++++++++++++++++++++ - src/scripts/xzdiff.1 | 58 ++++++++++++++++++++++ - src/scripts/xzgrep | 123 +++++++++++++++++++++++++++++++++++++++++++++++ - src/scripts/xzgrep.1 | 77 +++++++++++++++++++++++++++++ - src/scripts/xzmore | 74 ++++++++++++++++++++++++++++ - src/scripts/xzmore.1 | 66 +++++++++++++++++++++++++ + src/scripts/Makefile.am | 38 +++++++++------ + src/scripts/lzdiff | 67 -------------------------- + src/scripts/lzdiff.1 | 51 -------------------- + src/scripts/lzgrep | 123 ------------------------------------------------ + src/scripts/lzgrep.1 | 61 ------------------------ + src/scripts/lzmore | 74 ----------------------------- + src/scripts/lzmore.1 | 55 ---------------------- + src/scripts/xzdiff | 67 ++++++++++++++++++++++++++ + src/scripts/xzdiff.1 | 58 +++++++++++++++++++++++ + src/scripts/xzgrep | 123 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/scripts/xzgrep.1 | 77 ++++++++++++++++++++++++++++++ + src/scripts/xzmore | 74 +++++++++++++++++++++++++++++ + src/scripts/xzmore.1 | 66 ++++++++++++++++++++++++++ 13 files changed, 489 insertions(+), 445 deletions(-) commit 02ddf09bc3079b3e17297729b9e43f14d407b8fc @@ -5156,213 +6156,213 @@ Date: 2009-04-13 11:27:40 +0300 Put the interesting parts of XZ Utils into the public domain. Some minor documentation cleanups were made at the same time. - COPYING | 67 ++++++++++++++++++------ - ChangeLog | 2 +- - Doxyfile.in | 8 ++- - Makefile.am | 13 +---- - autogen.sh | 9 +++ - configure.ac | 13 +---- - debug/Makefile.am | 13 +---- - debug/crc32.c | 13 +---- - debug/full_flush.c | 13 +---- - debug/hex2bin.c | 7 +-- - debug/known_sizes.c | 13 +---- - debug/memusage.c | 13 +---- - debug/repeat.c | 13 +---- - debug/sync_flush.c | 13 +---- - doc/faq.txt | 38 +------------ - lib/Makefile.am | 18 +++--- - src/Makefile.am | 13 +---- - src/common/bswap.h | 7 +-- - src/common/cpucores.h | 7 +-- - src/common/integer.h | 7 +-- - src/common/mythread.h | 4 +- - src/common/open_stdxxx.h | 7 +-- - src/common/physmem.h | 7 +-- - src/common/sysdefs.h | 13 +---- - src/liblzma/Makefile.am | 13 +---- - src/liblzma/api/Makefile.am | 13 +---- - src/liblzma/api/lzma.h | 38 ++++++++----- - src/liblzma/api/lzma/base.h | 20 +++---- - src/liblzma/api/lzma/bcj.h | 18 +++---- - src/liblzma/api/lzma/block.h | 18 +++---- - src/liblzma/api/lzma/check.h | 18 +++---- - src/liblzma/api/lzma/container.h | 18 +++---- - src/liblzma/api/lzma/delta.h | 18 +++---- - src/liblzma/api/lzma/filter.h | 18 +++---- - src/liblzma/api/lzma/index.h | 18 +++---- - src/liblzma/api/lzma/index_hash.h | 22 +++----- - src/liblzma/api/lzma/lzma.h | 18 +++---- - src/liblzma/api/lzma/stream_flags.h | 18 +++---- - src/liblzma/api/lzma/subblock.h | 18 +++---- - src/liblzma/api/lzma/version.h | 18 +++---- - src/liblzma/api/lzma/vli.h | 42 +++++++-------- - src/liblzma/check/Makefile.am | 8 +-- - src/liblzma/check/check.c | 7 +-- - src/liblzma/check/check.h | 7 +-- - src/liblzma/check/crc32_fast.c | 30 ++++------ - src/liblzma/check/crc32_small.c | 7 +-- - src/liblzma/check/crc32_table.c | 7 +-- - src/liblzma/check/crc32_tablegen.c | 7 +-- - src/liblzma/check/crc32_x86.S | 21 +++++--- - src/liblzma/check/crc64_fast.c | 20 +++---- - src/liblzma/check/crc64_small.c | 7 +-- - src/liblzma/check/crc64_table.c | 7 +-- - src/liblzma/check/crc64_tablegen.c | 7 +-- - src/liblzma/check/crc64_x86.S | 14 +++-- - src/liblzma/check/crc_macros.h | 9 ++-- - src/liblzma/check/sha256.c | 23 +++++--- - src/liblzma/common/Makefile.am | 13 +---- - src/liblzma/common/alone_decoder.c | 13 +---- - src/liblzma/common/alone_decoder.h | 13 +---- - src/liblzma/common/alone_encoder.c | 13 +---- - src/liblzma/common/auto_decoder.c | 13 +---- - src/liblzma/common/block_buffer_decoder.c | 13 +---- - src/liblzma/common/block_buffer_encoder.c | 13 +---- - src/liblzma/common/block_decoder.c | 13 +---- - src/liblzma/common/block_decoder.h | 13 +---- - src/liblzma/common/block_encoder.c | 13 +---- - src/liblzma/common/block_encoder.h | 13 +---- - src/liblzma/common/block_header_decoder.c | 13 +---- - src/liblzma/common/block_header_encoder.c | 13 +---- - src/liblzma/common/block_util.c | 13 +---- - src/liblzma/common/bsr.h | 7 +-- - src/liblzma/common/chunk_size.c | 13 +---- - src/liblzma/common/common.c | 13 +---- - src/liblzma/common/common.h | 13 +---- - src/liblzma/common/easy_buffer_encoder.c | 13 +---- - src/liblzma/common/easy_decoder_memusage.c | 13 +---- - src/liblzma/common/easy_encoder.c | 13 +---- - src/liblzma/common/easy_encoder_memusage.c | 13 +---- - src/liblzma/common/easy_preset.c | 13 +---- - src/liblzma/common/easy_preset.h | 13 +---- - src/liblzma/common/filter_buffer_decoder.c | 13 +---- - src/liblzma/common/filter_buffer_encoder.c | 13 +---- - src/liblzma/common/filter_common.c | 13 +---- - src/liblzma/common/filter_common.h | 13 +---- - src/liblzma/common/filter_decoder.c | 13 +---- - src/liblzma/common/filter_decoder.h | 13 +---- - src/liblzma/common/filter_encoder.c | 13 +---- - src/liblzma/common/filter_encoder.h | 13 +---- - src/liblzma/common/filter_flags_decoder.c | 13 +---- - src/liblzma/common/filter_flags_encoder.c | 13 +---- - src/liblzma/common/index.c | 13 +---- - src/liblzma/common/index.h | 13 +---- - src/liblzma/common/index_decoder.c | 13 +---- - src/liblzma/common/index_encoder.c | 13 +---- - src/liblzma/common/index_encoder.h | 13 +---- - src/liblzma/common/index_hash.c | 13 +---- - src/liblzma/common/stream_buffer_decoder.c | 13 +---- - src/liblzma/common/stream_buffer_encoder.c | 13 +---- - src/liblzma/common/stream_decoder.c | 13 +---- - src/liblzma/common/stream_decoder.h | 13 +---- - src/liblzma/common/stream_encoder.c | 13 +---- - src/liblzma/common/stream_encoder.h | 13 +---- - src/liblzma/common/stream_flags_common.c | 13 +---- - src/liblzma/common/stream_flags_common.h | 13 +---- - src/liblzma/common/stream_flags_decoder.c | 13 +---- - src/liblzma/common/stream_flags_encoder.c | 13 +---- - src/liblzma/common/vli_decoder.c | 13 +---- - src/liblzma/common/vli_encoder.c | 13 +---- - src/liblzma/common/vli_size.c | 13 +---- - src/liblzma/delta/Makefile.am | 13 +---- - src/liblzma/delta/delta_common.c | 13 +---- - src/liblzma/delta/delta_common.h | 13 +---- - src/liblzma/delta/delta_decoder.c | 13 +---- - src/liblzma/delta/delta_decoder.h | 13 +---- - src/liblzma/delta/delta_encoder.c | 13 +---- - src/liblzma/delta/delta_encoder.h | 13 +---- - src/liblzma/delta/delta_private.h | 13 +---- - src/liblzma/lz/Makefile.am | 13 +---- - src/liblzma/lz/lz_decoder.c | 17 ++---- - src/liblzma/lz/lz_decoder.h | 17 ++---- - src/liblzma/lz/lz_encoder.c | 17 ++---- - src/liblzma/lz/lz_encoder.h | 17 ++---- - src/liblzma/lz/lz_encoder_hash.h | 13 +---- - src/liblzma/lz/lz_encoder_mf.c | 17 ++---- - src/liblzma/lzma/Makefile.am | 13 +---- - src/liblzma/lzma/fastpos.h | 17 ++---- - src/liblzma/lzma/fastpos_tablegen.c | 17 ++---- - src/liblzma/lzma/lzma2_decoder.c | 17 ++---- - src/liblzma/lzma/lzma2_decoder.h | 17 ++---- - src/liblzma/lzma/lzma2_encoder.c | 17 ++---- - src/liblzma/lzma/lzma2_encoder.h | 17 ++---- - src/liblzma/lzma/lzma_common.h | 17 ++---- - src/liblzma/lzma/lzma_decoder.c | 17 ++---- - src/liblzma/lzma/lzma_decoder.h | 17 ++---- - src/liblzma/lzma/lzma_encoder.c | 17 ++---- - src/liblzma/lzma/lzma_encoder.h | 17 ++---- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 13 +---- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 13 +---- - src/liblzma/lzma/lzma_encoder_presets.c | 13 +---- - src/liblzma/lzma/lzma_encoder_private.h | 17 ++---- - src/liblzma/rangecoder/Makefile.am | 13 +---- - src/liblzma/rangecoder/price.h | 13 +---- - src/liblzma/rangecoder/price_tablegen.c | 16 ++---- - src/liblzma/rangecoder/range_common.h | 17 ++---- - src/liblzma/rangecoder/range_decoder.h | 17 ++---- - src/liblzma/rangecoder/range_encoder.h | 17 ++---- - src/liblzma/simple/Makefile.am | 13 +---- - src/liblzma/simple/arm.c | 17 ++---- - src/liblzma/simple/armthumb.c | 17 ++---- - src/liblzma/simple/ia64.c | 17 ++---- - src/liblzma/simple/powerpc.c | 17 ++---- - src/liblzma/simple/simple_coder.c | 13 +---- - src/liblzma/simple/simple_coder.h | 14 +---- - src/liblzma/simple/simple_decoder.c | 13 +---- - src/liblzma/simple/simple_decoder.h | 13 +---- - src/liblzma/simple/simple_encoder.c | 13 +---- - src/liblzma/simple/simple_encoder.h | 13 +---- - src/liblzma/simple/simple_private.h | 13 +---- - src/liblzma/simple/sparc.c | 17 ++---- - src/liblzma/simple/x86.c | 17 ++---- - src/liblzma/subblock/Makefile.am | 13 +---- - src/liblzma/subblock/subblock_decoder.c | 13 +---- - src/liblzma/subblock/subblock_decoder.h | 13 +---- - src/liblzma/subblock/subblock_decoder_helper.c | 13 +---- - src/liblzma/subblock/subblock_decoder_helper.h | 13 +---- - src/liblzma/subblock/subblock_encoder.c | 13 +---- - src/liblzma/subblock/subblock_encoder.h | 13 +---- - src/scripts/Makefile.am | 7 +++ - src/xz/Makefile.am | 13 +---- - src/xz/args.c | 13 +---- - src/xz/args.h | 13 +---- - src/xz/hardware.c | 13 +---- - src/xz/hardware.h | 13 +---- - src/xz/io.c | 13 +---- - src/xz/io.h | 13 +---- - src/xz/list.c | 13 +---- - src/xz/main.c | 13 +---- - src/xz/main.h | 13 +---- - src/xz/message.c | 13 +---- - src/xz/message.h | 13 +---- - src/xz/options.c | 13 +---- - src/xz/options.h | 13 +---- - src/xz/private.h | 13 +---- - src/xz/process.c | 13 +---- - src/xz/process.h | 13 +---- - src/xz/signals.c | 13 +---- - src/xz/signals.h | 13 +---- - src/xz/suffix.c | 13 +---- - src/xz/suffix.h | 13 +---- - src/xz/util.c | 13 +---- - src/xz/util.h | 13 +---- - src/xzdec/Makefile.am | 13 +---- - src/xzdec/xzdec.c | 13 +---- - tests/Makefile.am | 13 +---- - tests/bcj_test.c | 7 +-- - tests/create_compress_files.c | 13 +---- - tests/test_block.c | 13 +---- - tests/test_block_header.c | 13 +---- - tests/test_check.c | 13 +---- - tests/test_compress.sh | 13 +---- - tests/test_files.sh | 13 +---- - tests/test_filter_flags.c | 13 +---- - tests/test_index.c | 13 +---- - tests/test_stream_flags.c | 13 +---- - tests/tests.h | 13 +---- - windows/common.rc | 2 +- - 206 files changed, 866 insertions(+), 2021 deletions(-) + COPYING | 67 ++++++++++++++++++++------ + ChangeLog | 2 +- + Doxyfile.in | 8 +-- + Makefile.am | 13 ++--- + autogen.sh | 9 ++++ + configure.ac | 13 ++--- + debug/Makefile.am | 13 ++--- + debug/crc32.c | 13 ++--- + debug/full_flush.c | 13 ++--- + debug/hex2bin.c | 7 ++- + debug/known_sizes.c | 13 ++--- + debug/memusage.c | 13 ++--- + debug/repeat.c | 13 ++--- + debug/sync_flush.c | 13 ++--- + doc/faq.txt | 38 ++------------- + lib/Makefile.am | 18 +++---- + src/Makefile.am | 13 ++--- + src/common/bswap.h | 7 ++- + src/common/cpucores.h | 7 ++- + src/common/integer.h | 7 ++- + src/common/mythread.h | 4 +- + src/common/open_stdxxx.h | 7 ++- + src/common/physmem.h | 7 ++- + src/common/sysdefs.h | 13 ++--- + src/liblzma/Makefile.am | 13 ++--- + src/liblzma/api/Makefile.am | 13 ++--- + src/liblzma/api/lzma.h | 38 +++++++++------ + src/liblzma/api/lzma/base.h | 20 +++----- + src/liblzma/api/lzma/bcj.h | 18 +++---- + src/liblzma/api/lzma/block.h | 18 +++---- + src/liblzma/api/lzma/check.h | 18 +++---- + src/liblzma/api/lzma/container.h | 18 +++---- + src/liblzma/api/lzma/delta.h | 18 +++---- + src/liblzma/api/lzma/filter.h | 18 +++---- + src/liblzma/api/lzma/index.h | 18 +++---- + src/liblzma/api/lzma/index_hash.h | 22 +++------ + src/liblzma/api/lzma/lzma.h | 18 +++---- + src/liblzma/api/lzma/stream_flags.h | 18 +++---- + src/liblzma/api/lzma/subblock.h | 18 +++---- + src/liblzma/api/lzma/version.h | 18 +++---- + src/liblzma/api/lzma/vli.h | 46 ++++++++---------- + src/liblzma/check/Makefile.am | 8 ++- + src/liblzma/check/check.c | 7 ++- + src/liblzma/check/check.h | 7 ++- + src/liblzma/check/crc32_fast.c | 30 +++++------- + src/liblzma/check/crc32_small.c | 7 ++- + src/liblzma/check/crc32_table.c | 7 ++- + src/liblzma/check/crc32_tablegen.c | 7 ++- + src/liblzma/check/crc32_x86.S | 21 +++++--- + src/liblzma/check/crc64_fast.c | 20 +++----- + src/liblzma/check/crc64_small.c | 7 ++- + src/liblzma/check/crc64_table.c | 7 ++- + src/liblzma/check/crc64_tablegen.c | 7 ++- + src/liblzma/check/crc64_x86.S | 14 ++++-- + src/liblzma/check/crc_macros.h | 9 ++-- + src/liblzma/check/sha256.c | 23 +++++---- + src/liblzma/common/Makefile.am | 13 ++--- + src/liblzma/common/alone_decoder.c | 13 ++--- + src/liblzma/common/alone_decoder.h | 13 ++--- + src/liblzma/common/alone_encoder.c | 13 ++--- + src/liblzma/common/auto_decoder.c | 13 ++--- + src/liblzma/common/block_buffer_decoder.c | 13 ++--- + src/liblzma/common/block_buffer_encoder.c | 13 ++--- + src/liblzma/common/block_decoder.c | 13 ++--- + src/liblzma/common/block_decoder.h | 13 ++--- + src/liblzma/common/block_encoder.c | 13 ++--- + src/liblzma/common/block_encoder.h | 13 ++--- + src/liblzma/common/block_header_decoder.c | 13 ++--- + src/liblzma/common/block_header_encoder.c | 13 ++--- + src/liblzma/common/block_util.c | 13 ++--- + src/liblzma/common/bsr.h | 7 ++- + src/liblzma/common/chunk_size.c | 13 ++--- + src/liblzma/common/common.c | 13 ++--- + src/liblzma/common/common.h | 13 ++--- + src/liblzma/common/easy_buffer_encoder.c | 13 ++--- + src/liblzma/common/easy_decoder_memusage.c | 13 ++--- + src/liblzma/common/easy_encoder.c | 13 ++--- + src/liblzma/common/easy_encoder_memusage.c | 13 ++--- + src/liblzma/common/easy_preset.c | 13 ++--- + src/liblzma/common/easy_preset.h | 13 ++--- + src/liblzma/common/filter_buffer_decoder.c | 13 ++--- + src/liblzma/common/filter_buffer_encoder.c | 13 ++--- + src/liblzma/common/filter_common.c | 13 ++--- + src/liblzma/common/filter_common.h | 13 ++--- + src/liblzma/common/filter_decoder.c | 13 ++--- + src/liblzma/common/filter_decoder.h | 13 ++--- + src/liblzma/common/filter_encoder.c | 13 ++--- + src/liblzma/common/filter_encoder.h | 13 ++--- + src/liblzma/common/filter_flags_decoder.c | 13 ++--- + src/liblzma/common/filter_flags_encoder.c | 13 ++--- + src/liblzma/common/index.c | 13 ++--- + src/liblzma/common/index.h | 13 ++--- + src/liblzma/common/index_decoder.c | 13 ++--- + src/liblzma/common/index_encoder.c | 13 ++--- + src/liblzma/common/index_encoder.h | 13 ++--- + src/liblzma/common/index_hash.c | 13 ++--- + src/liblzma/common/stream_buffer_decoder.c | 13 ++--- + src/liblzma/common/stream_buffer_encoder.c | 13 ++--- + src/liblzma/common/stream_decoder.c | 13 ++--- + src/liblzma/common/stream_decoder.h | 13 ++--- + src/liblzma/common/stream_encoder.c | 13 ++--- + src/liblzma/common/stream_encoder.h | 13 ++--- + src/liblzma/common/stream_flags_common.c | 13 ++--- + src/liblzma/common/stream_flags_common.h | 13 ++--- + src/liblzma/common/stream_flags_decoder.c | 13 ++--- + src/liblzma/common/stream_flags_encoder.c | 13 ++--- + src/liblzma/common/vli_decoder.c | 13 ++--- + src/liblzma/common/vli_encoder.c | 13 ++--- + src/liblzma/common/vli_size.c | 13 ++--- + src/liblzma/delta/Makefile.am | 13 ++--- + src/liblzma/delta/delta_common.c | 13 ++--- + src/liblzma/delta/delta_common.h | 13 ++--- + src/liblzma/delta/delta_decoder.c | 13 ++--- + src/liblzma/delta/delta_decoder.h | 13 ++--- + src/liblzma/delta/delta_encoder.c | 13 ++--- + src/liblzma/delta/delta_encoder.h | 13 ++--- + src/liblzma/delta/delta_private.h | 13 ++--- + src/liblzma/lz/Makefile.am | 13 ++--- + src/liblzma/lz/lz_decoder.c | 17 ++----- + src/liblzma/lz/lz_decoder.h | 17 ++----- + src/liblzma/lz/lz_encoder.c | 17 ++----- + src/liblzma/lz/lz_encoder.h | 17 ++----- + src/liblzma/lz/lz_encoder_hash.h | 13 ++--- + src/liblzma/lz/lz_encoder_mf.c | 17 ++----- + src/liblzma/lzma/Makefile.am | 13 ++--- + src/liblzma/lzma/fastpos.h | 17 ++----- + src/liblzma/lzma/fastpos_tablegen.c | 17 ++----- + src/liblzma/lzma/lzma2_decoder.c | 17 ++----- + src/liblzma/lzma/lzma2_decoder.h | 17 ++----- + src/liblzma/lzma/lzma2_encoder.c | 17 ++----- + src/liblzma/lzma/lzma2_encoder.h | 17 ++----- + src/liblzma/lzma/lzma_common.h | 17 ++----- + src/liblzma/lzma/lzma_decoder.c | 17 ++----- + src/liblzma/lzma/lzma_decoder.h | 17 ++----- + src/liblzma/lzma/lzma_encoder.c | 17 ++----- + src/liblzma/lzma/lzma_encoder.h | 17 ++----- + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 13 ++--- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 13 ++--- + src/liblzma/lzma/lzma_encoder_presets.c | 13 ++--- + src/liblzma/lzma/lzma_encoder_private.h | 17 ++----- + src/liblzma/rangecoder/Makefile.am | 13 ++--- + src/liblzma/rangecoder/price.h | 13 ++--- + src/liblzma/rangecoder/price_tablegen.c | 16 ++---- + src/liblzma/rangecoder/range_common.h | 17 ++----- + src/liblzma/rangecoder/range_decoder.h | 17 ++----- + src/liblzma/rangecoder/range_encoder.h | 17 ++----- + src/liblzma/simple/Makefile.am | 13 ++--- + src/liblzma/simple/arm.c | 17 ++----- + src/liblzma/simple/armthumb.c | 17 ++----- + src/liblzma/simple/ia64.c | 17 ++----- + src/liblzma/simple/powerpc.c | 17 ++----- + src/liblzma/simple/simple_coder.c | 13 ++--- + src/liblzma/simple/simple_coder.h | 14 ++---- + src/liblzma/simple/simple_decoder.c | 13 ++--- + src/liblzma/simple/simple_decoder.h | 13 ++--- + src/liblzma/simple/simple_encoder.c | 13 ++--- + src/liblzma/simple/simple_encoder.h | 13 ++--- + src/liblzma/simple/simple_private.h | 13 ++--- + src/liblzma/simple/sparc.c | 17 ++----- + src/liblzma/simple/x86.c | 17 ++----- + src/liblzma/subblock/Makefile.am | 13 ++--- + src/liblzma/subblock/subblock_decoder.c | 13 ++--- + src/liblzma/subblock/subblock_decoder.h | 13 ++--- + src/liblzma/subblock/subblock_decoder_helper.c | 13 ++--- + src/liblzma/subblock/subblock_decoder_helper.h | 13 ++--- + src/liblzma/subblock/subblock_encoder.c | 13 ++--- + src/liblzma/subblock/subblock_encoder.h | 13 ++--- + src/scripts/Makefile.am | 7 +++ + src/xz/Makefile.am | 13 ++--- + src/xz/args.c | 13 ++--- + src/xz/args.h | 13 ++--- + src/xz/hardware.c | 13 ++--- + src/xz/hardware.h | 13 ++--- + src/xz/io.c | 13 ++--- + src/xz/io.h | 13 ++--- + src/xz/list.c | 13 ++--- + src/xz/main.c | 13 ++--- + src/xz/main.h | 13 ++--- + src/xz/message.c | 13 ++--- + src/xz/message.h | 13 ++--- + src/xz/options.c | 13 ++--- + src/xz/options.h | 13 ++--- + src/xz/private.h | 13 ++--- + src/xz/process.c | 13 ++--- + src/xz/process.h | 13 ++--- + src/xz/signals.c | 13 ++--- + src/xz/signals.h | 13 ++--- + src/xz/suffix.c | 13 ++--- + src/xz/suffix.h | 13 ++--- + src/xz/util.c | 13 ++--- + src/xz/util.h | 13 ++--- + src/xzdec/Makefile.am | 13 ++--- + src/xzdec/xzdec.c | 13 ++--- + tests/Makefile.am | 13 ++--- + tests/bcj_test.c | 7 ++- + tests/create_compress_files.c | 13 ++--- + tests/test_block.c | 13 ++--- + tests/test_block_header.c | 13 ++--- + tests/test_check.c | 13 ++--- + tests/test_compress.sh | 13 ++--- + tests/test_files.sh | 13 ++--- + tests/test_filter_flags.c | 13 ++--- + tests/test_index.c | 13 ++--- + tests/test_stream_flags.c | 13 ++--- + tests/tests.h | 13 ++--- + windows/common.rc | 2 +- + 206 files changed, 868 insertions(+), 2023 deletions(-) commit e79c42d854657ae7f75613bd80c1a35ff7c525cb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5373,8 +6373,8 @@ Date: 2009-04-10 11:17:02 +0300 Fortunately, this bug had no security risk other than accepting some corrupt files as valid. - src/liblzma/lz/lz_decoder.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/lz/lz_decoder.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 94eb9ad46f1fded6d8369cf3d38bb9754c1375af Author: Pavel Roskin <proski@gnu.org> @@ -5382,8 +6382,8 @@ Date: 2009-03-31 12:15:01 -0400 Fix minor typos in README - README | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + README | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 9bab5336ebd765ec4e12252f416eefdf04eba750 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5393,8 +6393,8 @@ Date: 2009-03-31 21:52:51 +0300 problems detecting a C99 compiler when some standard headers are missing. - README | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) + README | 11 +++++++++++ + 1 file changed, 11 insertions(+) commit a0497ff7a06f9350349264fe9b52dfefc6d53ead Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5402,8 +6402,8 @@ Date: 2009-03-18 16:54:38 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 390e69887fc5e0a108eb41203bed9acd100a3d76 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5412,8 +6412,8 @@ Date: 2009-03-18 16:51:41 +0200 Fix wrong macro names in lc_cpucores.m4 and cpucores.h. Thanks to Bert Wesarg. - m4/lc_cpucores.m4 | 4 ++-- - src/common/cpucores.h | 4 ++-- + m4/lc_cpucores.m4 | 4 ++-- + src/common/cpucores.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) commit 0df9299e2478c2a0c62c05b1ae14a85a353e20d6 @@ -5423,8 +6423,8 @@ Date: 2009-03-01 09:03:08 +0200 Test for Linux-specific sysinfo() only on Linux systems. Some other systems have sysinfo() with different semantics. - m4/lc_physmem.m4 | 28 +++++++++++++++++++--------- - 1 files changed, 19 insertions(+), 9 deletions(-) + m4/lc_physmem.m4 | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) commit cf751edfde3ad6e088dc18e0522d31ae38405933 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5432,8 +6432,8 @@ Date: 2009-03-01 09:00:06 +0200 Added AC_CONFIG_MACRO_DIR to configure.ac. - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + configure.ac | 1 + + 1 file changed, 1 insertion(+) commit 63df14c57dee7c461717784287056688482a7eb9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5442,8 +6442,8 @@ Date: 2009-03-01 08:58:41 +0200 Fix the Autoconf test for getopt_long replacement. It was broken by e114502b2bc371e4a45449832cb69be036360722. - m4/getopt.m4 | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + m4/getopt.m4 | 4 ++++ + 1 file changed, 4 insertions(+) commit fd6a380f4eda4f00be5f2aa8d222992cd74a714f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5451,8 +6451,8 @@ Date: 2009-02-22 19:07:54 +0200 Add a rough explanation of --extreme to output of --help. - src/xz/message.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/xz/message.c | 4 ++++ + 1 file changed, 4 insertions(+) commit 68bf7ac2984d3627369a240ef0491934d53f7899 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5468,9 +6468,9 @@ Date: 2009-02-22 18:52:49 +0200 - Fix some small design issues. - src/xz/message.c | 483 ++++++++++++++++++++++++++++++++++-------------------- - src/xz/message.h | 28 ++- - src/xz/process.c | 53 +++--- + src/xz/message.c | 483 +++++++++++++++++++++++++++++++++++-------------------- + src/xz/message.h | 28 ++-- + src/xz/process.c | 53 +++--- 3 files changed, 351 insertions(+), 213 deletions(-) commit 47c2e21f82242f50f18713a27d644c2c94ab3fea @@ -5479,9 +6479,9 @@ Date: 2009-02-18 13:00:10 +0200 Added files missing from the previous commit. - src/liblzma/api/lzma/container.h | 33 +++++++++++++++++++++++++++++++++ - src/liblzma/common/Makefile.am | 7 ++++++- - 2 files changed, 39 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/container.h | 33 +++++++++++++++++++++++++++++++++ + src/liblzma/common/Makefile.am | 7 ++++++- + 2 files changed, 39 insertions(+), 1 deletion(-) commit 489a3dbaa0465f04400804e956a1cfbbee3654a2 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5491,15 +6491,15 @@ Date: 2009-02-17 10:43:00 +0200 pieces to avoid unneeded dependencies making statically linked applications bigger than needed. - dos/Makefile | 6 +- - src/liblzma/common/easy.c | 128 ---------------------------- - src/liblzma/common/easy_buffer_encoder.c | 34 ++++++++ - src/liblzma/common/easy_decoder_memusage.c | 31 +++++++ - src/liblzma/common/easy_encoder.c | 87 +++++++++++++++++++ - src/liblzma/common/easy_encoder_memusage.c | 31 +++++++ - src/liblzma/common/easy_preset.c | 34 ++++++++ - src/liblzma/common/easy_preset.h | 39 +++++++++ - windows/Makefile | 6 +- + dos/Makefile | 6 +- + src/liblzma/common/easy.c | 128 ----------------------------- + src/liblzma/common/easy_buffer_encoder.c | 34 ++++++++ + src/liblzma/common/easy_decoder_memusage.c | 31 +++++++ + src/liblzma/common/easy_encoder.c | 87 ++++++++++++++++++++ + src/liblzma/common/easy_encoder_memusage.c | 31 +++++++ + src/liblzma/common/easy_preset.c | 34 ++++++++ + src/liblzma/common/easy_preset.h | 39 +++++++++ + windows/Makefile | 6 +- 9 files changed, 266 insertions(+), 130 deletions(-) commit 7494816ab08d82f4d6409788825930c4e43cfd0d @@ -5509,8 +6509,8 @@ Date: 2009-02-15 15:48:45 +0200 Make physmem.h work on old Windows versions. Thanks to Hongbo Ni for the original patch. - src/common/physmem.h | 31 +++++++++++++++++++++++++++---- - 1 files changed, 27 insertions(+), 4 deletions(-) + src/common/physmem.h | 31 +++++++++++++++++++++++++++---- + 1 file changed, 27 insertions(+), 4 deletions(-) commit 11ae4ae35fd70182c713f2d914b7cb1143bc76f0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5518,8 +6518,8 @@ Date: 2009-02-14 20:44:52 +0200 Fix microsecond vs. nanosecond confusion in my_time(). - src/xz/message.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3084d662d2646ab7eb58daf0dc32cf3f9a74eec7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5534,16 +6534,16 @@ Date: 2009-02-14 00:45:29 +0200 isn't used for anything real for now, so a problematic part in process.c was commented out. - configure.ac | 89 +----------------------------------------------- - m4/lc_cpucores.m4 | 57 +++++++++++++++++++++++++++++++ - m4/lc_physmem.m4 | 74 ++++++++++++++++++++++++++++++++++++++++ - src/common/cpucores.h | 52 ++++++++++++++++++++++++++++ - src/common/physmem.h | 21 +++++++---- - src/xz/args.c | 4 +- - src/xz/hardware.c | 50 ++++++++++++--------------- - src/xz/hardware.h | 11 ++++-- - src/xz/message.c | 5 ++- - src/xz/process.c | 2 + + configure.ac | 89 ++------------------------------------------------- + m4/lc_cpucores.m4 | 57 +++++++++++++++++++++++++++++++++ + m4/lc_physmem.m4 | 74 ++++++++++++++++++++++++++++++++++++++++++ + src/common/cpucores.h | 52 ++++++++++++++++++++++++++++++ + src/common/physmem.h | 21 +++++++----- + src/xz/args.c | 4 +-- + src/xz/hardware.c | 50 +++++++++++++---------------- + src/xz/hardware.h | 11 +++++-- + src/xz/message.c | 5 +-- + src/xz/process.c | 2 ++ 10 files changed, 235 insertions(+), 130 deletions(-) commit 9c62371eab2706c46b1072f5935e28cb4cd9dca8 @@ -5552,10 +6552,10 @@ Date: 2009-02-13 18:23:50 +0200 Initial port to DOS using DJGPP. - dos/Makefile | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - dos/README | 113 +++++++++++++++++++++++++ - dos/config.h | 150 +++++++++++++++++++++++++++++++++ - 3 files changed, 524 insertions(+), 0 deletions(-) + dos/Makefile | 261 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + dos/README | 113 ++++++++++++++++++++++++++ + dos/config.h | 150 ++++++++++++++++++++++++++++++++++ + 3 files changed, 524 insertions(+) commit 0dae8b7751d09e9c5a482d5519daaee4800ce203 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5565,9 +6565,9 @@ Date: 2009-02-13 18:02:05 +0200 Now the version number is not duplicated in the Windows-specific files anymore. - windows/Makefile | 2 +- - windows/common.rc | 16 ++++++++-------- - windows/config.h | 15 --------------- + windows/Makefile | 2 +- + windows/common.rc | 16 ++++++++-------- + windows/config.h | 15 --------------- 3 files changed, 9 insertions(+), 24 deletions(-) commit fdbc0cfa71f7d660855098a609175ba384259529 @@ -5580,12 +6580,12 @@ Date: 2009-02-13 18:00:03 +0200 number of places where the version number is duplicated. In future, support for displaying Git commit ID may be added too. - configure.ac | 3 +- - src/liblzma/api/lzma/version.h | 70 ++++++++++++++++++++++++++++++++++++++-- - src/liblzma/common/common.c | 2 +- - src/xz/message.c | 2 +- - src/xzdec/xzdec.c | 2 +- - version.sh | 23 +++++++++++++ + configure.ac | 3 +- + src/liblzma/api/lzma/version.h | 70 ++++++++++++++++++++++++++++++++++++++++-- + src/liblzma/common/common.c | 2 +- + src/xz/message.c | 2 +- + src/xzdec/xzdec.c | 2 +- + version.sh | 23 ++++++++++++++ 6 files changed, 95 insertions(+), 7 deletions(-) commit 1d924e584b146136989f48c13fff2632896efb3d @@ -5594,9 +6594,9 @@ Date: 2009-02-13 17:30:30 +0200 Fix handling of integrity check type in the xz command line tool. - src/xz/args.c | 9 ++++++++- - src/xz/process.c | 4 ++++ - 2 files changed, 12 insertions(+), 1 deletions(-) + src/xz/args.c | 9 ++++++++- + src/xz/process.c | 4 ++++ + 2 files changed, 12 insertions(+), 1 deletion(-) commit 96c46df7deb231ea68a03d8d1da9de4c774e36d8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5605,16 +6605,16 @@ Date: 2009-02-13 17:29:02 +0200 Improve support for DOS-like systems. Here DOS-like means DOS, Windows, and OS/2. - src/common/physmem.h | 12 ++++++++++++ - src/common/sysdefs.h | 4 ++++ - src/liblzma/check/crc32_x86.S | 6 +++--- - src/liblzma/check/crc64_x86.S | 6 +++--- - src/xz/args.c | 13 +++++-------- - src/xz/io.c | 39 +++++++++++++++++++++++++-------------- - src/xz/main.c | 23 +++++++++++++++++++++++ - src/xz/message.c | 3 +++ - src/xz/suffix.c | 5 +++++ - src/xzdec/xzdec.c | 5 +++-- + src/common/physmem.h | 12 ++++++++++++ + src/common/sysdefs.h | 4 ++++ + src/liblzma/check/crc32_x86.S | 6 +++--- + src/liblzma/check/crc64_x86.S | 6 +++--- + src/xz/args.c | 13 +++++-------- + src/xz/io.c | 39 +++++++++++++++++++++++++-------------- + src/xz/main.c | 23 +++++++++++++++++++++++ + src/xz/message.c | 3 +++ + src/xz/suffix.c | 5 +++++ + src/xzdec/xzdec.c | 5 +++-- 10 files changed, 86 insertions(+), 30 deletions(-) commit b6a30ee8c2de60ecd722cd05223e4ba72f822e33 @@ -5623,8 +6623,8 @@ Date: 2009-02-11 20:02:32 +0200 Remove dead directories from .gitignore. - .gitignore | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + .gitignore | 2 -- + 1 file changed, 2 deletions(-) commit 1ec5b0027911d94cb6f98892cbc690f818d8a861 Author: Jim Meyering <jim@meyering.net> @@ -5634,8 +6634,8 @@ Date: 2009-02-11 14:45:14 +0100 How about this for those of us who do srcdir builds? - .gitignore | 22 ++++++++++++++++++++++ - 1 files changed, 22 insertions(+), 0 deletions(-) + .gitignore | 22 ++++++++++++++++++++++ + 1 file changed, 22 insertions(+) commit 154f5aec2de201c674841de4fcc9804c2a87af07 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5645,8 +6645,8 @@ Date: 2009-02-10 21:48:35 +0200 in the repository are generated by Autotools. People should do test builds in a separate build directory anyway. - .gitignore | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + .gitignore | 1 - + 1 file changed, 1 deletion(-) commit e605c2663691b0a4c307786aa368d124ea081daa Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5654,12 +6654,12 @@ Date: 2009-02-10 21:48:05 +0200 Added resource files for the Windows build. - windows/Makefile | 37 ++++++++++++++++++++++--------------- - windows/common.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ - windows/liblzma.rc | 5 +++++ - windows/lzmadec.rc | 5 +++++ - windows/xz.rc | 5 +++++ - windows/xzdec.rc | 5 +++++ + windows/Makefile | 37 ++++++++++++++++++++++--------------- + windows/common.rc | 46 ++++++++++++++++++++++++++++++++++++++++++++++ + windows/liblzma.rc | 5 +++++ + windows/lzmadec.rc | 5 +++++ + windows/xz.rc | 5 +++++ + windows/xzdec.rc | 5 +++++ 6 files changed, 88 insertions(+), 15 deletions(-) commit a3bbbe05d32b1f7ea9eb98805df4dda2e811b476 @@ -5670,8 +6670,8 @@ Date: 2009-02-09 14:54:31 +0200 line. Previously custom CFLAGS worked only when they were passed to configure. - configure.ac | 58 +++++++++++++++++++++------------------- - src/liblzma/check/Makefile.am | 2 +- + configure.ac | 58 ++++++++++++++++++++++--------------------- + src/liblzma/check/Makefile.am | 2 +- 2 files changed, 31 insertions(+), 29 deletions(-) commit 53f7598998b1860a69c51243b5d2e34623c6bf60 @@ -5680,8 +6680,8 @@ Date: 2009-02-08 21:35:11 +0200 Fix aliasing issue in physmem.h. - src/common/physmem.h | 19 ++++++++++--------- - 1 files changed, 10 insertions(+), 9 deletions(-) + src/common/physmem.h | 19 ++++++++++--------- + 1 file changed, 10 insertions(+), 9 deletions(-) commit 0e27028d74c5c7a8e036ae2a9b8cecb0ac79d3a6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5692,9 +6692,9 @@ Date: 2009-02-08 18:24:50 +0200 because calling lzma_crc32() and ignoring the result is a no-op due to lzma_attr_pure. - src/liblzma/check/check.h | 1 + - src/liblzma/check/crc32_small.c | 10 +++++++++- - src/liblzma/lz/lz_encoder.c | 4 ++-- + src/liblzma/check/check.h | 1 + + src/liblzma/check/crc32_small.c | 10 +++++++++- + src/liblzma/lz/lz_encoder.c | 4 ++-- 3 files changed, 12 insertions(+), 3 deletions(-) commit ae1ad9af54210c9a2be336b1316532da5071516c @@ -5704,8 +6704,8 @@ Date: 2009-02-08 18:17:05 +0200 Make "xz --force" to write to terminal as the error message suggests. - src/xz/main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 79e25eded48d2fe33f31441ab7a034f902e335f8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5714,8 +6714,8 @@ Date: 2009-02-08 10:37:50 +0200 Support both slash and backslash as path component separator on Windows when parsing argv[0]. - src/xz/args.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/xz/args.c | 9 +++++++++ + 1 file changed, 9 insertions(+) commit bc7c7109cc4410055a888c1c70cbd1c9445c4361 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5724,8 +6724,8 @@ Date: 2009-02-07 23:18:13 +0200 Omit the wrong and (even if corrected) nowadays useless rm from autogen.sh. - autogen.sh | 28 ---------------------------- - 1 files changed, 0 insertions(+), 28 deletions(-) + autogen.sh | 28 ---------------------------- + 1 file changed, 28 deletions(-) commit edfc2031e56f8a2ccda063f02936b3a848d88723 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5733,8 +6733,8 @@ Date: 2009-02-07 21:41:52 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 880c3309386aac58fc4f3d7ca99bd31bcb1526a3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5748,9 +6748,9 @@ Date: 2009-02-07 21:17:07 +0200 Fixed a few minor bugs in configure.ac. - configure.ac | 39 +++++++++++++++++++++++++++++++++++++++ - src/xz/Makefile.am | 8 +++----- - src/xzdec/Makefile.am | 5 +++-- + configure.ac | 39 +++++++++++++++++++++++++++++++++++++++ + src/xz/Makefile.am | 8 +++----- + src/xzdec/Makefile.am | 5 +++-- 3 files changed, 45 insertions(+), 7 deletions(-) commit 3f86532407e4ace3debb62be16035e009b56ca36 @@ -5761,10 +6761,10 @@ Date: 2009-02-06 23:38:39 -0500 Signed-off-by: Mike Frysinger <vapier@gentoo.org> - .gitignore | 32 ++++++++++++++++++++++++++++++++ - m4/.gitignore | 35 +++++++++++++++++++++++++++++++++++ - po/.gitignore | 12 ++++++++++++ - 3 files changed, 79 insertions(+), 0 deletions(-) + .gitignore | 32 ++++++++++++++++++++++++++++++++ + m4/.gitignore | 35 +++++++++++++++++++++++++++++++++++ + po/.gitignore | 12 ++++++++++++ + 3 files changed, 79 insertions(+) commit bd7ca1dad5c146b6217799ffaa230c32d207a3e5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5773,8 +6773,8 @@ Date: 2009-02-07 17:07:52 +0200 Assume 32 MiB of RAM on unsupported operating systems like the comment in hardware.c already said. - src/xz/hardware.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/hardware.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d0ab8c1c73ae712adb0d26fbb9da762d99a63618 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5784,8 +6784,8 @@ Date: 2009-02-07 16:26:58 +0200 liblzma. Build both static and dynamic liblzma, and also static and dynamic versions of the command line tools. - windows/Makefile | 92 ++++++++++++++++++++++++++++++++++++++++------------- - windows/README | 10 ------ + windows/Makefile | 92 ++++++++++++++++++++++++++++++++++++++++++-------------- + windows/README | 10 ------ 2 files changed, 69 insertions(+), 33 deletions(-) commit bfd91198e44a52bd9bfe3cd6dcae5edab7c6eb45 @@ -5795,9 +6795,9 @@ Date: 2009-02-07 15:55:47 +0200 Support LZMA_API_STATIC in assembler files to avoid __declspec(dllexport) equivalent. - src/liblzma/check/crc32_x86.S | 4 ++++ - src/liblzma/check/crc64_x86.S | 2 ++ - 2 files changed, 6 insertions(+), 0 deletions(-) + src/liblzma/check/crc32_x86.S | 4 ++++ + src/liblzma/check/crc64_x86.S | 2 ++ + 2 files changed, 6 insertions(+) commit 3306cf3883492720b3c34baa02f4eb4227d91c73 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5808,8 +6808,8 @@ Date: 2009-02-07 11:11:50 +0200 platforms like Windows. Most developers don't need to care about LZMA_API_STATIC at all. - src/liblzma/api/lzma.h | 31 ++++++++++++++++++++++++------- - src/liblzma/common/common.h | 2 +- + src/liblzma/api/lzma.h | 31 ++++++++++++++++++++++++------- + src/liblzma/common/common.h | 2 +- 2 files changed, 25 insertions(+), 8 deletions(-) commit b719e63c5f4c91d2d5e2ea585d4c055ec3767d0b @@ -5818,8 +6818,8 @@ Date: 2009-02-06 16:55:45 +0200 Another grammar fix - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit fe5434f940f75fec3611cf9d9edf78c4da8ac760 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5827,8 +6827,8 @@ Date: 2009-02-06 12:30:23 +0200 Grammar fix in README. - README | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + README | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3dfa58a9eedf5a0e566452b078801c9cbcf7a245 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5837,8 +6837,8 @@ Date: 2009-02-06 10:06:32 +0200 Some MSYS installations (e.g. MsysGit) don't include install.exe, so don't rely on it. - windows/Makefile | 12 +++++++----- - windows/README | 11 ++++++----- + windows/Makefile | 12 +++++++----- + windows/README | 11 ++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) commit 975d8fd72a5148d46b2e1745f7a211cf1dfd9d31 @@ -5853,12 +6853,12 @@ Date: 2009-02-06 09:13:15 +0200 The new files are just compiled and assembled object files, and thus don't contain any copyrighted code. - tests/bcj_test.c | 2 +- - tests/compress_prepared_bcj_sparc | Bin 6804 -> 1240 bytes - tests/compress_prepared_bcj_x86 | Bin 4649 -> 1388 bytes - tests/files/good-1-sparc-lzma2.xz | Bin 2296 -> 612 bytes - tests/files/good-1-x86-lzma2.xz | Bin 1936 -> 716 bytes - 5 files changed, 1 insertions(+), 1 deletions(-) + tests/bcj_test.c | 2 +- + tests/compress_prepared_bcj_sparc | Bin 6804 -> 1240 bytes + tests/compress_prepared_bcj_x86 | Bin 4649 -> 1388 bytes + tests/files/good-1-sparc-lzma2.xz | Bin 2296 -> 612 bytes + tests/files/good-1-x86-lzma2.xz | Bin 1936 -> 716 bytes + 5 files changed, 1 insertion(+), 1 deletion(-) commit 094b1b09a531f0d201ec81f2b07346a995fd80b9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5866,8 +6866,8 @@ Date: 2009-02-05 21:21:27 +0200 Add the "windows" directory to EXTRA_DIST. - Makefile.am | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + Makefile.am | 1 + + 1 file changed, 1 insertion(+) commit e1c3412eec7acec7ca3b32c9c828f3147dc65b49 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5875,10 +6875,10 @@ Date: 2009-02-05 09:17:51 +0200 Added initial experimental makefile for use with MinGW. - windows/Makefile | 253 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ - windows/README | 164 +++++++++++++++++++++++++++++++++++ - windows/config.h | 180 ++++++++++++++++++++++++++++++++++++++ - 3 files changed, 597 insertions(+), 0 deletions(-) + windows/Makefile | 253 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + windows/README | 164 ++++++++++++++++++++++++++++++++++++ + windows/config.h | 180 +++++++++++++++++++++++++++++++++++++++ + 3 files changed, 597 insertions(+) commit 75905a9afc0ee89954ede7d08af70d1148bf0fd9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5887,24 +6887,24 @@ Date: 2009-02-05 09:12:57 +0200 Various code cleanups the the xz command line tool. It now builds with MinGW. - src/common/physmem.h | 13 ++++ - src/xz/Makefile.am | 2 + - src/xz/args.h | 8 -- - src/xz/hardware.h | 10 +--- - src/xz/io.c | 93 +++++++++++++++++++------- - src/xz/io.h | 12 +-- - src/xz/main.c | 132 ++----------------------------------- - src/xz/main.h | 22 ------ - src/xz/message.c | 65 ++++++++++++++++-- - src/xz/message.h | 6 -- - src/xz/options.h | 8 -- - src/xz/private.h | 18 ++++-- - src/xz/process.h | 10 +--- - src/xz/signals.c | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/signals.h | 51 ++++++++++++++ - src/xz/suffix.h | 5 -- - src/xz/util.c | 5 +- - src/xz/util.h | 5 -- + src/common/physmem.h | 13 ++++ + src/xz/Makefile.am | 2 + + src/xz/args.h | 8 --- + src/xz/hardware.h | 10 +-- + src/xz/io.c | 93 +++++++++++++++++++------- + src/xz/io.h | 12 ++-- + src/xz/main.c | 132 ++----------------------------------- + src/xz/main.h | 22 ------- + src/xz/message.c | 65 ++++++++++++++++--- + src/xz/message.h | 6 -- + src/xz/options.h | 8 --- + src/xz/private.h | 18 ++++-- + src/xz/process.h | 10 +-- + src/xz/signals.c | 180 +++++++++++++++++++++++++++++++++++++++++++++++++++ + src/xz/signals.h | 51 +++++++++++++++ + src/xz/suffix.h | 5 -- + src/xz/util.c | 5 +- + src/xz/util.h | 5 -- 18 files changed, 399 insertions(+), 246 deletions(-) commit d0c0b9e94e0af59d1d8f7f4829695d6efe19ccfe @@ -5913,8 +6913,8 @@ Date: 2009-02-03 12:15:17 +0200 Another utime() fix. - src/xz/io.c | 9 +++++---- - 1 files changed, 5 insertions(+), 4 deletions(-) + src/xz/io.c | 9 +++++---- + 1 file changed, 5 insertions(+), 4 deletions(-) commit ccf92a29e8c7234284f1568c1ec0fd7cb98356ca Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5924,8 +6924,8 @@ Date: 2009-02-03 10:41:11 +0200 This doesn't affect most systems, since most systems have better functions available. - src/xz/io.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/xz/io.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 99c1c2abfae2e87f3c17e929783e6d1bb7a3f302 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -5937,9 +6937,9 @@ Date: 2009-02-02 21:19:01 +0200 - The code should work on MinGW and Darwin in addition to GNU/Linux and Solaris. - configure.ac | 6 --- - src/liblzma/check/crc32_x86.S | 84 +++++++++++++++++++++++++++++++++++------ - src/liblzma/check/crc64_x86.S | 82 +++++++++++++++++++++++++++++++++++----- + configure.ac | 6 ---- + src/liblzma/check/crc32_x86.S | 84 ++++++++++++++++++++++++++++++++++++------- + src/liblzma/check/crc64_x86.S | 82 ++++++++++++++++++++++++++++++++++++------ 3 files changed, 144 insertions(+), 28 deletions(-) commit 22a0c6dd940b78cdac2f4a4b4b0e7cc0ac15021f @@ -5951,60 +6951,60 @@ Date: 2009-02-02 20:14:03 +0200 of the API headers slightly, but I don't know any better way to do this. - src/liblzma/api/lzma.h | 6 ++-- - src/liblzma/api/lzma/base.h | 11 ++++--- - src/liblzma/api/lzma/block.h | 22 +++++++------- - src/liblzma/api/lzma/check.h | 10 +++--- - src/liblzma/api/lzma/container.h | 22 +++++++------- - src/liblzma/api/lzma/filter.h | 28 ++++++++++---------- - src/liblzma/api/lzma/index.h | 40 ++++++++++++++-------------- - src/liblzma/api/lzma/index_hash.h | 10 +++--- - src/liblzma/api/lzma/lzma.h | 6 ++-- - src/liblzma/api/lzma/stream_flags.h | 10 +++--- - src/liblzma/api/lzma/version.h | 4 +- - src/liblzma/api/lzma/vli.h | 6 ++-- - src/liblzma/check/check.c | 4 +- - src/liblzma/check/crc32_fast.c | 2 +- - src/liblzma/check/crc32_small.c | 2 +- - src/liblzma/check/crc64_fast.c | 2 +- - src/liblzma/check/crc64_small.c | 2 +- - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/alone_encoder.c | 2 +- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_buffer_decoder.c | 2 +- - src/liblzma/common/block_buffer_encoder.c | 4 +- - src/liblzma/common/block_decoder.c | 2 +- - src/liblzma/common/block_encoder.c | 2 +- - src/liblzma/common/block_header_decoder.c | 2 +- - src/liblzma/common/block_header_encoder.c | 4 +- - src/liblzma/common/block_util.c | 6 ++-- - src/liblzma/common/chunk_size.c | 2 +- - src/liblzma/common/common.c | 16 +++++----- - src/liblzma/common/common.h | 2 +- - src/liblzma/common/easy.c | 6 ++-- - src/liblzma/common/filter_buffer_decoder.c | 2 +- - src/liblzma/common/filter_buffer_encoder.c | 2 +- - src/liblzma/common/filter_decoder.c | 8 +++--- - src/liblzma/common/filter_encoder.c | 12 ++++---- - src/liblzma/common/filter_flags_decoder.c | 2 +- - src/liblzma/common/filter_flags_encoder.c | 4 +- - src/liblzma/common/index.c | 32 +++++++++++----------- - src/liblzma/common/index_decoder.c | 4 +- - src/liblzma/common/index_encoder.c | 4 +- - src/liblzma/common/index_hash.c | 10 +++--- - src/liblzma/common/stream_buffer_decoder.c | 2 +- - src/liblzma/common/stream_buffer_encoder.c | 4 +- - src/liblzma/common/stream_decoder.c | 2 +- - src/liblzma/common/stream_encoder.c | 2 +- - src/liblzma/common/stream_flags_common.c | 2 +- - src/liblzma/common/stream_flags_decoder.c | 4 +- - src/liblzma/common/stream_flags_encoder.c | 4 +- - src/liblzma/common/vli_decoder.c | 2 +- - src/liblzma/common/vli_encoder.c | 2 +- - src/liblzma/common/vli_size.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_presets.c | 2 +- + src/liblzma/api/lzma.h | 6 ++--- + src/liblzma/api/lzma/base.h | 11 ++++---- + src/liblzma/api/lzma/block.h | 22 ++++++++-------- + src/liblzma/api/lzma/check.h | 10 ++++---- + src/liblzma/api/lzma/container.h | 22 ++++++++-------- + src/liblzma/api/lzma/filter.h | 28 ++++++++++----------- + src/liblzma/api/lzma/index.h | 40 +++++++++++++++--------------- + src/liblzma/api/lzma/index_hash.h | 10 ++++---- + src/liblzma/api/lzma/lzma.h | 6 ++--- + src/liblzma/api/lzma/stream_flags.h | 10 ++++---- + src/liblzma/api/lzma/version.h | 4 +-- + src/liblzma/api/lzma/vli.h | 6 ++--- + src/liblzma/check/check.c | 4 +-- + src/liblzma/check/crc32_fast.c | 2 +- + src/liblzma/check/crc32_small.c | 2 +- + src/liblzma/check/crc64_fast.c | 2 +- + src/liblzma/check/crc64_small.c | 2 +- + src/liblzma/common/alone_decoder.c | 2 +- + src/liblzma/common/alone_encoder.c | 2 +- + src/liblzma/common/auto_decoder.c | 2 +- + src/liblzma/common/block_buffer_decoder.c | 2 +- + src/liblzma/common/block_buffer_encoder.c | 4 +-- + src/liblzma/common/block_decoder.c | 2 +- + src/liblzma/common/block_encoder.c | 2 +- + src/liblzma/common/block_header_decoder.c | 2 +- + src/liblzma/common/block_header_encoder.c | 4 +-- + src/liblzma/common/block_util.c | 6 ++--- + src/liblzma/common/chunk_size.c | 2 +- + src/liblzma/common/common.c | 16 ++++++------ + src/liblzma/common/common.h | 2 +- + src/liblzma/common/easy.c | 6 ++--- + src/liblzma/common/filter_buffer_decoder.c | 2 +- + src/liblzma/common/filter_buffer_encoder.c | 2 +- + src/liblzma/common/filter_decoder.c | 8 +++--- + src/liblzma/common/filter_encoder.c | 12 ++++----- + src/liblzma/common/filter_flags_decoder.c | 2 +- + src/liblzma/common/filter_flags_encoder.c | 4 +-- + src/liblzma/common/index.c | 32 ++++++++++++------------ + src/liblzma/common/index_decoder.c | 4 +-- + src/liblzma/common/index_encoder.c | 4 +-- + src/liblzma/common/index_hash.c | 10 ++++---- + src/liblzma/common/stream_buffer_decoder.c | 2 +- + src/liblzma/common/stream_buffer_encoder.c | 4 +-- + src/liblzma/common/stream_decoder.c | 2 +- + src/liblzma/common/stream_encoder.c | 2 +- + src/liblzma/common/stream_flags_common.c | 2 +- + src/liblzma/common/stream_flags_decoder.c | 4 +-- + src/liblzma/common/stream_flags_encoder.c | 4 +-- + src/liblzma/common/vli_decoder.c | 2 +- + src/liblzma/common/vli_encoder.c | 2 +- + src/liblzma/common/vli_size.c | 2 +- + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder_presets.c | 2 +- 54 files changed, 177 insertions(+), 176 deletions(-) commit 8dd7b6052e18621e2e6c62f40f762ee88bd3eb65 @@ -6014,8 +7014,8 @@ Date: 2009-02-01 22:40:35 +0200 Fix a bug in lzma_block_buffer_decode(), although this function should be rewritten anyway. - src/liblzma/common/block_buffer_decoder.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + src/liblzma/common/block_buffer_decoder.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit 55fd41431e61fb8178858283d636b6781e33e847 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6025,10 +7025,10 @@ Date: 2009-02-01 22:39:07 +0200 functions, and cleaned up filter.h API header a little. May be very buggy, not tested yet. - src/liblzma/api/lzma/filter.h | 84 +++++++++++++++++++------ - src/liblzma/common/Makefile.am | 2 + - src/liblzma/common/filter_buffer_decoder.c | 94 ++++++++++++++++++++++++++++ - src/liblzma/common/filter_buffer_encoder.c | 61 ++++++++++++++++++ + src/liblzma/api/lzma/filter.h | 84 +++++++++++++++++++------- + src/liblzma/common/Makefile.am | 2 + + src/liblzma/common/filter_buffer_decoder.c | 94 ++++++++++++++++++++++++++++++ + src/liblzma/common/filter_buffer_encoder.c | 61 +++++++++++++++++++ 4 files changed, 221 insertions(+), 20 deletions(-) commit 3e54ecee5cad30a5ca361a88a99230407abc0699 @@ -6037,8 +7037,8 @@ Date: 2009-02-01 00:11:20 +0200 Fix missing newlines in xzdec.c. - src/xzdec/xzdec.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/xzdec/xzdec.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit d64ca34f1b6f34e86adefc7f735b4eff8e6d4a35 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6047,9 +7047,9 @@ Date: 2009-02-01 00:10:07 +0200 Use __cdecl also for function pointers in liblzma API when on Windows. - src/liblzma/api/lzma.h | 18 +++++++++++------- - src/liblzma/api/lzma/base.h | 4 ++-- - src/liblzma/common/common.h | 18 +++++++----------- + src/liblzma/api/lzma.h | 18 +++++++++++------- + src/liblzma/api/lzma/base.h | 4 ++-- + src/liblzma/common/common.h | 18 +++++++----------- 3 files changed, 20 insertions(+), 20 deletions(-) commit 6a2eb54092fc625d59921a607ff68cd1a90aa898 @@ -6060,23 +7060,23 @@ Date: 2009-01-31 11:01:48 +0200 on Windows. sysdefs.h no longer #includes lzma.h, so lzma.h has to be #included separately where needed. - src/common/sysdefs.h | 2 - - src/liblzma/api/lzma.h | 17 ++++++++++++ - src/liblzma/api/lzma/base.h | 10 +++--- - src/liblzma/api/lzma/block.h | 25 ++++++++++-------- - src/liblzma/api/lzma/check.h | 12 +++++--- - src/liblzma/api/lzma/container.h | 23 +++++++++-------- - src/liblzma/api/lzma/filter.h | 24 +++++++++--------- - src/liblzma/api/lzma/index.h | 47 ++++++++++++++++++++--------------- - src/liblzma/api/lzma/index_hash.h | 11 ++++--- - src/liblzma/api/lzma/lzma.h | 8 +++-- - src/liblzma/api/lzma/stream_flags.h | 10 +++--- - src/liblzma/api/lzma/version.h | 4 +- - src/liblzma/api/lzma/vli.h | 10 +++--- - src/liblzma/common/common.h | 13 ++++++++- - src/xz/private.h | 1 + - src/xzdec/xzdec.c | 1 + - tests/tests.h | 1 + + src/common/sysdefs.h | 2 -- + src/liblzma/api/lzma.h | 17 ++++++++++++++ + src/liblzma/api/lzma/base.h | 10 ++++---- + src/liblzma/api/lzma/block.h | 25 +++++++++++--------- + src/liblzma/api/lzma/check.h | 12 ++++++---- + src/liblzma/api/lzma/container.h | 23 +++++++++--------- + src/liblzma/api/lzma/filter.h | 24 +++++++++---------- + src/liblzma/api/lzma/index.h | 47 +++++++++++++++++++++---------------- + src/liblzma/api/lzma/index_hash.h | 11 +++++---- + src/liblzma/api/lzma/lzma.h | 8 ++++--- + src/liblzma/api/lzma/stream_flags.h | 10 ++++---- + src/liblzma/api/lzma/version.h | 4 ++-- + src/liblzma/api/lzma/vli.h | 10 ++++---- + src/liblzma/common/common.h | 13 ++++++++-- + src/xz/private.h | 1 + + src/xzdec/xzdec.c | 1 + + tests/tests.h | 1 + 17 files changed, 131 insertions(+), 88 deletions(-) commit d9993fcb4dfc1f93abaf31ae23b3ef1f3123892b @@ -6085,8 +7085,8 @@ Date: 2009-01-31 10:13:09 +0200 Use _WIN32 instead of WIN32 in xzdec.c to test if compiling on Windows. - src/xzdec/xzdec.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/xzdec/xzdec.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 2dbdc5befb33c3703e4609809101047c67caf343 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6095,8 +7095,8 @@ Date: 2009-01-31 10:02:52 +0200 Fix two lines in lzma.h on which the # wasn't at the beginning of the line. - src/liblzma/api/lzma.h | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/api/lzma.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 4ab760109106dc04f39dd81c97d50f528d1b51c1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6105,8 +7105,8 @@ Date: 2009-01-31 09:55:05 +0200 Add support for using liblzma headers in MSVC, which has no stdint.h or inttypes.h. - src/liblzma/api/lzma.h | 70 +++++++++++++++++++++++++++++++---------------- - 1 files changed, 46 insertions(+), 24 deletions(-) + src/liblzma/api/lzma.h | 70 +++++++++++++++++++++++++++++++++----------------- + 1 file changed, 46 insertions(+), 24 deletions(-) commit b2172cf823d3be34cb0246cb4cb32d105e2a34c9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6114,8 +7114,8 @@ Date: 2009-01-31 08:49:54 +0200 Fix # -> ## in a macro in lzma.h. - src/liblzma/api/lzma.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1aae8698746d3c87a93f8398cdde2de9ba1f7208 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6123,8 +7123,8 @@ Date: 2009-01-30 18:50:16 +0200 Updated README. - README | 30 ++++++++++++++++++++---------- - 1 files changed, 20 insertions(+), 10 deletions(-) + README | 30 ++++++++++++++++++++---------- + 1 file changed, 20 insertions(+), 10 deletions(-) commit f54bcf6f80d585236bc03ce49f7c73e1abaa17eb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6132,8 +7132,8 @@ Date: 2009-01-30 00:29:58 +0200 Remove dangling crc64_init.c. - src/liblzma/check/crc64_init.c | 55 ---------------------------------------- - 1 files changed, 0 insertions(+), 55 deletions(-) + src/liblzma/check/crc64_init.c | 55 ------------------------------------------ + 1 file changed, 55 deletions(-) commit 982da7ed314398420c38bf154a8f759d5f18b480 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6144,8 +7144,8 @@ Date: 2009-01-28 17:16:38 +0200 since 2008-11-19, but now that it is frozen, people can start using it without a fear that the format will break. - doc/file-format.txt | 84 +++++++++++++++++++++++++++++--------------------- - 1 files changed, 49 insertions(+), 35 deletions(-) + doc/file-format.txt | 84 +++++++++++++++++++++++++++++++---------------------- + 1 file changed, 49 insertions(+), 35 deletions(-) commit c4683a660b4372156bdaf92f0cdc54a58f95ee6f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6153,8 +7153,8 @@ Date: 2009-01-28 08:45:59 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 3241317093595db9f79104faafe93cb989c9f858 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6164,8 +7164,8 @@ Date: 2009-01-28 08:43:26 +0200 triggered by the previous commit, since these variables were not used by anything before support for a preset dictionary. - src/liblzma/common/alone_decoder.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + src/liblzma/common/alone_decoder.c | 2 ++ + 1 file changed, 2 insertions(+) commit f76e39cf930f888d460b443d18f977ebedea8b2a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6175,14 +7175,14 @@ Date: 2009-01-27 18:36:05 +0200 and LZMA2. It is not supported by the .xz format or the xz command line tool yet. - src/liblzma/lz/lz_decoder.c | 35 +++++++++++++++++++++++++---------- - src/liblzma/lz/lz_decoder.h | 9 ++++++++- - src/liblzma/lz/lz_encoder.c | 18 ++++++++++++++++-- - src/liblzma/lzma/lzma2_decoder.c | 9 ++++++--- - src/liblzma/lzma/lzma2_encoder.c | 12 +++++++----- - src/liblzma/lzma/lzma_decoder.c | 10 ++++++---- - src/liblzma/lzma/lzma_decoder.h | 2 +- - src/liblzma/lzma/lzma_encoder.c | 9 ++++++++- + src/liblzma/lz/lz_decoder.c | 35 +++++++++++++++++++++++++---------- + src/liblzma/lz/lz_decoder.h | 9 ++++++++- + src/liblzma/lz/lz_encoder.c | 18 ++++++++++++++++-- + src/liblzma/lzma/lzma2_decoder.c | 9 ++++++--- + src/liblzma/lzma/lzma2_encoder.c | 12 +++++++----- + src/liblzma/lzma/lzma_decoder.c | 10 ++++++---- + src/liblzma/lzma/lzma_decoder.h | 2 +- + src/liblzma/lzma/lzma_encoder.c | 9 ++++++++- 8 files changed, 77 insertions(+), 27 deletions(-) commit 449b8c832b26c3633f3bec60095e57d2d3ada1f3 @@ -6191,8 +7191,8 @@ Date: 2009-01-26 20:09:17 +0200 Regenerate the CRC tables without trailing blanks. - src/liblzma/check/crc32_table_be.h | 1008 ++++++++++++++++++------------------ - src/liblzma/check/crc32_table_le.h | 1008 ++++++++++++++++++------------------ + src/liblzma/check/crc32_table_be.h | 1008 +++++++++++++++++------------------ + src/liblzma/check/crc32_table_le.h | 1008 +++++++++++++++++------------------ src/liblzma/check/crc64_table_be.h | 1016 ++++++++++++++++++------------------ src/liblzma/check/crc64_table_le.h | 1016 ++++++++++++++++++------------------ 4 files changed, 2024 insertions(+), 2024 deletions(-) @@ -6203,13 +7203,13 @@ Date: 2009-01-19 21:37:16 +0100 remove trailing blanks from all but .xz files - debug/known_sizes.c | 2 +- - extra/scanlzma/scanlzma.c | 5 ++--- - src/liblzma/check/crc32_tablegen.c | 2 +- - src/liblzma/check/crc64_tablegen.c | 2 +- - src/scripts/lzdiff.1 | 4 ++-- - src/scripts/lzmore.1 | 6 +++--- - tests/test_compress.sh | 4 ++-- + debug/known_sizes.c | 2 +- + extra/scanlzma/scanlzma.c | 5 ++--- + src/liblzma/check/crc32_tablegen.c | 2 +- + src/liblzma/check/crc64_tablegen.c | 2 +- + src/scripts/lzdiff.1 | 4 ++-- + src/scripts/lzmore.1 | 6 +++--- + tests/test_compress.sh | 4 ++-- 7 files changed, 12 insertions(+), 13 deletions(-) commit 667481f1aad34e1ed15738e7913a9c7e256b4cf5 @@ -6218,10 +7218,10 @@ Date: 2009-01-26 14:34:10 +0200 Add lzma_block_buffer_decode(). - src/liblzma/api/lzma/block.h | 41 ++++++++++++++ - src/liblzma/common/Makefile.am | 1 + - src/liblzma/common/block_buffer_decoder.c | 87 +++++++++++++++++++++++++++++ - 3 files changed, 129 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/block.h | 41 +++++++++++++++ + src/liblzma/common/Makefile.am | 1 + + src/liblzma/common/block_buffer_decoder.c | 87 +++++++++++++++++++++++++++++++ + 3 files changed, 129 insertions(+) commit 5fb34d8324d3e7e0061df25d0086b64c8726b19d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6229,8 +7229,8 @@ Date: 2009-01-26 14:33:28 +0200 Add more sanity checks to lzma_stream_buffer_decode(). - src/liblzma/common/stream_buffer_decoder.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + src/liblzma/common/stream_buffer_decoder.c | 7 +++++++ + 1 file changed, 7 insertions(+) commit c129748675a5daa8838df92bde32cc04f6ce61ba Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6238,8 +7238,8 @@ Date: 2009-01-26 14:33:13 +0200 Avoid hardcoded constant in easy.c. - src/liblzma/common/easy.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/easy.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1859d22d75e072463db74c25bc3f5a7992e5fdf6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6247,8 +7247,8 @@ Date: 2009-01-26 13:06:49 +0200 Tiny bit better sanity check in block_util.c - src/liblzma/common/block_util.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/block_util.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2c5fe958e4bbe9b147b10c255955dfe2827fb8e7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6258,8 +7258,8 @@ Date: 2009-01-25 01:35:56 +0200 LZMA_DATA_ERROR with valid data. The bug was added in e114502b2bc371e4a45449832cb69be036360722. - src/liblzma/common/block_decoder.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/liblzma/common/block_decoder.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit c81f13ff29271de7293f8af3d81848b1dcae3d19 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6267,10 +7267,10 @@ Date: 2009-01-23 22:27:50 +0200 Added lzma_stream_buffer_decode() and made minor cleanups. - src/liblzma/api/lzma/block.h | 3 +- - src/liblzma/api/lzma/container.h | 51 +++++++++++++++- - src/liblzma/common/Makefile.am | 1 + - src/liblzma/common/stream_buffer_decoder.c | 91 ++++++++++++++++++++++++++++ + src/liblzma/api/lzma/block.h | 3 +- + src/liblzma/api/lzma/container.h | 51 ++++++++++++++++- + src/liblzma/common/Makefile.am | 1 + + src/liblzma/common/stream_buffer_decoder.c | 91 ++++++++++++++++++++++++++++++ 4 files changed, 144 insertions(+), 2 deletions(-) commit 0b3318661ce749550b8531dfd469639a08930391 @@ -6279,8 +7279,8 @@ Date: 2009-01-22 12:53:33 +0200 Fix a comment. - src/liblzma/common/common.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9ec80355a7212a0a2f8c89d98e51b1d8b4e34eec Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6288,15 +7288,15 @@ Date: 2009-01-20 16:37:27 +0200 Add some single-call buffer-to-buffer coding functions. - src/liblzma/api/lzma/block.h | 57 +++++ - src/liblzma/api/lzma/container.h | 56 +++++ - src/liblzma/api/lzma/index.h | 70 ++++++- - src/liblzma/common/Makefile.am | 2 + - src/liblzma/common/block_buffer_encoder.c | 305 ++++++++++++++++++++++++++++ - src/liblzma/common/index_decoder.c | 83 +++++++-- - src/liblzma/common/index_encoder.c | 59 +++++- - src/liblzma/common/stream_buffer_encoder.c | 138 +++++++++++++ - tests/test_index.c | 24 +++ + src/liblzma/api/lzma/block.h | 57 ++++++ + src/liblzma/api/lzma/container.h | 56 ++++++ + src/liblzma/api/lzma/index.h | 70 ++++++- + src/liblzma/common/Makefile.am | 2 + + src/liblzma/common/block_buffer_encoder.c | 305 +++++++++++++++++++++++++++++ + src/liblzma/common/index_decoder.c | 83 ++++++-- + src/liblzma/common/index_encoder.c | 59 +++++- + src/liblzma/common/stream_buffer_encoder.c | 138 +++++++++++++ + tests/test_index.c | 24 +++ 9 files changed, 768 insertions(+), 26 deletions(-) commit d8b58d099340f8f4007b24b211ee41a7210c061c @@ -6305,8 +7305,8 @@ Date: 2009-01-20 13:45:41 +0200 Block encoder cleanups - src/liblzma/common/block_encoder.c | 28 +++++++--------------------- - src/liblzma/common/block_encoder.h | 25 +++++++++++++++++++++++++ + src/liblzma/common/block_encoder.c | 28 +++++++--------------------- + src/liblzma/common/block_encoder.h | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 21 deletions(-) commit 0c09810cb3635cb575cb54e694d41523e7d0a335 @@ -6315,8 +7315,8 @@ Date: 2009-01-20 10:35:15 +0200 Use LZMA_PROG_ERROR in lzma_code() as documented in base.h. - src/liblzma/common/common.c | 24 ++++++++---------------- - 1 files changed, 8 insertions(+), 16 deletions(-) + src/liblzma/common/common.c | 24 ++++++++---------------- + 1 file changed, 8 insertions(+), 16 deletions(-) commit 2f1a8e8eb898f6c036cde55d153ad348bfab3c00 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6324,8 +7324,8 @@ Date: 2009-01-19 22:53:18 +0200 Fix handling of non-fatal errors in lzma_code(). - src/liblzma/common/common.c | 9 ++++++++- - 1 files changed, 8 insertions(+), 1 deletions(-) + src/liblzma/common/common.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) commit 4810b6bc25087be872960b9dd1d11ff07735dc88 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6334,9 +7334,9 @@ Date: 2009-01-19 14:00:33 +0200 Move some LZMA2 constants to lzma2_encoder.h so that they can be used outside lzma2_encoder.c. - src/liblzma/lzma/lzma2_encoder.c | 13 ------------- - src/liblzma/lzma/lzma2_encoder.h | 14 ++++++++++++++ - src/liblzma/lzma/lzma_encoder.c | 3 ++- + src/liblzma/lzma/lzma2_encoder.c | 13 ------------- + src/liblzma/lzma/lzma2_encoder.h | 14 ++++++++++++++ + src/liblzma/lzma/lzma_encoder.c | 3 ++- 3 files changed, 16 insertions(+), 14 deletions(-) commit 00be5d2e09f9c7a6a8563465ad8b8042866817a4 @@ -6345,8 +7345,8 @@ Date: 2009-01-19 13:52:36 +0200 Remove dead code. - src/liblzma/lzma/lzma_encoder.h | 8 -------- - 1 files changed, 0 insertions(+), 8 deletions(-) + src/liblzma/lzma/lzma_encoder.h | 8 -------- + 1 file changed, 8 deletions(-) commit 128586213f77c9bd82b7e9a62927f6d0c3769d85 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6358,14 +7358,14 @@ Date: 2009-01-17 14:24:25 +0200 Now it is fixed. Hopefully it doesn't cause too much trouble to those who already thought API is stable. - src/liblzma/api/lzma/filter.h | 4 ++-- - src/liblzma/common/easy.c | 4 ++-- - src/liblzma/common/filter_common.c | 2 +- - src/liblzma/common/filter_common.h | 2 +- - src/liblzma/common/filter_decoder.c | 4 ++-- - src/liblzma/common/filter_encoder.c | 4 ++-- - src/liblzma/common/stream_decoder.c | 2 +- - src/xz/process.c | 6 +++--- + src/liblzma/api/lzma/filter.h | 4 ++-- + src/liblzma/common/easy.c | 4 ++-- + src/liblzma/common/filter_common.c | 2 +- + src/liblzma/common/filter_common.h | 2 +- + src/liblzma/common/filter_decoder.c | 4 ++-- + src/liblzma/common/filter_encoder.c | 4 ++-- + src/liblzma/common/stream_decoder.c | 2 +- + src/xz/process.c | 6 +++--- 8 files changed, 14 insertions(+), 14 deletions(-) commit b056379490be5c584c264a967f0540041a163a1e @@ -6374,8 +7374,8 @@ Date: 2009-01-15 14:29:22 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit dc8f3be06d54ef6e6cfb5134dd3d25edd08cef89 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6385,8 +7385,8 @@ Date: 2009-01-15 14:27:32 +0200 that use something else than 2^n as the dictionary size. Thanks to Dan Shechter for the bug report. - extra/7z2lzma/7z2lzma.bash | 47 ++++++++++++++++++++++--------------------- - 1 files changed, 24 insertions(+), 23 deletions(-) + extra/7z2lzma/7z2lzma.bash | 47 +++++++++++++++++++++++----------------------- + 1 file changed, 24 insertions(+), 23 deletions(-) commit 8286a60b8f4bd5accfbc9d229d2204bac31994f2 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6395,9 +7395,9 @@ Date: 2009-01-07 18:41:15 +0200 Use pthread_sigmask() instead of sigprocmask() when pthreads are enabled. - src/common/mythread.h | 6 ++++++ - src/xz/main.c | 4 ++-- - src/xz/private.h | 1 + + src/common/mythread.h | 6 ++++++ + src/xz/main.c | 4 ++-- + src/xz/private.h | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) commit 4fd43cb3a906f6da2943f69239ee984c4787c9a9 @@ -6407,8 +7407,8 @@ Date: 2008-12-31 20:01:00 +0200 Bumped version to 4.999.8beta right after the release of 4.999.7beta. - configure.ac | 2 +- - src/liblzma/api/lzma/version.h | 2 +- + configure.ac | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 061748f5932719643cda73383db715167d543c22 @@ -6418,8 +7418,8 @@ Date: 2008-12-31 18:59:02 +0200 Disable Subblock filter from test_compress.sh since it is disabled by default in configure.ac. - tests/test_compress.sh | 22 +++++++++++++--------- - 1 files changed, 13 insertions(+), 9 deletions(-) + tests/test_compress.sh | 22 +++++++++++++--------- + 1 file changed, 13 insertions(+), 9 deletions(-) commit 9c45658ddc8bd4a7819ef8547d3e7ccf73203e78 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6428,8 +7428,8 @@ Date: 2008-12-31 17:44:20 +0200 Disable both Subblock encoder and decoder my default, since they are not finished and may have security issues too. - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit b59f1e98f50694cf6a8f1b342fd878feebdb2f88 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6437,10 +7437,10 @@ Date: 2008-12-31 17:42:50 +0200 Update some files in debug directory. - debug/full_flush.c | 2 -- - debug/memusage.c | 2 -- - debug/sync_flush.c | 2 -- - 3 files changed, 0 insertions(+), 6 deletions(-) + debug/full_flush.c | 2 -- + debug/memusage.c | 2 -- + debug/sync_flush.c | 2 -- + 3 files changed, 6 deletions(-) commit d1d17a40d33a9682424ca37282813492f2cba6d0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6448,10 +7448,10 @@ Date: 2008-12-31 17:41:46 +0200 Prepare for 4.999.7beta release. - AUTHORS | 4 ++-- - README | 34 +++++++++++++++++----------------- - configure.ac | 4 ++-- - src/liblzma/api/lzma/version.h | 2 +- + AUTHORS | 4 ++-- + README | 34 +++++++++++++++++----------------- + configure.ac | 4 ++-- + src/liblzma/api/lzma/version.h | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) commit 88d3e6b0b18e24142b6d3b41dc1b84b00c49fef3 @@ -6460,9 +7460,9 @@ Date: 2008-12-31 17:15:03 +0200 Cleaned up some comments in the API headers. - src/liblzma/api/lzma/check.h | 23 +++++++++++------------ - src/liblzma/api/lzma/container.h | 2 +- - src/liblzma/api/lzma/version.h | 4 +++- + src/liblzma/api/lzma/check.h | 23 +++++++++++------------ + src/liblzma/api/lzma/container.h | 2 +- + src/liblzma/api/lzma/version.h | 4 +++- 3 files changed, 15 insertions(+), 14 deletions(-) commit 322ecf93c961e45a1da8c4a794a7fdacefcd7f40 @@ -6473,14 +7473,14 @@ Date: 2008-12-31 16:29:39 +0200 The internal implementation is still using the name "simple". It may need some cleanups, so I look at it later. - src/liblzma/api/Makefile.am | 2 +- - src/liblzma/api/lzma.h | 2 +- - src/liblzma/api/lzma/bcj.h | 94 +++++++++++++++++++++++++++++++++++ - src/liblzma/api/lzma/simple.h | 94 ----------------------------------- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/simple/simple_decoder.c | 4 +- - src/liblzma/simple/simple_encoder.c | 4 +- - tests/test_filter_flags.c | 8 ++-- + src/liblzma/api/Makefile.am | 2 +- + src/liblzma/api/lzma.h | 2 +- + src/liblzma/api/lzma/bcj.h | 94 +++++++++++++++++++++++++++++++++++++ + src/liblzma/api/lzma/simple.h | 94 ------------------------------------- + src/liblzma/simple/simple_coder.c | 2 +- + src/liblzma/simple/simple_decoder.c | 4 +- + src/liblzma/simple/simple_encoder.c | 4 +- + tests/test_filter_flags.c | 8 ++-- 8 files changed, 105 insertions(+), 105 deletions(-) commit 7eea8bec3abfed883efba66264a1452a1c04f6b0 @@ -6489,8 +7489,8 @@ Date: 2008-12-31 00:57:27 +0200 Fixed missing quoting in configure.ac. - configure.ac | 38 +++++++++++++++++++------------------- - 1 files changed, 19 insertions(+), 19 deletions(-) + configure.ac | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) commit 28e75f7086dbe9501d926c370375c69dfb1236ce Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6499,8 +7499,8 @@ Date: 2008-12-31 00:48:23 +0200 Updated src/liblzma/Makefile.am to use liblzma.pc.in, which should have been in the previous commit. - src/liblzma/Makefile.am | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/Makefile.am | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 7ed9d943b31d3ee9c5fb2387e84a241ba33afe90 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6535,46 +7535,46 @@ Date: 2008-12-31 00:30:49 +0200 as the more bloated uint32_t array on x86; hopefully it's not bad on other architectures. - configure.ac | 29 ++++++++-- - src/common/mythread.h | 34 +++++++++++ - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/init.h | 85 ---------------------------- - src/liblzma/check/Makefile.am | 29 +++------ - src/liblzma/check/check.c | 10 ++-- - src/liblzma/check/check.h | 25 +++----- - src/liblzma/check/check_init.c | 37 ------------ - src/liblzma/check/crc32.c | 88 ----------------------------- - src/liblzma/check/crc32_fast.c | 88 +++++++++++++++++++++++++++++ - src/liblzma/check/crc32_init.c | 55 ------------------ - src/liblzma/check/crc32_small.c | 54 ++++++++++++++++++ - src/liblzma/check/crc32_tablegen.c | 55 ++++++++++++++++-- - src/liblzma/check/crc64.c | 75 ------------------------ - src/liblzma/check/crc64_fast.c | 75 ++++++++++++++++++++++++ - src/liblzma/check/crc64_small.c | 54 ++++++++++++++++++ - src/liblzma/check/crc64_tablegen.c | 55 ++++++++++++++++-- - src/liblzma/common/Makefile.am | 3 - - src/liblzma/common/common.h | 1 + - src/liblzma/common/init.c | 39 ------------- - src/liblzma/common/init_decoder.c | 31 ---------- - src/liblzma/common/init_encoder.c | 40 ------------- - src/liblzma/liblzma.pc.in | 12 ++++ - src/liblzma/lz/lz_encoder.c | 6 ++ - src/liblzma/lzma.pc.in | 11 ---- - src/liblzma/rangecoder/Makefile.am | 8 +-- - src/liblzma/rangecoder/price.h | 16 +----- - src/liblzma/rangecoder/price_table.c | 2 +- - src/liblzma/rangecoder/price_table_init.c | 55 ------------------ - src/liblzma/rangecoder/price_tablegen.c | 51 ++++++++++++++-- - src/xz/Makefile.am | 5 +- - src/xz/main.c | 3 - - src/xzdec/xzdec.c | 3 - - tests/test_block_header.c | 1 - - tests/test_check.c | 2 - - tests/test_filter_flags.c | 2 - - tests/test_index.c | 2 - - tests/test_stream_flags.c | 2 - - tests/tests.h | 2 +- + configure.ac | 29 ++++++++-- + src/common/mythread.h | 34 ++++++++++++ + src/liblzma/api/Makefile.am | 1 - + src/liblzma/api/lzma.h | 1 - + src/liblzma/api/lzma/init.h | 85 ----------------------------- + src/liblzma/check/Makefile.am | 29 ++++------ + src/liblzma/check/check.c | 10 ++-- + src/liblzma/check/check.h | 25 ++++----- + src/liblzma/check/check_init.c | 37 ------------- + src/liblzma/check/crc32.c | 88 ------------------------------- + src/liblzma/check/crc32_fast.c | 88 +++++++++++++++++++++++++++++++ + src/liblzma/check/crc32_init.c | 55 ------------------- + src/liblzma/check/crc32_small.c | 54 +++++++++++++++++++ + src/liblzma/check/crc32_tablegen.c | 55 ++++++++++++++++--- + src/liblzma/check/crc64.c | 75 -------------------------- + src/liblzma/check/crc64_fast.c | 75 ++++++++++++++++++++++++++ + src/liblzma/check/crc64_small.c | 54 +++++++++++++++++++ + src/liblzma/check/crc64_tablegen.c | 55 ++++++++++++++++--- + src/liblzma/common/Makefile.am | 3 -- + src/liblzma/common/common.h | 1 + + src/liblzma/common/init.c | 39 -------------- + src/liblzma/common/init_decoder.c | 31 ----------- + src/liblzma/common/init_encoder.c | 40 -------------- + src/liblzma/liblzma.pc.in | 12 +++++ + src/liblzma/lz/lz_encoder.c | 6 +++ + src/liblzma/lzma.pc.in | 11 ---- + src/liblzma/rangecoder/Makefile.am | 8 +-- + src/liblzma/rangecoder/price.h | 16 +----- + src/liblzma/rangecoder/price_table.c | 2 +- + src/liblzma/rangecoder/price_table_init.c | 55 ------------------- + src/liblzma/rangecoder/price_tablegen.c | 51 +++++++++++++++--- + src/xz/Makefile.am | 5 +- + src/xz/main.c | 3 -- + src/xzdec/xzdec.c | 3 -- + tests/test_block_header.c | 1 - + tests/test_check.c | 2 - + tests/test_filter_flags.c | 2 - + tests/test_index.c | 2 - + tests/test_stream_flags.c | 2 - + tests/tests.h | 2 +- 40 files changed, 519 insertions(+), 628 deletions(-) commit 5cda29b5665004fc0f21d0c41d78022a6a559ab2 @@ -6583,8 +7583,8 @@ Date: 2008-12-27 19:40:31 +0200 Use 28 MiB as memory usage limit for encoding in test_compress.sh. - tests/test_compress.sh | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/test_compress.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 050eb14d29e2537c014662e83599fd8a77f13c45 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6595,8 +7595,8 @@ Date: 2008-12-27 19:32:20 +0200 faster although it compresses slightly worse. But since it is fast mode, it is better to select the faster version. - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 23 ++++++++--------------- - 1 files changed, 8 insertions(+), 15 deletions(-) + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 23 ++++++++--------------- + 1 file changed, 8 insertions(+), 15 deletions(-) commit 4820f10d0f173864f6a2ea7479663b509ac53358 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6604,11 +7604,11 @@ Date: 2008-12-27 19:30:19 +0200 Some xz command line tool improvements. - src/xz/args.c | 23 ++++----- - src/xz/message.c | 4 +- - src/xz/options.c | 2 +- - src/xz/process.c | 133 ++++++++++++++++++++++++++++++++++++++++++----------- - src/xz/process.h | 3 + + src/xz/args.c | 23 +++++----- + src/xz/message.c | 4 +- + src/xz/options.c | 2 +- + src/xz/process.c | 133 +++++++++++++++++++++++++++++++++++++++++++------------ + src/xz/process.h | 3 ++ 5 files changed, 121 insertions(+), 44 deletions(-) commit e33194e79d8f5ce07cb4aca909b324ae75098f7e @@ -6619,29 +7619,29 @@ Date: 2008-12-27 19:27:49 +0200 The API and ABI should now be very close to stable, although the code behind it isn't yet. - src/liblzma/api/lzma.h | 8 ++-- - src/liblzma/api/lzma/block.h | 63 +++++++++++++++++++++++- - src/liblzma/api/lzma/container.h | 76 ++++++++++++++-------------- - src/liblzma/api/lzma/lzma.h | 41 +++++++++------- - src/liblzma/common/alone_decoder.c | 36 +++++++------- - src/liblzma/common/alone_encoder.c | 22 +++----- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_decoder.c | 54 ++++++++++---------- - src/liblzma/common/block_decoder.h | 4 +- - src/liblzma/common/block_encoder.c | 37 ++++++++------ - src/liblzma/common/block_encoder.h | 4 +- - src/liblzma/common/block_header_decoder.c | 41 ++++++++------- - src/liblzma/common/block_header_encoder.c | 51 +++++++++---------- - src/liblzma/common/block_util.c | 3 +- - src/liblzma/common/easy.c | 45 ++++++----------- - src/liblzma/common/stream_decoder.c | 3 +- - src/liblzma/common/stream_decoder.h | 2 +- - src/liblzma/common/stream_encoder.c | 3 +- - src/liblzma/common/stream_encoder.h | 2 +- - src/liblzma/common/stream_flags_decoder.c | 2 +- - src/liblzma/common/stream_flags_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder.c | 2 +- - src/liblzma/lzma/lzma_encoder_presets.c | 53 ++++++-------------- + src/liblzma/api/lzma.h | 8 ++-- + src/liblzma/api/lzma/block.h | 63 ++++++++++++++++++++++++- + src/liblzma/api/lzma/container.h | 76 +++++++++++++++---------------- + src/liblzma/api/lzma/lzma.h | 41 +++++++++-------- + src/liblzma/common/alone_decoder.c | 36 +++++++-------- + src/liblzma/common/alone_encoder.c | 22 ++++----- + src/liblzma/common/auto_decoder.c | 2 +- + src/liblzma/common/block_decoder.c | 54 +++++++++++----------- + src/liblzma/common/block_decoder.h | 4 +- + src/liblzma/common/block_encoder.c | 37 ++++++++------- + src/liblzma/common/block_encoder.h | 4 +- + src/liblzma/common/block_header_decoder.c | 41 +++++++++-------- + src/liblzma/common/block_header_encoder.c | 51 ++++++++++----------- + src/liblzma/common/block_util.c | 3 +- + src/liblzma/common/easy.c | 45 ++++++------------ + src/liblzma/common/stream_decoder.c | 3 +- + src/liblzma/common/stream_decoder.h | 2 +- + src/liblzma/common/stream_encoder.c | 3 +- + src/liblzma/common/stream_encoder.h | 2 +- + src/liblzma/common/stream_flags_decoder.c | 2 +- + src/liblzma/common/stream_flags_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder.c | 2 +- + src/liblzma/lzma/lzma_encoder_presets.c | 53 +++++++-------------- 23 files changed, 294 insertions(+), 262 deletions(-) commit 4d00652e75dd2736aedc3a3a8baff3dd0ea38074 @@ -6650,8 +7650,8 @@ Date: 2008-12-18 13:42:52 +0200 Updated Makefile.am that was missing from the previous commit. - src/liblzma/common/Makefile.am | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + src/liblzma/common/Makefile.am | 1 - + 1 file changed, 1 deletion(-) commit 634636fa56ccee6e744f78b0abed76c8940f2f8f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6661,11 +7661,11 @@ Date: 2008-12-17 21:49:53 +0200 be added back in some form later, but the current version wasn't modular, so it would need fixing anyway. - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/alignment.h | 60 -------------------- - src/liblzma/common/alignment.c | 114 -------------------------------------- - 4 files changed, 0 insertions(+), 176 deletions(-) + src/liblzma/api/Makefile.am | 1 - + src/liblzma/api/lzma.h | 1 - + src/liblzma/api/lzma/alignment.h | 60 --------------------- + src/liblzma/common/alignment.c | 114 --------------------------------------- + 4 files changed, 176 deletions(-) commit 4fed98417d1687f5eccccb42a133fde3ec81216a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6673,9 +7673,9 @@ Date: 2008-12-17 20:11:23 +0200 xz message handling improvements - src/xz/message.c | 125 +++++++++++++++++++++++++++++++++++++++++++++++++----- - src/xz/message.h | 7 +++- - src/xz/process.c | 28 +++++++++++- + src/xz/message.c | 125 ++++++++++++++++++++++++++++++++++++++++++++++++++----- + src/xz/message.h | 7 +++- + src/xz/process.c | 28 ++++++++++++- 3 files changed, 146 insertions(+), 14 deletions(-) commit 653e457e3756ef35e5d1b2be3523b3e4b1e9ee4d @@ -6686,8 +7686,8 @@ Date: 2008-12-15 23:26:43 +0200 the previous commit. (Probably the previous commit has other bugs too, it wasn't tested.) - src/liblzma/common/alone_decoder.c | 29 ++++++++++++++--------------- - 1 files changed, 14 insertions(+), 15 deletions(-) + src/liblzma/common/alone_decoder.c | 29 ++++++++++++++--------------- + 1 file changed, 14 insertions(+), 15 deletions(-) commit 671a5adf1e844bfdd6fd327016c3c28694493158 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6695,33 +7695,33 @@ Date: 2008-12-15 19:39:13 +0200 Bunch of liblzma API cleanups and fixes. - src/liblzma/api/lzma.h | 122 +++++++++++--------- - src/liblzma/api/lzma/base.h | 174 +++++++++++++++++++---------- - src/liblzma/api/lzma/block.h | 211 +++++++++++++++++++++++------------ - src/liblzma/api/lzma/check.h | 28 +++-- - src/liblzma/api/lzma/container.h | 155 +++++++++++++------------- - src/liblzma/api/lzma/delta.h | 12 +- - src/liblzma/api/lzma/filter.h | 27 +++-- - src/liblzma/api/lzma/index.h | 97 ++++++++++++++--- - src/liblzma/api/lzma/index_hash.h | 26 +++- - src/liblzma/api/lzma/init.h | 2 +- - src/liblzma/api/lzma/lzma.h | 12 +- - src/liblzma/api/lzma/simple.h | 4 +- - src/liblzma/api/lzma/stream_flags.h | 46 +++++--- - src/liblzma/api/lzma/version.h | 6 +- - src/liblzma/api/lzma/vli.h | 17 +-- - src/liblzma/common/alone_decoder.c | 47 ++++++--- - src/liblzma/common/auto_decoder.c | 29 +++++ - src/liblzma/common/block_util.c | 52 +++++---- - src/liblzma/common/common.c | 58 ++++++++++ - src/liblzma/common/common.h | 9 ++- - src/liblzma/common/easy.c | 33 ++++-- - src/liblzma/common/filter_common.c | 2 +- - src/liblzma/common/index.c | 11 ++ - src/liblzma/common/index_decoder.c | 46 +++++++- - src/liblzma/common/stream_decoder.c | 47 +++++++- - src/liblzma/lzma/lzma2_encoder.c | 6 +- - tests/test_index.c | 10 +- + src/liblzma/api/lzma.h | 122 +++++++++++---------- + src/liblzma/api/lzma/base.h | 174 ++++++++++++++++++----------- + src/liblzma/api/lzma/block.h | 211 +++++++++++++++++++++++------------- + src/liblzma/api/lzma/check.h | 28 ++--- + src/liblzma/api/lzma/container.h | 155 +++++++++++++------------- + src/liblzma/api/lzma/delta.h | 12 +- + src/liblzma/api/lzma/filter.h | 27 +++-- + src/liblzma/api/lzma/index.h | 97 ++++++++++++++--- + src/liblzma/api/lzma/index_hash.h | 26 +++-- + src/liblzma/api/lzma/init.h | 2 +- + src/liblzma/api/lzma/lzma.h | 12 +- + src/liblzma/api/lzma/simple.h | 4 +- + src/liblzma/api/lzma/stream_flags.h | 46 +++++--- + src/liblzma/api/lzma/version.h | 6 +- + src/liblzma/api/lzma/vli.h | 17 ++- + src/liblzma/common/alone_decoder.c | 47 +++++--- + src/liblzma/common/auto_decoder.c | 29 +++++ + src/liblzma/common/block_util.c | 52 +++++---- + src/liblzma/common/common.c | 58 ++++++++++ + src/liblzma/common/common.h | 9 +- + src/liblzma/common/easy.c | 33 ++++-- + src/liblzma/common/filter_common.c | 2 +- + src/liblzma/common/index.c | 11 ++ + src/liblzma/common/index_decoder.c | 46 ++++++-- + src/liblzma/common/stream_decoder.c | 47 ++++++-- + src/liblzma/lzma/lzma2_encoder.c | 6 +- + tests/test_index.c | 10 +- 27 files changed, 863 insertions(+), 426 deletions(-) commit 17781c2c20fd77029cb32e77792889f2f211d69d @@ -6732,8 +7732,8 @@ Date: 2008-12-15 14:26:52 +0200 which made LZ decoder return too early after dictionary reset. This fixes it. - src/liblzma/lz/lz_decoder.c | 33 +++++++++++++++++++++++---------- - 1 files changed, 23 insertions(+), 10 deletions(-) + src/liblzma/lz/lz_decoder.c | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) commit f9f2d1e74398500724041f7fb3c38db35ad8c8d8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6741,10 +7741,10 @@ Date: 2008-12-15 11:20:22 +0200 Added two new test files. - tests/files/README | 7 +++++++ - tests/files/bad-1-lzma2-8.xz | Bin 0 -> 464 bytes - tests/files/good-1-lzma2-4.xz | Bin 0 -> 464 bytes - 3 files changed, 7 insertions(+), 0 deletions(-) + tests/files/README | 7 +++++++ + tests/files/bad-1-lzma2-8.xz | Bin 0 -> 464 bytes + tests/files/good-1-lzma2-4.xz | Bin 0 -> 464 bytes + 3 files changed, 7 insertions(+) commit ff7fb2c605bccc411069e07b9f11fb957aea2ddf Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6752,9 +7752,9 @@ Date: 2008-12-15 10:01:59 +0200 Fix data corruption in LZMA2 decoder. - src/liblzma/lz/lz_decoder.c | 17 ++++++++++++++++- - src/liblzma/lz/lz_decoder.h | 8 +++++--- - src/liblzma/lzma/lzma2_decoder.c | 15 +++++++++++---- + src/liblzma/lz/lz_decoder.c | 17 ++++++++++++++++- + src/liblzma/lz/lz_decoder.h | 8 +++++--- + src/liblzma/lzma/lzma2_decoder.c | 15 +++++++++++---- 3 files changed, 32 insertions(+), 8 deletions(-) commit 1ceebcf7e1bd30b95125f0ad67a09fdb6215d613 @@ -6763,8 +7763,8 @@ Date: 2008-12-13 00:54:11 +0200 Name the package "xz" in configure.ac. - configure.ac | 11 ++++------- - 1 files changed, 4 insertions(+), 7 deletions(-) + configure.ac | 11 ++++------- + 1 file changed, 4 insertions(+), 7 deletions(-) commit a94bf00d0af9b423851905b031be5a645a657820 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6775,8 +7775,8 @@ Date: 2008-12-12 22:43:21 +0200 really want to keep so that I don't miss any warnings) with printf format strings that are in POSIX but not in C99. - configure.ac | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) + configure.ac | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) commit 8582d392baacd2cdac07ca60041f8c661323676d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6784,8 +7784,8 @@ Date: 2008-12-10 01:31:00 +0200 Remove obsolete comment. - src/xz/message.c | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + src/xz/message.c | 1 - + 1 file changed, 1 deletion(-) commit b1ae6dd731ea3636c3c2bfc7aefa71457d3328f1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6793,8 +7793,8 @@ Date: 2008-12-10 01:27:15 +0200 Use "decompression" consistently in --long-help. - src/xz/message.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/message.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1ea9e7f15afd5d3981e2432710e932320597bca9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6803,9 +7803,9 @@ Date: 2008-12-10 01:23:58 +0200 Added preset=NUM to --lzma1 and --lzma2. This makes it easy to take a preset as a template and modify it a little. - src/xz/message.c | 1 + - src/xz/options.c | 8 ++++++++ - 2 files changed, 9 insertions(+), 0 deletions(-) + src/xz/message.c | 1 + + src/xz/options.c | 8 ++++++++ + 2 files changed, 9 insertions(+) commit bceb3918dbb21f34976bfdd4c171a81319de71f7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6814,8 +7814,8 @@ Date: 2008-12-09 17:43:31 +0200 Put the file format specification into the public domain. Same will be done to the actual code later. - doc/file-format.txt | 24 +++++++++--------------- - 1 files changed, 9 insertions(+), 15 deletions(-) + doc/file-format.txt | 24 +++++++++--------------- + 1 file changed, 9 insertions(+), 15 deletions(-) commit 6efa2d80d46a38861016f41f0eb6fa2ec9260fe6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6826,9 +7826,9 @@ Date: 2008-12-09 17:41:49 +0200 to LZMA2 encoder when options are changed in the middle of encoding. - src/liblzma/lzma/lzma2_encoder.c | 5 +++- - src/liblzma/lzma/lzma_encoder.c | 44 +++++++++++++++++++++++++------------ - src/liblzma/lzma/lzma_encoder.h | 2 +- + src/liblzma/lzma/lzma2_encoder.c | 5 ++++- + src/liblzma/lzma/lzma_encoder.c | 44 +++++++++++++++++++++++++++------------- + src/liblzma/lzma/lzma_encoder.h | 2 +- 3 files changed, 35 insertions(+), 16 deletions(-) commit f20a03206b71ff01b827bb7a932411d6a6a4e06a @@ -6837,8 +7837,8 @@ Date: 2008-12-09 10:36:24 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit ef7890d56453dca1aeb2e12db29b7e418d93dde4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6848,8 +7848,8 @@ Date: 2008-12-01 23:04:12 +0200 ability to also validate the filter chain and options (not implemented yet for all filters). - src/xz/process.c | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) + src/xz/process.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) commit ccd57afa09e332d664d6d6a7498702791ea5f659 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6858,8 +7858,8 @@ Date: 2008-12-01 22:59:28 +0200 Validate the filter chain before checking filter-specific memory usage. - src/liblzma/common/filter_common.c | 14 ++++++++++---- - 1 files changed, 10 insertions(+), 4 deletions(-) + src/liblzma/common/filter_common.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) commit c596fda40b62fe1683d0ac34d0c673dcaae2aa15 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6868,9 +7868,9 @@ Date: 2008-12-01 22:58:22 +0200 Make the memusage functions of LZMA1 and LZMA2 decoders to validate the filter options. - src/liblzma/lzma/lzma2_decoder.c | 7 ++----- - src/liblzma/lzma/lzma_decoder.c | 14 ++++++++++---- - src/liblzma/lzma/lzma_decoder.h | 5 +++++ + src/liblzma/lzma/lzma2_decoder.c | 7 ++----- + src/liblzma/lzma/lzma_decoder.c | 14 ++++++++++---- + src/liblzma/lzma/lzma_decoder.h | 5 +++++ 3 files changed, 17 insertions(+), 9 deletions(-) commit c58f469be5bb9b0bdab825c6687445fd553f4f3a @@ -6880,8 +7880,8 @@ Date: 2008-12-01 22:55:18 +0200 Added the changes for Delta filter that should have been part of 656ec87882ee74b192c4ea4a233a235eca7b04d4. - src/liblzma/common/filter_decoder.c | 2 +- - src/liblzma/common/filter_encoder.c | 2 +- + src/liblzma/common/filter_decoder.c | 2 +- + src/liblzma/common/filter_encoder.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cd708015202dbf7585b84a8781462a20c42a324b @@ -6892,8 +7892,8 @@ Date: 2008-12-01 22:50:28 +0200 also in the first LZMA chunk after a dictionary reset in uncompressed chunk. - src/liblzma/lzma/lzma2_decoder.c | 95 ++++++++++++++++--------------------- - 1 files changed, 41 insertions(+), 54 deletions(-) + src/liblzma/lzma/lzma2_decoder.c | 95 +++++++++++++++++----------------------- + 1 file changed, 41 insertions(+), 54 deletions(-) commit 656ec87882ee74b192c4ea4a233a235eca7b04d4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6902,14 +7902,14 @@ Date: 2008-12-01 16:30:11 +0200 Added lzma_delta_coder_memusage() which also validates the options. - src/liblzma/delta/Makefile.am | 3 +- - src/liblzma/delta/delta_common.c | 28 +++++++++++++++++------ - src/liblzma/delta/delta_common.h | 19 +--------------- - src/liblzma/delta/delta_decoder.c | 2 +- - src/liblzma/delta/delta_decoder.h | 2 +- - src/liblzma/delta/delta_encoder.c | 14 +++-------- - src/liblzma/delta/delta_encoder.h | 2 +- - src/liblzma/delta/delta_private.h | 44 +++++++++++++++++++++++++++++++++++++ + src/liblzma/delta/Makefile.am | 3 ++- + src/liblzma/delta/delta_common.c | 28 ++++++++++++++++++------- + src/liblzma/delta/delta_common.h | 19 +---------------- + src/liblzma/delta/delta_decoder.c | 2 +- + src/liblzma/delta/delta_decoder.h | 2 +- + src/liblzma/delta/delta_encoder.c | 14 ++++--------- + src/liblzma/delta/delta_encoder.h | 2 +- + src/liblzma/delta/delta_private.h | 44 +++++++++++++++++++++++++++++++++++++++ 8 files changed, 75 insertions(+), 39 deletions(-) commit 691a9155b7a28882baf37e9d1e969e32e91dbc7a @@ -6921,9 +7921,9 @@ Date: 2008-11-29 10:03:49 +0200 Updated THANKS. - Makefile.am | 1 - - THANKS | 1 + - 2 files changed, 1 insertions(+), 1 deletions(-) + Makefile.am | 1 - + THANKS | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) commit c7007ddf06ac2b0e018d71d281c21b99f16e7ae0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6933,8 +7933,8 @@ Date: 2008-11-28 12:00:48 +0200 progress indicator but since COLUMNS isn't usually available, the code was left commented out. - src/xz/message.c | 14 +++++++++----- - 1 files changed, 9 insertions(+), 5 deletions(-) + src/xz/message.c | 14 +++++++++----- + 1 file changed, 9 insertions(+), 5 deletions(-) commit ae65dcfde27014e4d811e1a1308aa5d0fe8debbd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6942,8 +7942,8 @@ Date: 2008-11-27 19:28:59 +0200 Cleanups to message.c. - src/xz/message.c | 47 ++++++++++++++++++----------------------------- - 1 files changed, 18 insertions(+), 29 deletions(-) + src/xz/message.c | 47 ++++++++++++++++++----------------------------- + 1 file changed, 18 insertions(+), 29 deletions(-) commit a8368b75cdcd5427299001cc42839287f27b244d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6951,14 +7951,14 @@ Date: 2008-11-25 02:37:47 +0200 Remove the nowadays unneeded memory limitting malloc() wrapper. - src/liblzma/api/Makefile.am | 1 - - src/liblzma/api/lzma.h | 1 - - src/liblzma/api/lzma/memlimit.h | 207 ------------------------- - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/memory_limiter.c | 288 ----------------------------------- - tests/Makefile.am | 2 - - tests/test_memlimit.c | 114 -------------- - 7 files changed, 0 insertions(+), 614 deletions(-) + src/liblzma/api/Makefile.am | 1 - + src/liblzma/api/lzma.h | 1 - + src/liblzma/api/lzma/memlimit.h | 207 -------------------------- + src/liblzma/common/Makefile.am | 1 - + src/liblzma/common/memory_limiter.c | 288 ------------------------------------ + tests/Makefile.am | 2 - + tests/test_memlimit.c | 114 -------------- + 7 files changed, 614 deletions(-) commit 69472ee5f055a2bb6f28106f0923e1461fd1d080 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6968,8 +7968,8 @@ Date: 2008-11-23 15:09:03 +0200 LZMA_PROG_ERROR in single-call mode if there's no output space. - src/liblzma/common/vli_decoder.c | 15 +++++++++------ - src/liblzma/common/vli_encoder.c | 31 ++++++++++++++++++++++++------- + src/liblzma/common/vli_decoder.c | 15 +++++++++------ + src/liblzma/common/vli_encoder.c | 31 ++++++++++++++++++++++++------- 2 files changed, 33 insertions(+), 13 deletions(-) commit 4249c8c15a08f55b51b7012e6aaafce3aa9eb650 @@ -6978,8 +7978,8 @@ Date: 2008-11-22 17:44:33 +0200 Typo fix - src/xz/process.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/xz/process.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 6d1d6f4598d121253dbe1084c6866b66e95c361b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6987,8 +7987,8 @@ Date: 2008-11-20 22:59:10 +0200 Support NetBSD's errno for O_NOFOLLOW. - src/xz/io.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) + src/xz/io.c | 8 ++++++++ + 1 file changed, 8 insertions(+) commit f901a290eef67b8ea4720ccdf5f46edf775ed9d7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -6997,8 +7997,8 @@ Date: 2008-11-20 18:05:52 +0200 Build xzdec and lzmadec from xzdec.c. xzdec supports only .xz files and lzmadec only .lzma files. - src/xzdec/Makefile.am | 7 +- - src/xzdec/xzdec.c | 311 +++++++++++++++++++++---------------------------- + src/xzdec/Makefile.am | 7 +- + src/xzdec/xzdec.c | 311 ++++++++++++++++++++++---------------------------- 2 files changed, 140 insertions(+), 178 deletions(-) commit 86a0ed8f01c8ed44721223f885e679c71b7bb94c @@ -7007,8 +8007,8 @@ Date: 2008-11-20 11:01:29 +0200 Minor cleanups to xzdec. - src/xzdec/xzdec.c | 20 ++++++++++---------- - 1 files changed, 10 insertions(+), 10 deletions(-) + src/xzdec/xzdec.c | 20 ++++++++++---------- + 1 file changed, 10 insertions(+), 10 deletions(-) commit 54f716ba8905d09752dcd1519455a40bd21d5317 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7016,8 +8016,8 @@ Date: 2008-11-19 23:55:22 +0200 Added missing check for uint16_t. - configure.ac | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + configure.ac | 1 + + 1 file changed, 1 insertion(+) commit 1880a3927b23f265f63b2adb86fbdb81ea09eb06 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7028,57 +8028,57 @@ Date: 2008-11-19 23:52:24 +0200 compatibility with LZMA Utils 4.32.x; I'm not sure if this should be the default though. - configure.ac | 4 +- - po/POTFILES.in | 21 +- - src/Makefile.am | 2 +- - src/lzma/Makefile.am | 72 ---- - src/lzma/args.c | 500 -------------------------- - src/lzma/args.h | 56 --- - src/lzma/hardware.c | 122 ------- - src/lzma/hardware.h | 45 --- - src/lzma/io.c | 658 ---------------------------------- - src/lzma/io.h | 97 ----- - src/lzma/list.c | 477 ------------------------- - src/lzma/main.c | 402 --------------------- - src/lzma/main.h | 60 ---- - src/lzma/message.c | 892 ----------------------------------------------- - src/lzma/message.h | 132 ------- - src/lzma/options.c | 352 ------------------- - src/lzma/options.h | 46 --- - src/lzma/private.h | 52 --- - src/lzma/process.c | 391 --------------------- - src/lzma/process.h | 70 ---- - src/lzma/suffix.c | 213 ----------- - src/lzma/suffix.h | 40 --- - src/lzma/util.c | 199 ----------- - src/lzma/util.h | 71 ---- - src/lzmadec/Makefile.am | 29 -- - src/lzmadec/lzmadec.c | 492 -------------------------- - src/xz/Makefile.am | 74 ++++ - src/xz/args.c | 500 ++++++++++++++++++++++++++ - src/xz/args.h | 56 +++ - src/xz/hardware.c | 122 +++++++ - src/xz/hardware.h | 45 +++ - src/xz/io.c | 658 ++++++++++++++++++++++++++++++++++ - src/xz/io.h | 97 +++++ - src/xz/list.c | 477 +++++++++++++++++++++++++ - src/xz/main.c | 402 +++++++++++++++++++++ - src/xz/main.h | 60 ++++ - src/xz/message.c | 892 +++++++++++++++++++++++++++++++++++++++++++++++ - src/xz/message.h | 132 +++++++ - src/xz/options.c | 352 +++++++++++++++++++ - src/xz/options.h | 46 +++ - src/xz/private.h | 52 +++ - src/xz/process.c | 391 +++++++++++++++++++++ - src/xz/process.h | 70 ++++ - src/xz/suffix.c | 213 +++++++++++ - src/xz/suffix.h | 40 +++ - src/xz/util.c | 199 +++++++++++ - src/xz/util.h | 71 ++++ - src/xzdec/Makefile.am | 29 ++ - src/xzdec/xzdec.c | 492 ++++++++++++++++++++++++++ - tests/test_compress.sh | 29 +- - tests/test_files.sh | 4 +- + configure.ac | 4 +- + po/POTFILES.in | 21 +- + src/Makefile.am | 2 +- + src/lzma/Makefile.am | 72 ---- + src/lzma/args.c | 500 --------------------------- + src/lzma/args.h | 56 --- + src/lzma/hardware.c | 122 ------- + src/lzma/hardware.h | 45 --- + src/lzma/io.c | 658 ----------------------------------- + src/lzma/io.h | 97 ------ + src/lzma/list.c | 477 -------------------------- + src/lzma/main.c | 402 ---------------------- + src/lzma/main.h | 60 ---- + src/lzma/message.c | 892 ------------------------------------------------ + src/lzma/message.h | 132 ------- + src/lzma/options.c | 352 ------------------- + src/lzma/options.h | 46 --- + src/lzma/private.h | 52 --- + src/lzma/process.c | 391 --------------------- + src/lzma/process.h | 70 ---- + src/lzma/suffix.c | 213 ------------ + src/lzma/suffix.h | 40 --- + src/lzma/util.c | 199 ----------- + src/lzma/util.h | 71 ---- + src/lzmadec/Makefile.am | 29 -- + src/lzmadec/lzmadec.c | 492 -------------------------- + src/xz/Makefile.am | 74 ++++ + src/xz/args.c | 500 +++++++++++++++++++++++++++ + src/xz/args.h | 56 +++ + src/xz/hardware.c | 122 +++++++ + src/xz/hardware.h | 45 +++ + src/xz/io.c | 658 +++++++++++++++++++++++++++++++++++ + src/xz/io.h | 97 ++++++ + src/xz/list.c | 477 ++++++++++++++++++++++++++ + src/xz/main.c | 402 ++++++++++++++++++++++ + src/xz/main.h | 60 ++++ + src/xz/message.c | 892 ++++++++++++++++++++++++++++++++++++++++++++++++ + src/xz/message.h | 132 +++++++ + src/xz/options.c | 352 +++++++++++++++++++ + src/xz/options.h | 46 +++ + src/xz/private.h | 52 +++ + src/xz/process.c | 391 +++++++++++++++++++++ + src/xz/process.h | 70 ++++ + src/xz/suffix.c | 213 ++++++++++++ + src/xz/suffix.h | 40 +++ + src/xz/util.c | 199 +++++++++++ + src/xz/util.h | 71 ++++ + src/xzdec/Makefile.am | 29 ++ + src/xzdec/xzdec.c | 492 ++++++++++++++++++++++++++ + tests/test_compress.sh | 29 +- + tests/test_files.sh | 4 +- 51 files changed, 5498 insertions(+), 5500 deletions(-) commit e114502b2bc371e4a45449832cb69be036360722 @@ -7096,119 +8096,119 @@ Date: 2008-11-19 20:46:52 +0200 - Upgraded to the last LGPLv2.1+ getopt_long from gnulib. - Some bug fixes - THANKS | 1 + - configure.ac | 48 +- - debug/full_flush.c | 6 +- - debug/known_sizes.c | 2 +- - debug/memusage.c | 2 +- - debug/sync_flush.c | 10 +- - doc/file-format.txt | 260 +++++---- - lib/Makefile.am | 10 +- - lib/getopt.c | 14 +- - lib/getopt.in.h | 226 +++++++ - lib/getopt1.c | 8 +- - lib/getopt_.h | 226 ------- - lib/gettext.h | 240 ------- - m4/getopt.m4 | 64 +-- - src/common/bswap.h | 15 +- - src/common/physmem.h | 4 + - src/common/sysdefs.h | 12 +- - src/liblzma/api/lzma/block.h | 47 +- - src/liblzma/api/lzma/filter.h | 8 + - src/liblzma/api/lzma/index.h | 20 +- - src/liblzma/api/lzma/index_hash.h | 4 +- - src/liblzma/common/block_decoder.c | 59 +- - src/liblzma/common/block_encoder.c | 41 +- - src/liblzma/common/block_header_decoder.c | 31 +- - src/liblzma/common/block_header_encoder.c | 69 +-- - src/liblzma/common/block_util.c | 45 +- - src/liblzma/common/common.h | 8 - - src/liblzma/common/filter_common.c | 4 +- - src/liblzma/common/index.c | 259 ++++---- - src/liblzma/common/index.h | 33 +- - src/liblzma/common/index_decoder.c | 31 +- - src/liblzma/common/index_encoder.c | 16 +- - src/liblzma/common/index_hash.c | 68 +- - src/liblzma/common/stream_decoder.c | 9 +- - src/liblzma/common/stream_encoder.c | 6 +- - src/liblzma/lz/lz_decoder.h | 4 +- - src/liblzma/subblock/subblock_decoder.c | 3 +- - src/lzma/Makefile.am | 9 +- - src/lzma/alloc.c | 106 --- - src/lzma/alloc.h | 42 -- - src/lzma/args.c | 531 +++++++--------- - src/lzma/args.h | 42 +- - src/lzma/error.c | 162 ----- - src/lzma/error.h | 67 -- - src/lzma/hardware.c | 75 ++- - src/lzma/hardware.h | 16 +- - src/lzma/help.c | 170 ----- - src/lzma/help.h | 32 - - src/lzma/io.c | 757 +++++++++++----------- - src/lzma/io.h | 51 ++- - src/lzma/main.c | 392 ++++++++---- - src/lzma/main.h | 60 ++ - src/lzma/message.c | 892 ++++++++++++++++++++++++++ - src/lzma/message.h | 132 ++++ - src/lzma/options.c | 42 +- - src/lzma/options.h | 6 +- - src/lzma/private.h | 28 +- - src/lzma/process.c | 525 +++++++-------- - src/lzma/process.h | 40 ++ - src/lzma/suffix.c | 52 +- - src/lzma/suffix.h | 17 +- - src/lzma/util.c | 100 ++-- - src/lzma/util.h | 43 ++- - src/lzmadec/lzmadec.c | 36 +- - tests/files/README | 12 +- - tests/files/bad-1-block_header-1.xz | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-2.xz | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-3.xz | Bin 68 -> 68 bytes - tests/files/bad-1-block_header-4.xz | Bin 72 -> 76 bytes - tests/files/bad-1-block_header-5.xz | Bin 0 -> 72 bytes - tests/files/bad-1-check-crc32.xz | Bin 68 -> 68 bytes - tests/files/bad-1-check-crc64.xz | Bin 72 -> 72 bytes - tests/files/bad-1-check-sha256.xz | Bin 96 -> 96 bytes - tests/files/bad-1-lzma2-1.xz | Bin 64 -> 64 bytes - tests/files/bad-1-lzma2-2.xz | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-3.xz | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-4.xz | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-5.xz | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-6.xz | Bin 68 -> 68 bytes - tests/files/bad-1-lzma2-7.xz | Bin 408 -> 408 bytes - tests/files/bad-1-stream_flags-1.xz | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-2.xz | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-3.xz | Bin 68 -> 68 bytes - tests/files/bad-1-vli-1.xz | Bin 72 -> 72 bytes - tests/files/bad-1-vli-2.xz | Bin 72 -> 76 bytes - tests/files/bad-2-compressed_data_padding.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-1.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-2.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-3.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-4.xz | Bin 92 -> 92 bytes - tests/files/bad-2-index-5.xz | Bin 0 -> 92 bytes - tests/files/good-1-3delta-lzma2.xz | Bin 528 -> 528 bytes - tests/files/good-1-block_header-1.xz | Bin 72 -> 72 bytes - tests/files/good-1-block_header-2.xz | Bin 68 -> 68 bytes - tests/files/good-1-block_header-3.xz | Bin 68 -> 68 bytes - tests/files/good-1-check-crc32.xz | Bin 68 -> 68 bytes - tests/files/good-1-check-crc64.xz | Bin 72 -> 72 bytes - tests/files/good-1-check-none.xz | Bin 64 -> 64 bytes - tests/files/good-1-check-sha256.xz | Bin 96 -> 96 bytes - tests/files/good-1-delta-lzma2.tiff.xz | Bin 51312 -> 51316 bytes - tests/files/good-1-lzma2-1.xz | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-2.xz | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-3.xz | Bin 408 -> 408 bytes - tests/files/good-1-sparc-lzma2.xz | Bin 2292 -> 2296 bytes - tests/files/good-1-x86-lzma2.xz | Bin 1936 -> 1936 bytes - tests/files/good-2-lzma2.xz | Bin 92 -> 92 bytes - tests/files/unsupported-block_header.xz | Bin 68 -> 68 bytes - tests/files/unsupported-check.xz | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-1.xz | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-2.xz | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-3.xz | Bin 68 -> 68 bytes - tests/test_block_header.c | 16 +- - tests/test_index.c | 42 +- + THANKS | 1 + + configure.ac | 48 +- + debug/full_flush.c | 6 +- + debug/known_sizes.c | 2 +- + debug/memusage.c | 2 +- + debug/sync_flush.c | 10 +- + doc/file-format.txt | 260 ++++---- + lib/Makefile.am | 10 +- + lib/getopt.c | 14 +- + lib/getopt.in.h | 226 +++++++ + lib/getopt1.c | 8 +- + lib/getopt_.h | 226 ------- + lib/gettext.h | 240 ------- + m4/getopt.m4 | 64 +- + src/common/bswap.h | 15 +- + src/common/physmem.h | 4 + + src/common/sysdefs.h | 12 +- + src/liblzma/api/lzma/block.h | 47 +- + src/liblzma/api/lzma/filter.h | 8 + + src/liblzma/api/lzma/index.h | 20 +- + src/liblzma/api/lzma/index_hash.h | 4 +- + src/liblzma/common/block_decoder.c | 59 +- + src/liblzma/common/block_encoder.c | 41 +- + src/liblzma/common/block_header_decoder.c | 31 +- + src/liblzma/common/block_header_encoder.c | 69 +-- + src/liblzma/common/block_util.c | 45 +- + src/liblzma/common/common.h | 8 - + src/liblzma/common/filter_common.c | 4 +- + src/liblzma/common/index.c | 259 ++++---- + src/liblzma/common/index.h | 33 +- + src/liblzma/common/index_decoder.c | 31 +- + src/liblzma/common/index_encoder.c | 16 +- + src/liblzma/common/index_hash.c | 68 +- + src/liblzma/common/stream_decoder.c | 9 +- + src/liblzma/common/stream_encoder.c | 6 +- + src/liblzma/lz/lz_decoder.h | 4 +- + src/liblzma/subblock/subblock_decoder.c | 3 +- + src/lzma/Makefile.am | 9 +- + src/lzma/alloc.c | 106 ---- + src/lzma/alloc.h | 42 -- + src/lzma/args.c | 531 +++++++--------- + src/lzma/args.h | 42 +- + src/lzma/error.c | 162 ----- + src/lzma/error.h | 67 -- + src/lzma/hardware.c | 75 ++- + src/lzma/hardware.h | 16 +- + src/lzma/help.c | 170 ----- + src/lzma/help.h | 32 - + src/lzma/io.c | 757 +++++++++++------------ + src/lzma/io.h | 51 +- + src/lzma/main.c | 392 ++++++++---- + src/lzma/main.h | 60 ++ + src/lzma/message.c | 892 +++++++++++++++++++++++++++ + src/lzma/message.h | 132 ++++ + src/lzma/options.c | 42 +- + src/lzma/options.h | 6 +- + src/lzma/private.h | 28 +- + src/lzma/process.c | 525 ++++++++-------- + src/lzma/process.h | 40 ++ + src/lzma/suffix.c | 52 +- + src/lzma/suffix.h | 17 +- + src/lzma/util.c | 100 +-- + src/lzma/util.h | 43 +- + src/lzmadec/lzmadec.c | 36 +- + tests/files/README | 12 +- + tests/files/bad-1-block_header-1.xz | Bin 64 -> 64 bytes + tests/files/bad-1-block_header-2.xz | Bin 64 -> 64 bytes + tests/files/bad-1-block_header-3.xz | Bin 68 -> 68 bytes + tests/files/bad-1-block_header-4.xz | Bin 72 -> 76 bytes + tests/files/bad-1-block_header-5.xz | Bin 0 -> 72 bytes + tests/files/bad-1-check-crc32.xz | Bin 68 -> 68 bytes + tests/files/bad-1-check-crc64.xz | Bin 72 -> 72 bytes + tests/files/bad-1-check-sha256.xz | Bin 96 -> 96 bytes + tests/files/bad-1-lzma2-1.xz | Bin 64 -> 64 bytes + tests/files/bad-1-lzma2-2.xz | Bin 424 -> 424 bytes + tests/files/bad-1-lzma2-3.xz | Bin 424 -> 424 bytes + tests/files/bad-1-lzma2-4.xz | Bin 408 -> 408 bytes + tests/files/bad-1-lzma2-5.xz | Bin 408 -> 408 bytes + tests/files/bad-1-lzma2-6.xz | Bin 68 -> 68 bytes + tests/files/bad-1-lzma2-7.xz | Bin 408 -> 408 bytes + tests/files/bad-1-stream_flags-1.xz | Bin 68 -> 68 bytes + tests/files/bad-1-stream_flags-2.xz | Bin 68 -> 68 bytes + tests/files/bad-1-stream_flags-3.xz | Bin 68 -> 68 bytes + tests/files/bad-1-vli-1.xz | Bin 72 -> 72 bytes + tests/files/bad-1-vli-2.xz | Bin 72 -> 76 bytes + tests/files/bad-2-compressed_data_padding.xz | Bin 92 -> 92 bytes + tests/files/bad-2-index-1.xz | Bin 92 -> 92 bytes + tests/files/bad-2-index-2.xz | Bin 92 -> 92 bytes + tests/files/bad-2-index-3.xz | Bin 92 -> 92 bytes + tests/files/bad-2-index-4.xz | Bin 92 -> 92 bytes + tests/files/bad-2-index-5.xz | Bin 0 -> 92 bytes + tests/files/good-1-3delta-lzma2.xz | Bin 528 -> 528 bytes + tests/files/good-1-block_header-1.xz | Bin 72 -> 72 bytes + tests/files/good-1-block_header-2.xz | Bin 68 -> 68 bytes + tests/files/good-1-block_header-3.xz | Bin 68 -> 68 bytes + tests/files/good-1-check-crc32.xz | Bin 68 -> 68 bytes + tests/files/good-1-check-crc64.xz | Bin 72 -> 72 bytes + tests/files/good-1-check-none.xz | Bin 64 -> 64 bytes + tests/files/good-1-check-sha256.xz | Bin 96 -> 96 bytes + tests/files/good-1-delta-lzma2.tiff.xz | Bin 51312 -> 51316 bytes + tests/files/good-1-lzma2-1.xz | Bin 424 -> 424 bytes + tests/files/good-1-lzma2-2.xz | Bin 424 -> 424 bytes + tests/files/good-1-lzma2-3.xz | Bin 408 -> 408 bytes + tests/files/good-1-sparc-lzma2.xz | Bin 2292 -> 2296 bytes + tests/files/good-1-x86-lzma2.xz | Bin 1936 -> 1936 bytes + tests/files/good-2-lzma2.xz | Bin 92 -> 92 bytes + tests/files/unsupported-block_header.xz | Bin 68 -> 68 bytes + tests/files/unsupported-check.xz | Bin 68 -> 68 bytes + tests/files/unsupported-filter_flags-1.xz | Bin 68 -> 68 bytes + tests/files/unsupported-filter_flags-2.xz | Bin 68 -> 68 bytes + tests/files/unsupported-filter_flags-3.xz | Bin 68 -> 68 bytes + tests/test_block_header.c | 16 +- + tests/test_index.c | 42 +- 113 files changed, 3462 insertions(+), 2946 deletions(-) commit 3c3905b53462ae235c9438d86a4dc51086410932 @@ -7218,8 +8218,8 @@ Date: 2008-10-09 11:12:29 +0300 Fixed the test that should have been fixed as part of 1e8e4fd1f3e50129b4541406ad765d2aa1233943. - tests/test_block_header.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/test_block_header.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0f295bf7a3ece01f667caae318cc3e3424085886 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7227,8 +8227,8 @@ Date: 2008-10-07 16:42:18 +0300 Fixed some help messages. - src/lzma/help.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/lzma/help.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 1e8e4fd1f3e50129b4541406ad765d2aa1233943 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7236,11 +8236,11 @@ Date: 2008-10-07 09:40:31 +0300 Made the preset numbering more logical in liblzma API. - src/liblzma/api/lzma/container.h | 20 ++++++++++---------- - src/liblzma/api/lzma/lzma.h | 2 +- - src/liblzma/lzma/lzma_encoder_presets.c | 3 ++- - src/lzma/args.c | 8 ++++---- - src/lzma/args.h | 2 +- + src/liblzma/api/lzma/container.h | 20 ++++++++++---------- + src/liblzma/api/lzma/lzma.h | 2 +- + src/liblzma/lzma/lzma_encoder_presets.c | 3 ++- + src/lzma/args.c | 8 ++++---- + src/lzma/args.h | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) commit 5e4df4c3c09c82bbbb1a916784e3dc717ca4ff81 @@ -7249,8 +8249,8 @@ Date: 2008-10-03 19:36:09 +0300 Removed fi from po/LINGUAS. - po/LINGUAS | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + po/LINGUAS | 1 - + 1 file changed, 1 deletion(-) commit fcfb86c7770328cfffa2e83b176af9a1ba2d9128 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7258,8 +8258,8 @@ Date: 2008-10-03 07:06:48 +0300 Fixed suffix handling with --format=raw. - src/lzma/suffix.c | 28 +++++++++++++++++++--------- - 1 files changed, 19 insertions(+), 9 deletions(-) + src/lzma/suffix.c | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) commit bd137524f2f50e30ba054f42f1f6536cd3cee920 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7269,12 +8269,12 @@ Date: 2008-10-02 22:51:46 +0300 This also fixes a bug related to --suffix option. Some issues with suffixes with --format=raw were not fixed. - src/lzma/args.c | 67 ++++++++++++++++++++++++++++++------------- - src/lzma/args.h | 13 ++++---- - src/lzma/help.c | 4 +- - src/lzma/process.c | 24 +++++++++------ - src/lzma/suffix.c | 74 +++++++++++++++++++++++++++++++++++++++-------- - tests/test_compress.sh | 3 +- + src/lzma/args.c | 67 +++++++++++++++++++++++++++++++-------------- + src/lzma/args.h | 13 +++++---- + src/lzma/help.c | 4 +-- + src/lzma/process.c | 24 +++++++++------- + src/lzma/suffix.c | 74 +++++++++++++++++++++++++++++++++++++++++--------- + tests/test_compress.sh | 3 +- 6 files changed, 133 insertions(+), 52 deletions(-) commit 4c321a41c482821aa3c4d64cdf886a6ed904d844 @@ -7283,122 +8283,122 @@ Date: 2008-09-30 17:43:55 +0300 Renamed the test files from .lzma suffix to .xz suffix. - tests/files/README | 128 ++++++++++++------------ - tests/files/bad-0-backward_size.lzma | Bin 32 -> 0 bytes - tests/files/bad-0-backward_size.xz | Bin 0 -> 32 bytes - tests/files/bad-0-empty-truncated.lzma | Bin 31 -> 0 bytes - tests/files/bad-0-empty-truncated.xz | Bin 0 -> 31 bytes - tests/files/bad-0-footer_magic.lzma | Bin 32 -> 0 bytes - tests/files/bad-0-footer_magic.xz | Bin 0 -> 32 bytes - tests/files/bad-0-header_magic.lzma | Bin 32 -> 0 bytes - tests/files/bad-0-header_magic.xz | Bin 0 -> 32 bytes - tests/files/bad-0-nonempty_index.lzma | Bin 32 -> 0 bytes - tests/files/bad-0-nonempty_index.xz | Bin 0 -> 32 bytes - tests/files/bad-0cat-alone.lzma | Bin 55 -> 0 bytes - tests/files/bad-0cat-alone.xz | Bin 0 -> 55 bytes - tests/files/bad-0cat-header_magic.lzma | Bin 64 -> 0 bytes - tests/files/bad-0cat-header_magic.xz | Bin 0 -> 64 bytes - tests/files/bad-0catpad-empty.lzma | Bin 69 -> 0 bytes - tests/files/bad-0catpad-empty.xz | Bin 0 -> 69 bytes - tests/files/bad-0pad-empty.lzma | Bin 37 -> 0 bytes - tests/files/bad-0pad-empty.xz | Bin 0 -> 37 bytes - tests/files/bad-1-block_header-1.lzma | Bin 64 -> 0 bytes - tests/files/bad-1-block_header-1.xz | Bin 0 -> 64 bytes - tests/files/bad-1-block_header-2.lzma | Bin 64 -> 0 bytes - tests/files/bad-1-block_header-2.xz | Bin 0 -> 64 bytes - tests/files/bad-1-block_header-3.lzma | Bin 68 -> 0 bytes - tests/files/bad-1-block_header-3.xz | Bin 0 -> 68 bytes - tests/files/bad-1-block_header-4.lzma | Bin 72 -> 0 bytes - tests/files/bad-1-block_header-4.xz | Bin 0 -> 72 bytes - tests/files/bad-1-check-crc32.lzma | Bin 68 -> 0 bytes - tests/files/bad-1-check-crc32.xz | Bin 0 -> 68 bytes - tests/files/bad-1-check-crc64.lzma | Bin 72 -> 0 bytes - tests/files/bad-1-check-crc64.xz | Bin 0 -> 72 bytes - tests/files/bad-1-check-sha256.lzma | Bin 96 -> 0 bytes - tests/files/bad-1-check-sha256.xz | Bin 0 -> 96 bytes - tests/files/bad-1-lzma2-1.lzma | Bin 64 -> 0 bytes - tests/files/bad-1-lzma2-1.xz | Bin 0 -> 64 bytes - tests/files/bad-1-lzma2-2.lzma | Bin 424 -> 0 bytes - tests/files/bad-1-lzma2-2.xz | Bin 0 -> 424 bytes - tests/files/bad-1-lzma2-3.lzma | Bin 424 -> 0 bytes - tests/files/bad-1-lzma2-3.xz | Bin 0 -> 424 bytes - tests/files/bad-1-lzma2-4.lzma | Bin 408 -> 0 bytes - tests/files/bad-1-lzma2-4.xz | Bin 0 -> 408 bytes - tests/files/bad-1-lzma2-5.lzma | Bin 408 -> 0 bytes - tests/files/bad-1-lzma2-5.xz | Bin 0 -> 408 bytes - tests/files/bad-1-lzma2-6.lzma | Bin 68 -> 0 bytes - tests/files/bad-1-lzma2-6.xz | Bin 0 -> 68 bytes - tests/files/bad-1-lzma2-7.lzma | Bin 408 -> 0 bytes - tests/files/bad-1-lzma2-7.xz | Bin 0 -> 408 bytes - tests/files/bad-1-stream_flags-1.lzma | Bin 68 -> 0 bytes - tests/files/bad-1-stream_flags-1.xz | Bin 0 -> 68 bytes - tests/files/bad-1-stream_flags-2.lzma | Bin 68 -> 0 bytes - tests/files/bad-1-stream_flags-2.xz | Bin 0 -> 68 bytes - tests/files/bad-1-stream_flags-3.lzma | Bin 68 -> 0 bytes - tests/files/bad-1-stream_flags-3.xz | Bin 0 -> 68 bytes - tests/files/bad-1-vli-1.lzma | Bin 72 -> 0 bytes - tests/files/bad-1-vli-1.xz | Bin 0 -> 72 bytes - tests/files/bad-1-vli-2.lzma | Bin 72 -> 0 bytes - tests/files/bad-1-vli-2.xz | Bin 0 -> 72 bytes - tests/files/bad-2-compressed_data_padding.lzma | Bin 92 -> 0 bytes - tests/files/bad-2-compressed_data_padding.xz | Bin 0 -> 92 bytes - tests/files/bad-2-index-1.lzma | Bin 92 -> 0 bytes - tests/files/bad-2-index-1.xz | Bin 0 -> 92 bytes - tests/files/bad-2-index-2.lzma | Bin 92 -> 0 bytes - tests/files/bad-2-index-2.xz | Bin 0 -> 92 bytes - tests/files/bad-2-index-3.lzma | Bin 92 -> 0 bytes - tests/files/bad-2-index-3.xz | Bin 0 -> 92 bytes - tests/files/bad-2-index-4.lzma | Bin 92 -> 0 bytes - tests/files/bad-2-index-4.xz | Bin 0 -> 92 bytes - tests/files/good-0-empty.lzma | Bin 32 -> 0 bytes - tests/files/good-0-empty.xz | Bin 0 -> 32 bytes - tests/files/good-0cat-empty.lzma | Bin 64 -> 0 bytes - tests/files/good-0cat-empty.xz | Bin 0 -> 64 bytes - tests/files/good-0catpad-empty.lzma | Bin 68 -> 0 bytes - tests/files/good-0catpad-empty.xz | Bin 0 -> 68 bytes - tests/files/good-0pad-empty.lzma | Bin 36 -> 0 bytes - tests/files/good-0pad-empty.xz | Bin 0 -> 36 bytes - tests/files/good-1-3delta-lzma2.lzma | Bin 528 -> 0 bytes - tests/files/good-1-3delta-lzma2.xz | Bin 0 -> 528 bytes - tests/files/good-1-block_header-1.lzma | Bin 72 -> 0 bytes - tests/files/good-1-block_header-1.xz | Bin 0 -> 72 bytes - tests/files/good-1-block_header-2.lzma | Bin 68 -> 0 bytes - tests/files/good-1-block_header-2.xz | Bin 0 -> 68 bytes - tests/files/good-1-block_header-3.lzma | Bin 68 -> 0 bytes - tests/files/good-1-block_header-3.xz | Bin 0 -> 68 bytes - tests/files/good-1-check-crc32.lzma | Bin 68 -> 0 bytes - tests/files/good-1-check-crc32.xz | Bin 0 -> 68 bytes - tests/files/good-1-check-crc64.lzma | Bin 72 -> 0 bytes - tests/files/good-1-check-crc64.xz | Bin 0 -> 72 bytes - tests/files/good-1-check-none.lzma | Bin 64 -> 0 bytes - tests/files/good-1-check-none.xz | Bin 0 -> 64 bytes - tests/files/good-1-check-sha256.lzma | Bin 96 -> 0 bytes - tests/files/good-1-check-sha256.xz | Bin 0 -> 96 bytes - tests/files/good-1-delta-lzma2.tiff.lzma | Bin 51312 -> 0 bytes - tests/files/good-1-delta-lzma2.tiff.xz | Bin 0 -> 51312 bytes - tests/files/good-1-lzma2-1.lzma | Bin 424 -> 0 bytes - tests/files/good-1-lzma2-1.xz | Bin 0 -> 424 bytes - tests/files/good-1-lzma2-2.lzma | Bin 424 -> 0 bytes - tests/files/good-1-lzma2-2.xz | Bin 0 -> 424 bytes - tests/files/good-1-lzma2-3.lzma | Bin 408 -> 0 bytes - tests/files/good-1-lzma2-3.xz | Bin 0 -> 408 bytes - tests/files/good-1-sparc-lzma2.lzma | Bin 2292 -> 0 bytes - tests/files/good-1-sparc-lzma2.xz | Bin 0 -> 2292 bytes - tests/files/good-1-x86-lzma2.lzma | Bin 1936 -> 0 bytes - tests/files/good-1-x86-lzma2.xz | Bin 0 -> 1936 bytes - tests/files/good-2-lzma2.lzma | Bin 92 -> 0 bytes - tests/files/good-2-lzma2.xz | Bin 0 -> 92 bytes - tests/files/unsupported-block_header.lzma | Bin 68 -> 0 bytes - tests/files/unsupported-block_header.xz | Bin 0 -> 68 bytes - tests/files/unsupported-check.lzma | Bin 68 -> 0 bytes - tests/files/unsupported-check.xz | Bin 0 -> 68 bytes - tests/files/unsupported-filter_flags-1.lzma | Bin 68 -> 0 bytes - tests/files/unsupported-filter_flags-1.xz | Bin 0 -> 68 bytes - tests/files/unsupported-filter_flags-2.lzma | Bin 68 -> 0 bytes - tests/files/unsupported-filter_flags-2.xz | Bin 0 -> 68 bytes - tests/files/unsupported-filter_flags-3.lzma | Bin 68 -> 0 bytes - tests/files/unsupported-filter_flags-3.xz | Bin 0 -> 68 bytes - tests/test_files.sh | 6 +- + tests/files/README | 128 ++++++++++++------------- + tests/files/bad-0-backward_size.lzma | Bin 32 -> 0 bytes + tests/files/bad-0-backward_size.xz | Bin 0 -> 32 bytes + tests/files/bad-0-empty-truncated.lzma | Bin 31 -> 0 bytes + tests/files/bad-0-empty-truncated.xz | Bin 0 -> 31 bytes + tests/files/bad-0-footer_magic.lzma | Bin 32 -> 0 bytes + tests/files/bad-0-footer_magic.xz | Bin 0 -> 32 bytes + tests/files/bad-0-header_magic.lzma | Bin 32 -> 0 bytes + tests/files/bad-0-header_magic.xz | Bin 0 -> 32 bytes + tests/files/bad-0-nonempty_index.lzma | Bin 32 -> 0 bytes + tests/files/bad-0-nonempty_index.xz | Bin 0 -> 32 bytes + tests/files/bad-0cat-alone.lzma | Bin 55 -> 0 bytes + tests/files/bad-0cat-alone.xz | Bin 0 -> 55 bytes + tests/files/bad-0cat-header_magic.lzma | Bin 64 -> 0 bytes + tests/files/bad-0cat-header_magic.xz | Bin 0 -> 64 bytes + tests/files/bad-0catpad-empty.lzma | Bin 69 -> 0 bytes + tests/files/bad-0catpad-empty.xz | Bin 0 -> 69 bytes + tests/files/bad-0pad-empty.lzma | Bin 37 -> 0 bytes + tests/files/bad-0pad-empty.xz | Bin 0 -> 37 bytes + tests/files/bad-1-block_header-1.lzma | Bin 64 -> 0 bytes + tests/files/bad-1-block_header-1.xz | Bin 0 -> 64 bytes + tests/files/bad-1-block_header-2.lzma | Bin 64 -> 0 bytes + tests/files/bad-1-block_header-2.xz | Bin 0 -> 64 bytes + tests/files/bad-1-block_header-3.lzma | Bin 68 -> 0 bytes + tests/files/bad-1-block_header-3.xz | Bin 0 -> 68 bytes + tests/files/bad-1-block_header-4.lzma | Bin 72 -> 0 bytes + tests/files/bad-1-block_header-4.xz | Bin 0 -> 72 bytes + tests/files/bad-1-check-crc32.lzma | Bin 68 -> 0 bytes + tests/files/bad-1-check-crc32.xz | Bin 0 -> 68 bytes + tests/files/bad-1-check-crc64.lzma | Bin 72 -> 0 bytes + tests/files/bad-1-check-crc64.xz | Bin 0 -> 72 bytes + tests/files/bad-1-check-sha256.lzma | Bin 96 -> 0 bytes + tests/files/bad-1-check-sha256.xz | Bin 0 -> 96 bytes + tests/files/bad-1-lzma2-1.lzma | Bin 64 -> 0 bytes + tests/files/bad-1-lzma2-1.xz | Bin 0 -> 64 bytes + tests/files/bad-1-lzma2-2.lzma | Bin 424 -> 0 bytes + tests/files/bad-1-lzma2-2.xz | Bin 0 -> 424 bytes + tests/files/bad-1-lzma2-3.lzma | Bin 424 -> 0 bytes + tests/files/bad-1-lzma2-3.xz | Bin 0 -> 424 bytes + tests/files/bad-1-lzma2-4.lzma | Bin 408 -> 0 bytes + tests/files/bad-1-lzma2-4.xz | Bin 0 -> 408 bytes + tests/files/bad-1-lzma2-5.lzma | Bin 408 -> 0 bytes + tests/files/bad-1-lzma2-5.xz | Bin 0 -> 408 bytes + tests/files/bad-1-lzma2-6.lzma | Bin 68 -> 0 bytes + tests/files/bad-1-lzma2-6.xz | Bin 0 -> 68 bytes + tests/files/bad-1-lzma2-7.lzma | Bin 408 -> 0 bytes + tests/files/bad-1-lzma2-7.xz | Bin 0 -> 408 bytes + tests/files/bad-1-stream_flags-1.lzma | Bin 68 -> 0 bytes + tests/files/bad-1-stream_flags-1.xz | Bin 0 -> 68 bytes + tests/files/bad-1-stream_flags-2.lzma | Bin 68 -> 0 bytes + tests/files/bad-1-stream_flags-2.xz | Bin 0 -> 68 bytes + tests/files/bad-1-stream_flags-3.lzma | Bin 68 -> 0 bytes + tests/files/bad-1-stream_flags-3.xz | Bin 0 -> 68 bytes + tests/files/bad-1-vli-1.lzma | Bin 72 -> 0 bytes + tests/files/bad-1-vli-1.xz | Bin 0 -> 72 bytes + tests/files/bad-1-vli-2.lzma | Bin 72 -> 0 bytes + tests/files/bad-1-vli-2.xz | Bin 0 -> 72 bytes + tests/files/bad-2-compressed_data_padding.lzma | Bin 92 -> 0 bytes + tests/files/bad-2-compressed_data_padding.xz | Bin 0 -> 92 bytes + tests/files/bad-2-index-1.lzma | Bin 92 -> 0 bytes + tests/files/bad-2-index-1.xz | Bin 0 -> 92 bytes + tests/files/bad-2-index-2.lzma | Bin 92 -> 0 bytes + tests/files/bad-2-index-2.xz | Bin 0 -> 92 bytes + tests/files/bad-2-index-3.lzma | Bin 92 -> 0 bytes + tests/files/bad-2-index-3.xz | Bin 0 -> 92 bytes + tests/files/bad-2-index-4.lzma | Bin 92 -> 0 bytes + tests/files/bad-2-index-4.xz | Bin 0 -> 92 bytes + tests/files/good-0-empty.lzma | Bin 32 -> 0 bytes + tests/files/good-0-empty.xz | Bin 0 -> 32 bytes + tests/files/good-0cat-empty.lzma | Bin 64 -> 0 bytes + tests/files/good-0cat-empty.xz | Bin 0 -> 64 bytes + tests/files/good-0catpad-empty.lzma | Bin 68 -> 0 bytes + tests/files/good-0catpad-empty.xz | Bin 0 -> 68 bytes + tests/files/good-0pad-empty.lzma | Bin 36 -> 0 bytes + tests/files/good-0pad-empty.xz | Bin 0 -> 36 bytes + tests/files/good-1-3delta-lzma2.lzma | Bin 528 -> 0 bytes + tests/files/good-1-3delta-lzma2.xz | Bin 0 -> 528 bytes + tests/files/good-1-block_header-1.lzma | Bin 72 -> 0 bytes + tests/files/good-1-block_header-1.xz | Bin 0 -> 72 bytes + tests/files/good-1-block_header-2.lzma | Bin 68 -> 0 bytes + tests/files/good-1-block_header-2.xz | Bin 0 -> 68 bytes + tests/files/good-1-block_header-3.lzma | Bin 68 -> 0 bytes + tests/files/good-1-block_header-3.xz | Bin 0 -> 68 bytes + tests/files/good-1-check-crc32.lzma | Bin 68 -> 0 bytes + tests/files/good-1-check-crc32.xz | Bin 0 -> 68 bytes + tests/files/good-1-check-crc64.lzma | Bin 72 -> 0 bytes + tests/files/good-1-check-crc64.xz | Bin 0 -> 72 bytes + tests/files/good-1-check-none.lzma | Bin 64 -> 0 bytes + tests/files/good-1-check-none.xz | Bin 0 -> 64 bytes + tests/files/good-1-check-sha256.lzma | Bin 96 -> 0 bytes + tests/files/good-1-check-sha256.xz | Bin 0 -> 96 bytes + tests/files/good-1-delta-lzma2.tiff.lzma | Bin 51312 -> 0 bytes + tests/files/good-1-delta-lzma2.tiff.xz | Bin 0 -> 51312 bytes + tests/files/good-1-lzma2-1.lzma | Bin 424 -> 0 bytes + tests/files/good-1-lzma2-1.xz | Bin 0 -> 424 bytes + tests/files/good-1-lzma2-2.lzma | Bin 424 -> 0 bytes + tests/files/good-1-lzma2-2.xz | Bin 0 -> 424 bytes + tests/files/good-1-lzma2-3.lzma | Bin 408 -> 0 bytes + tests/files/good-1-lzma2-3.xz | Bin 0 -> 408 bytes + tests/files/good-1-sparc-lzma2.lzma | Bin 2292 -> 0 bytes + tests/files/good-1-sparc-lzma2.xz | Bin 0 -> 2292 bytes + tests/files/good-1-x86-lzma2.lzma | Bin 1936 -> 0 bytes + tests/files/good-1-x86-lzma2.xz | Bin 0 -> 1936 bytes + tests/files/good-2-lzma2.lzma | Bin 92 -> 0 bytes + tests/files/good-2-lzma2.xz | Bin 0 -> 92 bytes + tests/files/unsupported-block_header.lzma | Bin 68 -> 0 bytes + tests/files/unsupported-block_header.xz | Bin 0 -> 68 bytes + tests/files/unsupported-check.lzma | Bin 68 -> 0 bytes + tests/files/unsupported-check.xz | Bin 0 -> 68 bytes + tests/files/unsupported-filter_flags-1.lzma | Bin 68 -> 0 bytes + tests/files/unsupported-filter_flags-1.xz | Bin 0 -> 68 bytes + tests/files/unsupported-filter_flags-2.lzma | Bin 68 -> 0 bytes + tests/files/unsupported-filter_flags-2.xz | Bin 0 -> 68 bytes + tests/files/unsupported-filter_flags-3.lzma | Bin 68 -> 0 bytes + tests/files/unsupported-filter_flags-3.xz | Bin 0 -> 68 bytes + tests/test_files.sh | 6 +- 116 files changed, 66 insertions(+), 68 deletions(-) commit 8e60c889a2816a63013a35c99ce26bf28f5b78eb @@ -7407,8 +8407,8 @@ Date: 2008-09-30 13:57:44 +0300 Fixed Stream decoder to actually use the first_stream variable. - src/liblzma/common/stream_decoder.c | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) + src/liblzma/common/stream_decoder.c | 5 +++++ + 1 file changed, 5 insertions(+) commit 3bdbc12c054d1961133ee19802af7dd3c3494543 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7416,8 +8416,8 @@ Date: 2008-09-30 13:56:57 +0300 Added one more test file. - tests/files/README | 15 +++++++++++---- - tests/files/bad-0cat-header_magic.lzma | Bin 0 -> 64 bytes + tests/files/README | 15 +++++++++++---- + tests/files/bad-0cat-header_magic.lzma | Bin 0 -> 64 bytes 2 files changed, 11 insertions(+), 4 deletions(-) commit a6639022fdc536e5659b070a465221b4cf7c51fa @@ -7426,8 +8426,8 @@ Date: 2008-09-30 13:34:07 +0300 Fixed uninitialized variable in Stream decoder. - src/liblzma/common/stream_decoder.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/common/stream_decoder.c | 1 + + 1 file changed, 1 insertion(+) commit ed3709000a3f17ecefab29b2235d7e2221b00003 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7435,10 +8435,10 @@ Date: 2008-09-30 13:27:28 +0300 Added two test files. - tests/files/README | 6 ++++++ - tests/files/bad-0-footer_magic.lzma | Bin 0 -> 32 bytes - tests/files/bad-0-header_magic.lzma | Bin 0 -> 32 bytes - 3 files changed, 6 insertions(+), 0 deletions(-) + tests/files/README | 6 ++++++ + tests/files/bad-0-footer_magic.lzma | Bin 0 -> 32 bytes + tests/files/bad-0-header_magic.lzma | Bin 0 -> 32 bytes + 3 files changed, 6 insertions(+) commit ea560b0ea80525752bdcd0074d24f8dc170bbe29 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7446,8 +8446,8 @@ Date: 2008-09-27 23:49:24 +0300 Fix conflicting Subblock helper filter's ID. - src/liblzma/common/common.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/common.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit ad97483b6e55142fd8d5c041db057017a891cd95 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7456,62 +8456,62 @@ Date: 2008-09-27 23:37:13 +0300 Changed magic bytes to match the updated spec. Filename suffix wasn't changed yet. - src/liblzma/common/auto_decoder.c | 4 ++-- - src/liblzma/common/stream_flags_common.c | 2 +- - tests/files/bad-0-backward_size.lzma | Bin 32 -> 32 bytes - tests/files/bad-0-empty-truncated.lzma | Bin 31 -> 31 bytes - tests/files/bad-0-nonempty_index.lzma | Bin 32 -> 32 bytes - tests/files/bad-0cat-alone.lzma | Bin 55 -> 55 bytes - tests/files/bad-0catpad-empty.lzma | Bin 69 -> 69 bytes - tests/files/bad-0pad-empty.lzma | Bin 37 -> 37 bytes - tests/files/bad-1-block_header-1.lzma | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-2.lzma | Bin 64 -> 64 bytes - tests/files/bad-1-block_header-3.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-block_header-4.lzma | Bin 72 -> 72 bytes - tests/files/bad-1-check-crc32.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-check-crc64.lzma | Bin 72 -> 72 bytes - tests/files/bad-1-check-sha256.lzma | Bin 96 -> 96 bytes - tests/files/bad-1-lzma2-1.lzma | Bin 64 -> 64 bytes - tests/files/bad-1-lzma2-2.lzma | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-3.lzma | Bin 424 -> 424 bytes - tests/files/bad-1-lzma2-4.lzma | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-5.lzma | Bin 408 -> 408 bytes - tests/files/bad-1-lzma2-6.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-lzma2-7.lzma | Bin 408 -> 408 bytes - tests/files/bad-1-stream_flags-1.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-2.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-stream_flags-3.lzma | Bin 68 -> 68 bytes - tests/files/bad-1-vli-1.lzma | Bin 72 -> 72 bytes - tests/files/bad-1-vli-2.lzma | Bin 72 -> 72 bytes - tests/files/bad-2-compressed_data_padding.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-1.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-2.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-3.lzma | Bin 92 -> 92 bytes - tests/files/bad-2-index-4.lzma | Bin 92 -> 92 bytes - tests/files/good-0-empty.lzma | Bin 32 -> 32 bytes - tests/files/good-0cat-empty.lzma | Bin 64 -> 64 bytes - tests/files/good-0catpad-empty.lzma | Bin 68 -> 68 bytes - tests/files/good-0pad-empty.lzma | Bin 36 -> 36 bytes - tests/files/good-1-3delta-lzma2.lzma | Bin 528 -> 528 bytes - tests/files/good-1-block_header-1.lzma | Bin 72 -> 72 bytes - tests/files/good-1-block_header-2.lzma | Bin 68 -> 68 bytes - tests/files/good-1-block_header-3.lzma | Bin 68 -> 68 bytes - tests/files/good-1-check-crc32.lzma | Bin 68 -> 68 bytes - tests/files/good-1-check-crc64.lzma | Bin 72 -> 72 bytes - tests/files/good-1-check-none.lzma | Bin 64 -> 64 bytes - tests/files/good-1-check-sha256.lzma | Bin 96 -> 96 bytes - tests/files/good-1-delta-lzma2.tiff.lzma | Bin 51312 -> 51312 bytes - tests/files/good-1-lzma2-1.lzma | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-2.lzma | Bin 424 -> 424 bytes - tests/files/good-1-lzma2-3.lzma | Bin 408 -> 408 bytes - tests/files/good-1-sparc-lzma2.lzma | Bin 2292 -> 2292 bytes - tests/files/good-1-x86-lzma2.lzma | Bin 1936 -> 1936 bytes - tests/files/good-2-lzma2.lzma | Bin 92 -> 92 bytes - tests/files/unsupported-block_header.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-check.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-1.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-2.lzma | Bin 68 -> 68 bytes - tests/files/unsupported-filter_flags-3.lzma | Bin 68 -> 68 bytes + src/liblzma/common/auto_decoder.c | 4 ++-- + src/liblzma/common/stream_flags_common.c | 2 +- + tests/files/bad-0-backward_size.lzma | Bin 32 -> 32 bytes + tests/files/bad-0-empty-truncated.lzma | Bin 31 -> 31 bytes + tests/files/bad-0-nonempty_index.lzma | Bin 32 -> 32 bytes + tests/files/bad-0cat-alone.lzma | Bin 55 -> 55 bytes + tests/files/bad-0catpad-empty.lzma | Bin 69 -> 69 bytes + tests/files/bad-0pad-empty.lzma | Bin 37 -> 37 bytes + tests/files/bad-1-block_header-1.lzma | Bin 64 -> 64 bytes + tests/files/bad-1-block_header-2.lzma | Bin 64 -> 64 bytes + tests/files/bad-1-block_header-3.lzma | Bin 68 -> 68 bytes + tests/files/bad-1-block_header-4.lzma | Bin 72 -> 72 bytes + tests/files/bad-1-check-crc32.lzma | Bin 68 -> 68 bytes + tests/files/bad-1-check-crc64.lzma | Bin 72 -> 72 bytes + tests/files/bad-1-check-sha256.lzma | Bin 96 -> 96 bytes + tests/files/bad-1-lzma2-1.lzma | Bin 64 -> 64 bytes + tests/files/bad-1-lzma2-2.lzma | Bin 424 -> 424 bytes + tests/files/bad-1-lzma2-3.lzma | Bin 424 -> 424 bytes + tests/files/bad-1-lzma2-4.lzma | Bin 408 -> 408 bytes + tests/files/bad-1-lzma2-5.lzma | Bin 408 -> 408 bytes + tests/files/bad-1-lzma2-6.lzma | Bin 68 -> 68 bytes + tests/files/bad-1-lzma2-7.lzma | Bin 408 -> 408 bytes + tests/files/bad-1-stream_flags-1.lzma | Bin 68 -> 68 bytes + tests/files/bad-1-stream_flags-2.lzma | Bin 68 -> 68 bytes + tests/files/bad-1-stream_flags-3.lzma | Bin 68 -> 68 bytes + tests/files/bad-1-vli-1.lzma | Bin 72 -> 72 bytes + tests/files/bad-1-vli-2.lzma | Bin 72 -> 72 bytes + tests/files/bad-2-compressed_data_padding.lzma | Bin 92 -> 92 bytes + tests/files/bad-2-index-1.lzma | Bin 92 -> 92 bytes + tests/files/bad-2-index-2.lzma | Bin 92 -> 92 bytes + tests/files/bad-2-index-3.lzma | Bin 92 -> 92 bytes + tests/files/bad-2-index-4.lzma | Bin 92 -> 92 bytes + tests/files/good-0-empty.lzma | Bin 32 -> 32 bytes + tests/files/good-0cat-empty.lzma | Bin 64 -> 64 bytes + tests/files/good-0catpad-empty.lzma | Bin 68 -> 68 bytes + tests/files/good-0pad-empty.lzma | Bin 36 -> 36 bytes + tests/files/good-1-3delta-lzma2.lzma | Bin 528 -> 528 bytes + tests/files/good-1-block_header-1.lzma | Bin 72 -> 72 bytes + tests/files/good-1-block_header-2.lzma | Bin 68 -> 68 bytes + tests/files/good-1-block_header-3.lzma | Bin 68 -> 68 bytes + tests/files/good-1-check-crc32.lzma | Bin 68 -> 68 bytes + tests/files/good-1-check-crc64.lzma | Bin 72 -> 72 bytes + tests/files/good-1-check-none.lzma | Bin 64 -> 64 bytes + tests/files/good-1-check-sha256.lzma | Bin 96 -> 96 bytes + tests/files/good-1-delta-lzma2.tiff.lzma | Bin 51312 -> 51312 bytes + tests/files/good-1-lzma2-1.lzma | Bin 424 -> 424 bytes + tests/files/good-1-lzma2-2.lzma | Bin 424 -> 424 bytes + tests/files/good-1-lzma2-3.lzma | Bin 408 -> 408 bytes + tests/files/good-1-sparc-lzma2.lzma | Bin 2292 -> 2292 bytes + tests/files/good-1-x86-lzma2.lzma | Bin 1936 -> 1936 bytes + tests/files/good-2-lzma2.lzma | Bin 92 -> 92 bytes + tests/files/unsupported-block_header.lzma | Bin 68 -> 68 bytes + tests/files/unsupported-check.lzma | Bin 68 -> 68 bytes + tests/files/unsupported-filter_flags-1.lzma | Bin 68 -> 68 bytes + tests/files/unsupported-filter_flags-2.lzma | Bin 68 -> 68 bytes + tests/files/unsupported-filter_flags-3.lzma | Bin 68 -> 68 bytes 56 files changed, 3 insertions(+), 3 deletions(-) commit 7a57069167e9e63394e2b095ee3a63253fcb51c7 @@ -7520,8 +8520,8 @@ Date: 2008-09-27 23:16:09 +0300 Remove po/fi.po since I'm not keeping it updated for now. - po/fi.po | 446 -------------------------------------------------------------- - 1 files changed, 0 insertions(+), 446 deletions(-) + po/fi.po | 446 --------------------------------------------------------------- + 1 file changed, 446 deletions(-) commit 018ae09df8f2fee5a7374f307df4cb42fad0b81e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7529,8 +8529,8 @@ Date: 2008-09-27 23:13:54 +0300 Fix also test_compress.sh. - tests/test_compress.sh | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + tests/test_compress.sh | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 3a62a5fb85d2eebd8666e64ed5d364d095062858 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7539,8 +8539,8 @@ Date: 2008-09-27 23:01:15 +0300 Fixed compilation of test_filter_flags.c, which was broken by 1dcecfb09b55157b8653d747963069c8bed74f04. - tests/test_filter_flags.c | 16 ++++++++-------- - 1 files changed, 8 insertions(+), 8 deletions(-) + tests/test_filter_flags.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) commit c6ca26eef7cd07eba449035514e2b8f9ac3111c0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7550,8 +8550,8 @@ Date: 2008-09-27 19:11:02 +0300 of the new format to .xz and removes the recently added LZMA filter. - doc/file-format.txt | 125 +++++++++++++-------------------------------------- - 1 files changed, 32 insertions(+), 93 deletions(-) + doc/file-format.txt | 125 ++++++++++++++-------------------------------------- + 1 file changed, 32 insertions(+), 93 deletions(-) commit 1dcecfb09b55157b8653d747963069c8bed74f04 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7559,47 +8559,47 @@ Date: 2008-09-27 19:09:21 +0300 Some API changes, bug fixes, cleanups etc. - configure.ac | 18 +- - debug/full_flush.c | 7 +- - debug/known_sizes.c | 6 +- - debug/memusage.c | 22 ++-- - debug/sync_flush.c | 18 +- - src/liblzma/Makefile.am | 2 +- - src/liblzma/api/lzma/delta.h | 8 +- - src/liblzma/api/lzma/lzma.h | 230 +++++++++++++++--------- - src/liblzma/common/alignment.c | 7 +- - src/liblzma/common/alone_decoder.c | 11 +- - src/liblzma/common/alone_encoder.c | 9 +- - src/liblzma/common/chunk_size.c | 2 +- - src/liblzma/common/easy.c | 20 ++- - src/liblzma/common/filter_common.c | 4 +- - src/liblzma/common/filter_decoder.c | 4 +- - src/liblzma/common/filter_encoder.c | 4 +- - src/liblzma/common/init_encoder.c | 2 +- - src/liblzma/delta/delta_common.c | 12 +- - src/liblzma/delta/delta_common.h | 2 +- - src/liblzma/delta/delta_decoder.c | 2 +- - src/liblzma/delta/delta_encoder.c | 6 +- - src/liblzma/lz/lz_encoder.c | 30 ++-- - src/liblzma/lz/lz_encoder.h | 26 ++-- - src/liblzma/lz/lz_encoder_mf.c | 30 ++-- - src/liblzma/lzma/Makefile.am | 4 +- - src/liblzma/lzma/lzma2_decoder.c | 10 +- - src/liblzma/lzma/lzma2_encoder.c | 27 +-- - src/liblzma/lzma/lzma_common.h | 26 +-- - src/liblzma/lzma/lzma_decoder.c | 37 ++-- - src/liblzma/lzma/lzma_encoder.c | 51 +++--- - src/liblzma/lzma/lzma_encoder_optimum_fast.c | 10 +- - src/liblzma/lzma/lzma_encoder_optimum_normal.c | 20 +- - src/liblzma/lzma/lzma_encoder_presets.c | 50 ++++-- - src/liblzma/rangecoder/Makefile.am | 4 +- - src/liblzma/subblock/subblock_decoder.c | 2 +- - src/lzma/args.c | 33 +++-- - src/lzma/help.c | 17 +- - src/lzma/options.c | 92 ++++++---- - tests/test_block_header.c | 9 +- - tests/test_compress.sh | 4 +- - tests/test_filter_flags.c | 2 +- + configure.ac | 18 +- + debug/full_flush.c | 7 +- + debug/known_sizes.c | 6 +- + debug/memusage.c | 22 +-- + debug/sync_flush.c | 18 +- + src/liblzma/Makefile.am | 2 +- + src/liblzma/api/lzma/delta.h | 8 +- + src/liblzma/api/lzma/lzma.h | 230 ++++++++++++++++--------- + src/liblzma/common/alignment.c | 7 +- + src/liblzma/common/alone_decoder.c | 11 +- + src/liblzma/common/alone_encoder.c | 9 +- + src/liblzma/common/chunk_size.c | 2 +- + src/liblzma/common/easy.c | 20 ++- + src/liblzma/common/filter_common.c | 4 +- + src/liblzma/common/filter_decoder.c | 4 +- + src/liblzma/common/filter_encoder.c | 4 +- + src/liblzma/common/init_encoder.c | 2 +- + src/liblzma/delta/delta_common.c | 12 +- + src/liblzma/delta/delta_common.h | 2 +- + src/liblzma/delta/delta_decoder.c | 2 +- + src/liblzma/delta/delta_encoder.c | 6 +- + src/liblzma/lz/lz_encoder.c | 30 ++-- + src/liblzma/lz/lz_encoder.h | 26 +-- + src/liblzma/lz/lz_encoder_mf.c | 30 ++-- + src/liblzma/lzma/Makefile.am | 4 +- + src/liblzma/lzma/lzma2_decoder.c | 10 +- + src/liblzma/lzma/lzma2_encoder.c | 27 ++- + src/liblzma/lzma/lzma_common.h | 26 ++- + src/liblzma/lzma/lzma_decoder.c | 37 ++-- + src/liblzma/lzma/lzma_encoder.c | 51 +++--- + src/liblzma/lzma/lzma_encoder_optimum_fast.c | 10 +- + src/liblzma/lzma/lzma_encoder_optimum_normal.c | 20 +-- + src/liblzma/lzma/lzma_encoder_presets.c | 50 ++++-- + src/liblzma/rangecoder/Makefile.am | 4 +- + src/liblzma/subblock/subblock_decoder.c | 2 +- + src/lzma/args.c | 33 ++-- + src/lzma/help.c | 17 +- + src/lzma/options.c | 92 +++++----- + tests/test_block_header.c | 9 +- + tests/test_compress.sh | 4 +- + tests/test_filter_flags.c | 2 +- 41 files changed, 482 insertions(+), 398 deletions(-) commit 5cc5064cae603b649c64c40125c7dd365de54c9d @@ -7608,8 +8608,8 @@ Date: 2008-09-27 11:28:49 +0300 Added 7z2lzma.bash. - extra/7z2lzma/7z2lzma.bash | 114 ++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 114 insertions(+), 0 deletions(-) + extra/7z2lzma/7z2lzma.bash | 114 +++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 114 insertions(+) commit f147666a5cd15542d4e427da58629f4a71cc38e1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7617,11 +8617,11 @@ Date: 2008-09-17 22:11:39 +0300 Miscellaneous LZ and LZMA encoder cleanups - src/liblzma/api/lzma/lzma.h | 14 ------ - src/liblzma/lz/lz_encoder.c | 8 +++- - src/liblzma/lzma/Makefile.am | 1 - - src/liblzma/lzma/lzma_encoder.c | 64 +++++++++++------------------- - src/liblzma/lzma/lzma_encoder_features.c | 59 --------------------------- + src/liblzma/api/lzma/lzma.h | 14 ------- + src/liblzma/lz/lz_encoder.c | 8 +++- + src/liblzma/lzma/Makefile.am | 1 - + src/liblzma/lzma/lzma_encoder.c | 64 ++++++++++++-------------------- + src/liblzma/lzma/lzma_encoder_features.c | 59 ----------------------------- 5 files changed, 29 insertions(+), 117 deletions(-) commit 13d68b069849e19c33822cd8996cd6447890abb1 @@ -7630,8 +8630,8 @@ Date: 2008-09-13 13:54:00 +0300 LZ decoder cleanup - src/liblzma/lz/lz_decoder.c | 5 ++--- - 1 files changed, 2 insertions(+), 3 deletions(-) + src/liblzma/lz/lz_decoder.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) commit 13a74b78e37f16c9096ba5fe1859cc04eaa2f9f7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7642,64 +8642,64 @@ Date: 2008-09-13 12:10:43 +0300 - LZMA_VLI_VALUE_UNKNOWN -> LZMA_VLI_UNKNOWN - LZMA_HEADER_ERRRO -> LZMA_OPTIONS_ERROR - debug/full_flush.c | 2 +- - debug/known_sizes.c | 2 +- - debug/sync_flush.c | 2 +- - src/liblzma/api/lzma/alignment.h | 2 +- - src/liblzma/api/lzma/base.h | 4 +- - src/liblzma/api/lzma/block.h | 28 +++++++++++++------------- - src/liblzma/api/lzma/container.h | 12 +++++----- - src/liblzma/api/lzma/filter.h | 28 +++++++++++++------------- - src/liblzma/api/lzma/index.h | 2 +- - src/liblzma/api/lzma/lzma.h | 4 +- - src/liblzma/api/lzma/simple.h | 2 +- - src/liblzma/api/lzma/stream_flags.h | 20 +++++++++--------- - src/liblzma/api/lzma/vli.h | 16 +++++++------- - src/liblzma/common/alignment.c | 6 ++-- - src/liblzma/common/alone_decoder.c | 2 +- - src/liblzma/common/auto_decoder.c | 2 +- - src/liblzma/common/block_decoder.c | 12 +++++----- - src/liblzma/common/block_encoder.c | 6 ++-- - src/liblzma/common/block_header_decoder.c | 16 +++++++------- - src/liblzma/common/block_header_encoder.c | 24 +++++++++++----------- - src/liblzma/common/block_util.c | 8 +++--- - src/liblzma/common/chunk_size.c | 2 +- - src/liblzma/common/easy.c | 4 +- - src/liblzma/common/filter_common.c | 22 ++++++++++---------- - src/liblzma/common/filter_decoder.c | 6 ++-- - src/liblzma/common/filter_encoder.c | 14 ++++++------ - src/liblzma/common/index.c | 24 ++++++++++------------ - src/liblzma/common/index.h | 2 +- - src/liblzma/common/index_hash.c | 13 +++++------ - src/liblzma/common/stream_decoder.c | 4 +- - src/liblzma/common/stream_encoder.c | 4 +- - src/liblzma/common/stream_flags_common.c | 6 ++-- - src/liblzma/common/stream_flags_decoder.c | 6 ++-- - src/liblzma/common/stream_flags_encoder.c | 4 +- - src/liblzma/common/vli_encoder.c | 2 +- - src/liblzma/common/vli_size.c | 2 +- - src/liblzma/delta/delta_common.c | 2 +- - src/liblzma/delta/delta_decoder.c | 2 +- - src/liblzma/delta/delta_encoder.c | 2 +- - src/liblzma/lz/lz_decoder.c | 2 +- - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lzma/lzma2_decoder.c | 6 ++-- - src/liblzma/lzma/lzma_decoder.c | 14 ++++++------ - src/liblzma/lzma/lzma_encoder.c | 8 +++--- - src/liblzma/simple/simple_coder.c | 2 +- - src/liblzma/simple/simple_decoder.c | 2 +- - src/liblzma/subblock/subblock_decoder.c | 6 ++-- - src/liblzma/subblock/subblock_encoder.c | 17 +++++++-------- - src/lzma/args.c | 2 +- - src/lzma/error.c | 2 +- - src/lzma/list.c | 6 ++-- - src/lzmadec/lzmadec.c | 2 +- - tests/test_block.c | 8 +++--- - tests/test_block_header.c | 30 ++++++++++++++-------------- - tests/test_filter_flags.c | 2 +- - tests/test_index.c | 2 +- - tests/test_stream_flags.c | 8 +++--- - tests/tests.h | 2 +- + debug/full_flush.c | 2 +- + debug/known_sizes.c | 2 +- + debug/sync_flush.c | 2 +- + src/liblzma/api/lzma/alignment.h | 2 +- + src/liblzma/api/lzma/base.h | 4 ++-- + src/liblzma/api/lzma/block.h | 28 ++++++++++++++-------------- + src/liblzma/api/lzma/container.h | 12 ++++++------ + src/liblzma/api/lzma/filter.h | 28 ++++++++++++++-------------- + src/liblzma/api/lzma/index.h | 2 +- + src/liblzma/api/lzma/lzma.h | 4 ++-- + src/liblzma/api/lzma/simple.h | 2 +- + src/liblzma/api/lzma/stream_flags.h | 20 ++++++++++---------- + src/liblzma/api/lzma/vli.h | 16 ++++++++-------- + src/liblzma/common/alignment.c | 6 +++--- + src/liblzma/common/alone_decoder.c | 2 +- + src/liblzma/common/auto_decoder.c | 2 +- + src/liblzma/common/block_decoder.c | 12 ++++++------ + src/liblzma/common/block_encoder.c | 6 +++--- + src/liblzma/common/block_header_decoder.c | 16 ++++++++-------- + src/liblzma/common/block_header_encoder.c | 24 ++++++++++++------------ + src/liblzma/common/block_util.c | 8 ++++---- + src/liblzma/common/chunk_size.c | 2 +- + src/liblzma/common/easy.c | 4 ++-- + src/liblzma/common/filter_common.c | 22 +++++++++++----------- + src/liblzma/common/filter_decoder.c | 6 +++--- + src/liblzma/common/filter_encoder.c | 14 +++++++------- + src/liblzma/common/index.c | 24 +++++++++++------------- + src/liblzma/common/index.h | 2 +- + src/liblzma/common/index_hash.c | 13 ++++++------- + src/liblzma/common/stream_decoder.c | 4 ++-- + src/liblzma/common/stream_encoder.c | 4 ++-- + src/liblzma/common/stream_flags_common.c | 6 +++--- + src/liblzma/common/stream_flags_decoder.c | 6 +++--- + src/liblzma/common/stream_flags_encoder.c | 4 ++-- + src/liblzma/common/vli_encoder.c | 2 +- + src/liblzma/common/vli_size.c | 2 +- + src/liblzma/delta/delta_common.c | 2 +- + src/liblzma/delta/delta_decoder.c | 2 +- + src/liblzma/delta/delta_encoder.c | 2 +- + src/liblzma/lz/lz_decoder.c | 2 +- + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lzma/lzma2_decoder.c | 6 +++--- + src/liblzma/lzma/lzma_decoder.c | 14 +++++++------- + src/liblzma/lzma/lzma_encoder.c | 8 ++++---- + src/liblzma/simple/simple_coder.c | 2 +- + src/liblzma/simple/simple_decoder.c | 2 +- + src/liblzma/subblock/subblock_decoder.c | 6 +++--- + src/liblzma/subblock/subblock_encoder.c | 17 ++++++++--------- + src/lzma/args.c | 2 +- + src/lzma/error.c | 2 +- + src/lzma/list.c | 6 +++--- + src/lzmadec/lzmadec.c | 2 +- + tests/test_block.c | 8 ++++---- + tests/test_block_header.c | 30 +++++++++++++++--------------- + tests/test_filter_flags.c | 2 +- + tests/test_index.c | 2 +- + tests/test_stream_flags.c | 8 ++++---- + tests/tests.h | 2 +- 58 files changed, 220 insertions(+), 224 deletions(-) commit 320601b2c7b08fc7da9da18d5bf7c3c1a189b080 @@ -7708,14 +8708,14 @@ Date: 2008-09-12 22:41:40 +0300 Improved the Stream Flags handling API. - src/liblzma/api/lzma/stream_flags.h | 84 +++++++++++++++++++++++++++-- - src/liblzma/common/stream_decoder.c | 5 +- - src/liblzma/common/stream_encoder.c | 2 + - src/liblzma/common/stream_flags_common.c | 28 +++++++--- - src/liblzma/common/stream_flags_common.h | 9 +++ - src/liblzma/common/stream_flags_decoder.c | 3 +- - src/liblzma/common/stream_flags_encoder.c | 10 +++- - tests/test_stream_flags.c | 8 ++- + src/liblzma/api/lzma/stream_flags.h | 84 +++++++++++++++++++++++++++++-- + src/liblzma/common/stream_decoder.c | 5 +- + src/liblzma/common/stream_encoder.c | 2 + + src/liblzma/common/stream_flags_common.c | 28 ++++++++--- + src/liblzma/common/stream_flags_common.h | 9 ++++ + src/liblzma/common/stream_flags_decoder.c | 3 +- + src/liblzma/common/stream_flags_encoder.c | 10 ++-- + tests/test_stream_flags.c | 8 ++- 8 files changed, 129 insertions(+), 20 deletions(-) commit ec490da5228263b25bf786bb23d1008468f55b30 @@ -7725,8 +8725,8 @@ Date: 2008-09-11 23:10:44 +0300 Simplified debug/known_sizes.c to match the relaxed requirements of Block encoder. - debug/known_sizes.c | 14 +++++--------- - 1 files changed, 5 insertions(+), 9 deletions(-) + debug/known_sizes.c | 14 +++++--------- + 1 file changed, 5 insertions(+), 9 deletions(-) commit 16e8b98f2659347edfa74afdbbb9e73311153cb9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7735,8 +8735,8 @@ Date: 2008-09-11 23:09:24 +0300 Remove a check from Block encoder that should have already been removed in 2ba01bfa755e47ff6af84a978e3c8d63d7d2775e. - src/liblzma/common/block_encoder.c | 5 ----- - 1 files changed, 0 insertions(+), 5 deletions(-) + src/liblzma/common/block_encoder.c | 5 ----- + 1 file changed, 5 deletions(-) commit 5a710c3805bdf6d7e3c92e954e4e4565b27bcb13 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7744,11 +8744,11 @@ Date: 2008-09-11 20:02:38 +0300 Remove bogus #includes. - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/stream_decoder.c | 3 -- - src/liblzma/common/stream_encoder.c | 1 - - src/liblzma/common/stream_flags_decoder.h | 31 ----------------------------- - 4 files changed, 0 insertions(+), 36 deletions(-) + src/liblzma/common/Makefile.am | 1 - + src/liblzma/common/stream_decoder.c | 3 --- + src/liblzma/common/stream_encoder.c | 1 - + src/liblzma/common/stream_flags_decoder.h | 31 ------------------------------- + 4 files changed, 36 deletions(-) commit 01892b2ca5f69bed0ea746e04b604030d57806bb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7756,8 +8756,8 @@ Date: 2008-09-11 10:49:14 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 962f2231d49409fe6852e44ffe8c5dbabb04bc7d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7766,8 +8766,8 @@ Date: 2008-09-11 10:48:12 +0300 Fix a compiler error on big endian systems that don't support unaligned memory access. - src/common/integer.h | 32 ++++++++++++++++++-------------- - 1 files changed, 18 insertions(+), 14 deletions(-) + src/common/integer.h | 32 ++++++++++++++++++-------------- + 1 file changed, 18 insertions(+), 14 deletions(-) commit fa3ab0df8ae7a8a1ad55b52266dc0fd387458671 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7775,8 +8775,8 @@ Date: 2008-09-11 10:46:14 +0300 Silence a compiler warning. - src/lzma/process.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzma/process.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9373e81e18822db4972819442ea4c2cb9955470b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7784,8 +8784,8 @@ Date: 2008-09-10 19:16:32 +0300 Bumped version to 4.999.6alpha. - configure.ac | 2 +- - src/liblzma/api/lzma/version.h | 2 +- + configure.ac | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit cb072b7c8442ba68bb0c62c0abbbe939794887a3 @@ -7797,8 +8797,8 @@ Date: 2008-09-10 17:02:00 +0300 is in the reserved range. This allows Block Header encoder to detect unallowed Filter IDs, which is good for Stream encoder. - src/liblzma/common/filter_flags_encoder.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + src/liblzma/common/filter_flags_encoder.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit 123ab0acec435c9e9866a99e30482116cfbd9ba5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7806,12 +8806,12 @@ Date: 2008-09-10 16:44:32 +0300 Filter handling cleanups - src/liblzma/api/lzma/filter.h | 133 +++++++++++++++++++++++++++-------- - src/liblzma/common/filter_common.h | 3 + - src/liblzma/common/filter_decoder.c | 80 +++++++-------------- - src/liblzma/common/filter_decoder.h | 5 -- - src/liblzma/common/filter_encoder.c | 82 +++++++--------------- - src/liblzma/common/filter_encoder.h | 4 - + src/liblzma/api/lzma/filter.h | 133 +++++++++++++++++++++++++++--------- + src/liblzma/common/filter_common.h | 3 + + src/liblzma/common/filter_decoder.c | 80 +++++++--------------- + src/liblzma/common/filter_decoder.h | 5 -- + src/liblzma/common/filter_encoder.c | 82 +++++++--------------- + src/liblzma/common/filter_encoder.h | 4 -- 6 files changed, 156 insertions(+), 151 deletions(-) commit 9cfcd0c4f2f865d8fbbb46ea28344a9be0dd8ad1 @@ -7820,8 +8820,8 @@ Date: 2008-09-10 00:33:00 +0300 Comments - src/liblzma/common/stream_encoder.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + src/liblzma/common/stream_encoder.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) commit 2ba01bfa755e47ff6af84a978e3c8d63d7d2775e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7832,11 +8832,11 @@ Date: 2008-09-10 00:27:02 +0300 encoder doesn't need compressed_size and uncompressed_size from lzma_block structure to be initialized. - src/liblzma/api/lzma/block.h | 3 - - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/block_decoder.c | 23 +++++++++- - src/liblzma/common/block_encoder.c | 92 +++++++++++++++++------------------- - src/liblzma/common/block_private.h | 47 ------------------ + src/liblzma/api/lzma/block.h | 3 -- + src/liblzma/common/Makefile.am | 1 - + src/liblzma/common/block_decoder.c | 23 +++++++++- + src/liblzma/common/block_encoder.c | 92 ++++++++++++++++++-------------------- + src/liblzma/common/block_private.h | 47 ------------------- 5 files changed, 66 insertions(+), 100 deletions(-) commit 07efcb5a6bc5d7018798ebd728586f84183e7d64 @@ -7845,8 +8845,8 @@ Date: 2008-09-07 10:23:13 +0300 Changed Filter ID of LZMA to 0x20. - doc/file-format.txt | 4 ++-- - src/liblzma/api/lzma/lzma.h | 2 +- + doc/file-format.txt | 4 ++-- + src/liblzma/api/lzma/lzma.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit 32fe5fa541e82c08e054086279079ae5016bd8d8 @@ -7855,11 +8855,11 @@ Date: 2008-09-06 23:42:50 +0300 Comments - src/liblzma/api/lzma/base.h | 81 +++++++++++++++++++++++++------------- - src/liblzma/api/lzma/container.h | 6 ++- - src/liblzma/lz/lz_encoder.c | 3 +- - src/liblzma/lz/lz_encoder.h | 12 +++--- - src/liblzma/lz/lz_encoder_mf.c | 2 +- + src/liblzma/api/lzma/base.h | 81 ++++++++++++++++++++++++++-------------- + src/liblzma/api/lzma/container.h | 6 ++- + src/liblzma/lz/lz_encoder.c | 3 +- + src/liblzma/lz/lz_encoder.h | 12 +++--- + src/liblzma/lz/lz_encoder_mf.c | 2 +- 5 files changed, 65 insertions(+), 39 deletions(-) commit 0a31ed9d5e3cde4feb094b66f3a8b2c074605d84 @@ -7868,17 +8868,17 @@ Date: 2008-09-06 15:14:30 +0300 Some API cleanups - src/liblzma/api/lzma/base.h | 314 ++++++++++++++++++++++------------- - src/liblzma/api/lzma/check.h | 10 + - src/liblzma/api/lzma/container.h | 40 +++-- - src/liblzma/common/auto_decoder.c | 18 +- - src/liblzma/common/common.c | 7 + - src/liblzma/common/common.h | 18 +- - src/liblzma/common/easy.c | 2 +- - src/liblzma/common/stream_decoder.c | 31 ++-- - src/lzma/process.c | 2 +- - src/lzmadec/lzmadec.c | 6 +- - tests/tests.h | 72 ++------ + src/liblzma/api/lzma/base.h | 314 +++++++++++++++++++++++------------- + src/liblzma/api/lzma/check.h | 10 ++ + src/liblzma/api/lzma/container.h | 40 +++-- + src/liblzma/common/auto_decoder.c | 18 +-- + src/liblzma/common/common.c | 7 + + src/liblzma/common/common.h | 18 ++- + src/liblzma/common/easy.c | 2 +- + src/liblzma/common/stream_decoder.c | 31 ++-- + src/lzma/process.c | 2 +- + src/lzmadec/lzmadec.c | 6 +- + tests/tests.h | 72 +++------ 11 files changed, 301 insertions(+), 219 deletions(-) commit da98df54400998be2a6c3876f9655a3c51b93c10 @@ -7890,10 +8890,10 @@ Date: 2008-09-04 11:53:06 +0300 --lzma1 to prevent people from accidentally using LZMA when they want LZMA2. - src/lzma/args.c | 17 +++++++++-------- - src/lzma/args.h | 1 + - src/lzma/help.c | 24 ++++++------------------ - src/lzma/process.c | 42 ++++++++++++++++++++++++++++++++++-------- + src/lzma/args.c | 17 +++++++++-------- + src/lzma/args.h | 1 + + src/lzma/help.c | 24 ++++++------------------ + src/lzma/process.c | 42 ++++++++++++++++++++++++++++++++++-------- 4 files changed, 50 insertions(+), 34 deletions(-) commit 2496aee8a7741a8a0d42987db41ff2cf1a4bdabd @@ -7905,9 +8905,9 @@ Date: 2008-09-04 10:39:15 +0300 decoders, which will usually ignore it (auto decoder and Stream decoder being exceptions). - src/liblzma/common/alone_decoder.c | 1 - - src/liblzma/common/block_decoder.c | 2 +- - src/liblzma/common/filter_decoder.c | 2 +- + src/liblzma/common/alone_decoder.c | 1 - + src/liblzma/common/block_decoder.c | 2 +- + src/liblzma/common/filter_decoder.c | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) commit bea301c26d5d52675e11e0236faec0492af98f60 @@ -7916,8 +8916,8 @@ Date: 2008-09-03 17:06:25 +0300 Minor updates to the file format specification. - doc/file-format.txt | 105 +++++++++++++++++++++++++++++++++++++++++---------- - 1 files changed, 85 insertions(+), 20 deletions(-) + doc/file-format.txt | 105 ++++++++++++++++++++++++++++++++++++++++++---------- + 1 file changed, 85 insertions(+), 20 deletions(-) commit 9c75b089b4a9e0edcf4cf7970a4383768707d6c8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7925,8 +8925,8 @@ Date: 2008-09-02 19:33:32 +0300 Command line tool fixes - src/lzma/process.c | 21 +++++++++++++-------- - 1 files changed, 13 insertions(+), 8 deletions(-) + src/lzma/process.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) commit bab0590504b5aeff460ab4ca8c964dd7c1bad9e4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7934,8 +8934,8 @@ Date: 2008-09-02 19:31:42 +0300 Auto decoder cleanup - src/liblzma/common/auto_decoder.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/auto_decoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 689602336d126a46b60d791a67decab65e1e81f5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7946,8 +8946,8 @@ Date: 2008-09-02 19:12:12 +0300 intentionally not supported, so it is better to put this in auto decoder than LZMA_Alone decoder. - src/liblzma/common/auto_decoder.c | 87 ++++++++++++++++++++++++++++++------- - 1 files changed, 71 insertions(+), 16 deletions(-) + src/liblzma/common/auto_decoder.c | 87 ++++++++++++++++++++++++++++++++------- + 1 file changed, 71 insertions(+), 16 deletions(-) commit 80c4158f19904026433eb6f5d5ca98a0ecd4f66c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7955,8 +8955,8 @@ Date: 2008-09-02 14:56:52 +0300 Stream decoder cleanups - src/liblzma/common/stream_decoder.c | 57 +++++++++++++++++++--------------- - 1 files changed, 32 insertions(+), 25 deletions(-) + src/liblzma/common/stream_decoder.c | 57 +++++++++++++++++++++---------------- + 1 file changed, 32 insertions(+), 25 deletions(-) commit fc681657450ce57be1fe08f7a15d31dcc705e514 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -7964,9 +8964,9 @@ Date: 2008-09-02 11:45:39 +0300 Some fixes to LZ encoder. - src/liblzma/lz/lz_encoder.c | 56 +++++++++++++++++++---- - src/liblzma/lz/lz_encoder.h | 18 ++++--- - src/liblzma/lz/lz_encoder_mf.c | 95 ++++++++++++++++------------------------ + src/liblzma/lz/lz_encoder.c | 56 ++++++++++++++++++++----- + src/liblzma/lz/lz_encoder.h | 18 ++++---- + src/liblzma/lz/lz_encoder_mf.c | 95 +++++++++++++++++------------------------- 3 files changed, 94 insertions(+), 75 deletions(-) commit ede675f9ac1ca82a7d7c290324adba672118bc8d @@ -7975,8 +8975,8 @@ Date: 2008-08-31 11:47:01 +0300 Fix wrong pointer calculation in LZMA encoder. - src/liblzma/lzma/lzma_encoder.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + src/liblzma/lzma/lzma_encoder.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit 3b34851de1eaf358cf9268922fa0eeed8278d680 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8021,8 +9021,8 @@ Date: 2008-08-28 22:53:15 +0300 src/liblzma/api/lzma/stream_flags.h | 17 +- src/liblzma/api/lzma/subblock.h | 4 +- src/liblzma/api/lzma/version.h | 10 +- - src/liblzma/api/lzma/vli.h | 131 +-- - src/liblzma/check/check.c | 128 +-- + src/liblzma/api/lzma/vli.h | 131 +- + src/liblzma/check/check.c | 128 +- src/liblzma/check/check.h | 67 +- src/liblzma/check/sha256.c | 29 +- src/liblzma/common/Makefile.am | 51 +- @@ -8056,8 +9056,8 @@ Date: 2008-08-28 22:53:15 +0300 src/liblzma/common/filter_decoder.h | 35 + src/liblzma/common/filter_encoder.c | 308 +++++ src/liblzma/common/filter_encoder.h | 38 + - src/liblzma/common/filter_flags_decoder.c | 185 +--- - src/liblzma/common/filter_flags_encoder.c | 261 +---- + src/liblzma/common/filter_flags_decoder.c | 185 +-- + src/liblzma/common/filter_flags_encoder.c | 261 +--- src/liblzma/common/index_decoder.c | 14 +- src/liblzma/common/index_encoder.c | 16 +- src/liblzma/common/index_hash.c | 8 +- @@ -8103,15 +9103,15 @@ Date: 2008-08-28 22:53:15 +0300 src/liblzma/lz/hc3.h | 31 - src/liblzma/lz/hc4.c | 31 - src/liblzma/lz/hc4.h | 31 - - src/liblzma/lz/lz_decoder.c | 547 +++------ - src/liblzma/lz/lz_decoder.h | 308 +++--- + src/liblzma/lz/lz_decoder.c | 547 +++----- + src/liblzma/lz/lz_decoder.h | 308 ++--- src/liblzma/lz/lz_encoder.c | 780 ++++++------ - src/liblzma/lz/lz_encoder.h | 334 ++++-- + src/liblzma/lz/lz_encoder.h | 334 +++-- src/liblzma/lz/lz_encoder_hash.h | 104 ++ src/liblzma/lz/lz_encoder_mf.c | 780 ++++++++++++ src/liblzma/lz/lz_encoder_private.h | 40 - src/liblzma/lz/match_c.h | 412 ------ - src/liblzma/lz/match_h.h | 69 - + src/liblzma/lz/match_h.h | 69 -- src/liblzma/lzma/Makefile.am | 37 +- src/liblzma/lzma/fastpos.h | 8 +- src/liblzma/lzma/lzma2_decoder.c | 318 +++++ @@ -8141,7 +9141,7 @@ Date: 2008-08-28 22:53:15 +0300 src/liblzma/rangecoder/price_tablegen.c | 56 + src/liblzma/rangecoder/range_common.h | 17 +- src/liblzma/rangecoder/range_decoder.h | 209 ++-- - src/liblzma/rangecoder/range_encoder.h | 92 +-- + src/liblzma/rangecoder/range_encoder.h | 92 +- src/liblzma/simple/Makefile.am | 12 + src/liblzma/simple/simple_coder.c | 8 +- src/liblzma/simple/simple_decoder.c | 47 + @@ -8290,8 +9290,8 @@ Date: 2008-06-20 17:16:32 +0300 Fix test_filter_flags to match the new restriction of lc+lp. - tests/test_filter_flags.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + tests/test_filter_flags.c | 3 +++ + 1 file changed, 3 insertions(+) commit eaafc4367c77ec1d910e16d11b4da293969d97a3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8299,8 +9299,8 @@ Date: 2008-06-20 16:19:54 +0300 Remove some redundant code from LZMA encoder. - src/liblzma/lzma/lzma_encoder.c | 15 +-------------- - 1 files changed, 1 insertions(+), 14 deletions(-) + src/liblzma/lzma/lzma_encoder.c | 15 +-------------- + 1 file changed, 1 insertion(+), 14 deletions(-) commit 0809c46534fa5664fe35d9e98d95e87312ed130e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8313,12 +9313,12 @@ Date: 2008-06-19 16:35:08 +0300 Make the LZMA decoder to rely on the current internal API to free the allocated memory in case an error occurs. - src/liblzma/api/lzma/lzma.h | 10 +++++- - src/liblzma/lzma/lzma_decoder.c | 57 +++++++----------------------- - src/liblzma/lzma/lzma_encoder_init.c | 13 +++---- - src/liblzma/lzma/lzma_encoder_private.h | 2 +- - src/liblzma/lzma/lzma_literal.c | 39 ++++----------------- - src/liblzma/lzma/lzma_literal.h | 13 +++---- + src/liblzma/api/lzma/lzma.h | 10 +++++- + src/liblzma/lzma/lzma_decoder.c | 57 ++++++++------------------------- + src/liblzma/lzma/lzma_encoder_init.c | 13 ++++---- + src/liblzma/lzma/lzma_encoder_private.h | 2 +- + src/liblzma/lzma/lzma_literal.c | 39 +++++----------------- + src/liblzma/lzma/lzma_literal.h | 13 +++----- 6 files changed, 43 insertions(+), 91 deletions(-) commit d25ab1b96178f06a0e724f58e3cd68300b2b1275 @@ -8327,8 +9327,8 @@ Date: 2008-06-18 21:45:19 +0300 Comments - src/liblzma/lzma/lzma_encoder.c | 7 ++----- - 1 files changed, 2 insertions(+), 5 deletions(-) + src/liblzma/lzma/lzma_encoder.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) commit 6368a2fa5901c75864be5171dd57a50af7adbb41 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8337,8 +9337,8 @@ Date: 2008-06-18 19:19:02 +0300 Delete old code that was supposed to be already deleted from test_block_header.c. - tests/test_block_header.c | 30 ------------------------------ - 1 files changed, 0 insertions(+), 30 deletions(-) + tests/test_block_header.c | 30 ------------------------------ + 1 file changed, 30 deletions(-) commit 7d17818cec8597f847b0a2537fde991bbc3d9e96 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8358,122 +9358,122 @@ Date: 2008-06-18 18:02:10 +0300 updated once the encoded format of the Subblock filter has been decided. - configure.ac | 41 +- - debug/full_flush.c | 16 +- - debug/sync_flush.c | 15 +- - src/common/bswap.h | 44 ++ - src/common/integer.h | 167 +++++ - src/liblzma/api/Makefile.am | 5 +- - src/liblzma/api/lzma.h | 9 +- - src/liblzma/api/lzma/alone.h | 32 +- - src/liblzma/api/lzma/auto.h | 7 +- - src/liblzma/api/lzma/base.h | 15 + - src/liblzma/api/lzma/block.h | 304 +++------- - src/liblzma/api/lzma/check.h | 18 +- - src/liblzma/api/lzma/copy.h | 29 - - src/liblzma/api/lzma/easy.h | 61 +-- - src/liblzma/api/lzma/extra.h | 114 ---- - src/liblzma/api/lzma/filter.h | 5 +- - src/liblzma/api/lzma/index.h | 204 +++++- - src/liblzma/api/lzma/index_hash.h | 94 +++ - src/liblzma/api/lzma/info.h | 315 --------- - src/liblzma/api/lzma/lzma.h | 2 +- - src/liblzma/api/lzma/metadata.h | 100 --- - src/liblzma/api/lzma/raw.h | 20 +- - src/liblzma/api/lzma/stream.h | 157 +---- - src/liblzma/api/lzma/stream_flags.h | 146 ++--- - src/liblzma/api/lzma/version.h | 2 +- - src/liblzma/api/lzma/vli.h | 83 ++-- - src/liblzma/check/Makefile.am | 1 - - src/liblzma/check/check.c | 55 ++- - src/liblzma/check/check.h | 47 +- - src/liblzma/check/check_byteswap.h | 43 -- - src/liblzma/check/crc32_init.c | 2 +- - src/liblzma/check/crc64_init.c | 2 +- - src/liblzma/check/crc_macros.h | 2 +- - src/liblzma/check/sha256.c | 53 +- - src/liblzma/common/Makefile.am | 31 +- - src/liblzma/common/alignment.c | 5 +- - src/liblzma/common/alone_decoder.c | 77 ++- - src/liblzma/common/alone_encoder.c | 99 ++-- - src/liblzma/common/auto_decoder.c | 18 +- - src/liblzma/common/block_decoder.c | 298 +++------- - src/liblzma/common/block_encoder.c | 228 ++----- - src/liblzma/common/block_header_decoder.c | 400 +++---------- - src/liblzma/common/block_header_encoder.c | 207 +++---- - src/liblzma/common/block_private.h | 51 +-- - src/liblzma/common/block_util.c | 73 +++ - src/liblzma/common/common.h | 44 +- - src/liblzma/common/copy_coder.c | 144 ----- - src/liblzma/common/copy_coder.h | 31 - - src/liblzma/common/delta_common.c | 4 - - src/liblzma/common/delta_common.h | 4 - - src/liblzma/common/delta_decoder.c | 55 +-- - src/liblzma/common/delta_encoder.c | 7 +- - src/liblzma/common/easy.c | 122 ++++ - src/liblzma/common/easy_common.c | 54 -- - src/liblzma/common/easy_common.h | 28 - - src/liblzma/common/easy_multi.c | 103 --- - src/liblzma/common/easy_single.c | 37 -- - src/liblzma/common/extra.c | 34 - - src/liblzma/common/features.c | 4 - - src/liblzma/common/filter_flags_decoder.c | 384 +++-------- - src/liblzma/common/filter_flags_encoder.c | 120 +--- - src/liblzma/common/index.c | 773 ++++++++++++++++++++--- - src/liblzma/common/index.h | 67 ++ - src/liblzma/common/index_decoder.c | 252 ++++++++ - src/liblzma/common/index_encoder.c | 222 +++++++ - src/liblzma/common/index_encoder.h | 30 + - src/liblzma/common/index_hash.c | 340 ++++++++++ - src/liblzma/common/info.c | 814 ------------------------ - src/liblzma/common/memory_usage.c | 1 - - src/liblzma/common/metadata_decoder.c | 578 ----------------- - src/liblzma/common/metadata_decoder.h | 31 - - src/liblzma/common/metadata_encoder.c | 435 ------------- - src/liblzma/common/metadata_encoder.h | 30 - - src/liblzma/common/raw_common.c | 178 ++---- - src/liblzma/common/raw_common.h | 5 +- - src/liblzma/common/raw_decoder.c | 19 +- - src/liblzma/common/raw_decoder.h | 3 +- - src/liblzma/common/raw_encoder.c | 101 +--- - src/liblzma/common/raw_encoder.h | 3 +- - src/liblzma/common/stream_common.h | 3 + - src/liblzma/common/stream_decoder.c | 458 ++++---------- - src/liblzma/common/stream_decoder.h | 28 + - src/liblzma/common/stream_encoder.c | 282 ++++++++ - src/liblzma/common/stream_encoder.h | 30 + - src/liblzma/common/stream_encoder_multi.c | 445 ------------- - src/liblzma/common/stream_encoder_multi.h | 26 - - src/liblzma/common/stream_encoder_single.c | 219 ------- - src/liblzma/common/stream_flags_decoder.c | 260 ++------- - src/liblzma/common/stream_flags_encoder.c | 56 +- - src/liblzma/common/stream_flags_equal.c | 36 + - src/liblzma/common/vli_decoder.c | 68 ++- - src/liblzma/common/vli_encoder.c | 59 +- - src/liblzma/common/vli_reverse_decoder.c | 55 -- - src/liblzma/lz/lz_decoder.c | 6 +- - src/liblzma/lz/lz_decoder.h | 10 +- - src/liblzma/lzma/lzma_decoder.c | 13 +- - src/liblzma/lzma/lzma_decoder.h | 10 +- - src/liblzma/simple/simple_coder.c | 29 +- - src/liblzma/simple/simple_private.h | 4 - - src/liblzma/subblock/subblock_decoder.c | 106 +--- - src/liblzma/subblock/subblock_decoder_helper.c | 5 +- - src/liblzma/subblock/subblock_encoder.c | 8 +- - src/lzma/args.c | 22 +- - src/lzma/args.h | 2 - - src/lzma/error.c | 6 + - src/lzma/process.c | 26 +- - src/lzmadec/lzmadec.c | 8 +- - tests/Makefile.am | 5 +- - tests/test_block_header.c | 411 +++++-------- - tests/test_compress.sh | 65 +-- - tests/test_filter_flags.c | 116 ++--- - tests/test_index.c | 504 ++++++++++++++- - tests/test_info.c | 717 --------------------- - tests/test_stream_flags.c | 134 ++-- - tests/tests.h | 14 +- - 115 files changed, 4845 insertions(+), 8155 deletions(-) + configure.ac | 41 +- + debug/full_flush.c | 16 +- + debug/sync_flush.c | 15 +- + src/common/bswap.h | 44 ++ + src/common/integer.h | 167 +++++ + src/liblzma/api/Makefile.am | 5 +- + src/liblzma/api/lzma.h | 9 +- + src/liblzma/api/lzma/alone.h | 32 +- + src/liblzma/api/lzma/auto.h | 7 +- + src/liblzma/api/lzma/base.h | 15 + + src/liblzma/api/lzma/block.h | 306 +++------- + src/liblzma/api/lzma/check.h | 18 +- + src/liblzma/api/lzma/copy.h | 29 - + src/liblzma/api/lzma/easy.h | 61 +- + src/liblzma/api/lzma/extra.h | 114 ---- + src/liblzma/api/lzma/filter.h | 5 +- + src/liblzma/api/lzma/index.h | 204 ++++++- + src/liblzma/api/lzma/index_hash.h | 94 +++ + src/liblzma/api/lzma/info.h | 315 ---------- + src/liblzma/api/lzma/lzma.h | 2 +- + src/liblzma/api/lzma/metadata.h | 100 --- + src/liblzma/api/lzma/raw.h | 20 +- + src/liblzma/api/lzma/stream.h | 157 +---- + src/liblzma/api/lzma/stream_flags.h | 146 +++-- + src/liblzma/api/lzma/version.h | 2 +- + src/liblzma/api/lzma/vli.h | 83 ++- + src/liblzma/check/Makefile.am | 1 - + src/liblzma/check/check.c | 55 +- + src/liblzma/check/check.h | 47 +- + src/liblzma/check/check_byteswap.h | 43 -- + src/liblzma/check/crc32_init.c | 2 +- + src/liblzma/check/crc64_init.c | 2 +- + src/liblzma/check/crc_macros.h | 2 +- + src/liblzma/check/sha256.c | 53 +- + src/liblzma/common/Makefile.am | 31 +- + src/liblzma/common/alignment.c | 5 +- + src/liblzma/common/alone_decoder.c | 77 +-- + src/liblzma/common/alone_encoder.c | 99 ++- + src/liblzma/common/auto_decoder.c | 18 +- + src/liblzma/common/block_decoder.c | 298 +++------ + src/liblzma/common/block_encoder.c | 228 ++----- + src/liblzma/common/block_header_decoder.c | 400 +++--------- + src/liblzma/common/block_header_encoder.c | 207 +++---- + src/liblzma/common/block_private.h | 51 +- + src/liblzma/common/block_util.c | 73 +++ + src/liblzma/common/common.h | 44 +- + src/liblzma/common/copy_coder.c | 144 ----- + src/liblzma/common/copy_coder.h | 31 - + src/liblzma/common/delta_common.c | 4 - + src/liblzma/common/delta_common.h | 4 - + src/liblzma/common/delta_decoder.c | 55 +- + src/liblzma/common/delta_encoder.c | 7 +- + src/liblzma/common/easy.c | 122 ++++ + src/liblzma/common/easy_common.c | 54 -- + src/liblzma/common/easy_common.h | 28 - + src/liblzma/common/easy_multi.c | 103 ---- + src/liblzma/common/easy_single.c | 37 -- + src/liblzma/common/extra.c | 34 -- + src/liblzma/common/features.c | 4 - + src/liblzma/common/filter_flags_decoder.c | 384 ++++-------- + src/liblzma/common/filter_flags_encoder.c | 120 +--- + src/liblzma/common/index.c | 773 ++++++++++++++++++++--- + src/liblzma/common/index.h | 67 ++ + src/liblzma/common/index_decoder.c | 252 ++++++++ + src/liblzma/common/index_encoder.c | 222 +++++++ + src/liblzma/common/index_encoder.h | 30 + + src/liblzma/common/index_hash.c | 340 +++++++++++ + src/liblzma/common/info.c | 814 ------------------------- + src/liblzma/common/memory_usage.c | 1 - + src/liblzma/common/metadata_decoder.c | 578 ------------------ + src/liblzma/common/metadata_decoder.h | 31 - + src/liblzma/common/metadata_encoder.c | 435 ------------- + src/liblzma/common/metadata_encoder.h | 30 - + src/liblzma/common/raw_common.c | 178 ++---- + src/liblzma/common/raw_common.h | 5 +- + src/liblzma/common/raw_decoder.c | 19 +- + src/liblzma/common/raw_decoder.h | 3 +- + src/liblzma/common/raw_encoder.c | 101 +-- + src/liblzma/common/raw_encoder.h | 3 +- + src/liblzma/common/stream_common.h | 3 + + src/liblzma/common/stream_decoder.c | 458 +++++--------- + src/liblzma/common/stream_decoder.h | 28 + + src/liblzma/common/stream_encoder.c | 282 +++++++++ + src/liblzma/common/stream_encoder.h | 30 + + src/liblzma/common/stream_encoder_multi.c | 445 -------------- + src/liblzma/common/stream_encoder_multi.h | 26 - + src/liblzma/common/stream_encoder_single.c | 219 ------- + src/liblzma/common/stream_flags_decoder.c | 260 ++------ + src/liblzma/common/stream_flags_encoder.c | 56 +- + src/liblzma/common/stream_flags_equal.c | 36 ++ + src/liblzma/common/vli_decoder.c | 68 ++- + src/liblzma/common/vli_encoder.c | 59 +- + src/liblzma/common/vli_reverse_decoder.c | 55 -- + src/liblzma/lz/lz_decoder.c | 6 +- + src/liblzma/lz/lz_decoder.h | 10 +- + src/liblzma/lzma/lzma_decoder.c | 13 +- + src/liblzma/lzma/lzma_decoder.h | 10 +- + src/liblzma/simple/simple_coder.c | 29 +- + src/liblzma/simple/simple_private.h | 4 - + src/liblzma/subblock/subblock_decoder.c | 106 +--- + src/liblzma/subblock/subblock_decoder_helper.c | 5 +- + src/liblzma/subblock/subblock_encoder.c | 8 +- + src/lzma/args.c | 22 +- + src/lzma/args.h | 2 - + src/lzma/error.c | 6 + + src/lzma/process.c | 26 +- + src/lzmadec/lzmadec.c | 8 +- + tests/Makefile.am | 5 +- + tests/test_block_header.c | 411 +++++-------- + tests/test_compress.sh | 65 +- + tests/test_filter_flags.c | 116 ++-- + tests/test_index.c | 504 ++++++++++++++- + tests/test_info.c | 717 ---------------------- + tests/test_stream_flags.c | 134 ++-- + tests/tests.h | 14 +- + 115 files changed, 4846 insertions(+), 8156 deletions(-) commit bf6348d1a3ff09fdc06940468f318f75ffa6af11 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8484,7 +9484,7 @@ Date: 2008-06-17 15:03:46 +0300 that the existing code will change a lot. doc/file-format.txt | 1794 +++++++++++++++------------------------------------ - 1 files changed, 508 insertions(+), 1286 deletions(-) + 1 file changed, 508 insertions(+), 1286 deletions(-) commit 803194ddd26f01ff60ba4e9924c6087a56b29827 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8493,8 +9493,8 @@ Date: 2008-06-11 21:42:47 +0300 Fix uninitialized variable in LZMA encoder. This was introduced in 369f72fd656f537a9a8e06f13e6d0d4c242be22f. - src/liblzma/lzma/lzma_encoder_init.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + src/liblzma/lzma/lzma_encoder_init.c | 2 ++ + 1 file changed, 2 insertions(+) commit 0ea98e52ba87453497b1355c51f13bad55c8924a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8504,8 +9504,8 @@ Date: 2008-06-11 15:08:44 +0300 lzmadec to make them accept also KiB in addition Ki etc. Fix also memory usage information in lzmadec --help. - src/lzma/util.c | 23 ++++++++++++++--------- - src/lzmadec/lzmadec.c | 31 ++++++++++++++++++------------- + src/lzma/util.c | 23 ++++++++++++++--------- + src/lzmadec/lzmadec.c | 31 ++++++++++++++++++------------- 2 files changed, 32 insertions(+), 22 deletions(-) commit 436fa5fae96d4e35759aed33066060f09ee8c6ef @@ -8515,8 +9515,8 @@ Date: 2008-06-10 20:36:12 +0300 s/decompressed/compressed/ in the command line tool's error message. - src/lzma/main.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzma/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 369f72fd656f537a9a8e06f13e6d0d4c242be22f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8540,14 +9540,14 @@ Date: 2008-06-01 12:48:17 +0300 without EOPM) is likely to go away. This means there will be API changes. - src/liblzma/lz/lz_encoder.c | 113 +----- - src/liblzma/lz/lz_encoder.h | 18 +- - src/liblzma/lzma/lzma_encoder.c | 551 +++++++++++------------- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 59 ++- - src/liblzma/lzma/lzma_encoder_getoptimumfast.c | 4 +- - src/liblzma/lzma/lzma_encoder_init.c | 9 +- - src/liblzma/lzma/lzma_encoder_private.h | 15 +- - src/liblzma/rangecoder/range_encoder.h | 383 +++++++++-------- + src/liblzma/lz/lz_encoder.c | 113 +---- + src/liblzma/lz/lz_encoder.h | 18 +- + src/liblzma/lzma/lzma_encoder.c | 551 ++++++++++++------------- + src/liblzma/lzma/lzma_encoder_getoptimum.c | 59 ++- + src/liblzma/lzma/lzma_encoder_getoptimumfast.c | 4 +- + src/liblzma/lzma/lzma_encoder_init.c | 9 +- + src/liblzma/lzma/lzma_encoder_private.h | 15 +- + src/liblzma/rangecoder/range_encoder.h | 383 +++++++++-------- 8 files changed, 532 insertions(+), 620 deletions(-) commit e55e0e873ce2511325749d415ae547d62ab5f00d @@ -8556,8 +9556,8 @@ Date: 2008-05-30 11:53:41 +0300 Typo fixes from meyering. - doc/faq.txt | 4 ++-- - doc/liblzma-advanced.txt | 2 +- + doc/faq.txt | 4 ++-- + doc/liblzma-advanced.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) commit ed6664146fcbe9cc4a3b23b31632182ed812ea93 @@ -8567,9 +9567,9 @@ Date: 2008-05-11 14:24:42 +0300 Remove support for pre-C89 libc versions that lack memcpy, memmove, and memset. - configure.ac | 2 +- - src/common/sysdefs.h | 15 ++------------- - src/liblzma/common/allocator.c | 2 +- + configure.ac | 2 +- + src/common/sysdefs.h | 15 ++------------- + src/liblzma/common/allocator.c | 2 +- 3 files changed, 4 insertions(+), 15 deletions(-) commit b09464bf9ae694afc2d1dc26188ac4e2e8af0a63 @@ -8581,8 +9581,8 @@ Date: 2008-05-11 14:17:21 +0300 should still give warnings about GNU extensions like before except with some special keywords like asm(). - configure.ac | 24 ++++++++++++------------ - 1 files changed, 12 insertions(+), 12 deletions(-) + configure.ac | 24 ++++++++++++------------ + 1 file changed, 12 insertions(+), 12 deletions(-) commit 11de5d5267f7a0a7f0a4d34eec147e65eaf9f9cf Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8590,10 +9590,10 @@ Date: 2008-05-06 15:15:07 +0300 Bunch of grammar fixes from meyering. - doc/liblzma-security.txt | 8 ++++---- - src/liblzma/api/lzma/memlimit.h | 6 +++--- - src/lzma/help.c | 2 +- - tests/files/README | 2 +- + doc/liblzma-security.txt | 8 ++++---- + src/liblzma/api/lzma/memlimit.h | 6 +++--- + src/lzma/help.c | 2 +- + tests/files/README | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) commit dc192b6343ae36276c85fcf7ef6006147816eadc @@ -8602,8 +9602,8 @@ Date: 2008-05-06 13:41:05 +0300 Typo fix - src/liblzma/api/lzma/init.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/init.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 944b62b93239b27b338d117f2668c0e95849659b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8612,8 +9612,8 @@ Date: 2008-05-04 22:29:27 +0300 Don't print an error message on broken pipe unless --verbose is used. - src/lzma/io.c | 15 ++++++++++++++- - 1 files changed, 14 insertions(+), 1 deletions(-) + src/lzma/io.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) commit 8e074349e47ea6832b8fdf9244e581d453733433 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8622,8 +9622,8 @@ Date: 2008-04-30 22:16:17 +0300 Fix a crash with --format=alone if other filters than LZMA are specified on the command line. - src/lzma/args.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/lzma/args.c | 9 +++++++++ + 1 file changed, 9 insertions(+) commit 2f361ac19b7fd3abcd362de4d470e6a9eb495b73 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8631,8 +9631,8 @@ Date: 2008-04-28 17:08:27 +0300 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 3be21fb12f4cec2cf07799e8960382f4cb375369 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8641,16 +9641,16 @@ Date: 2008-04-28 17:06:34 +0300 Fixed wrong spelling "limitter" to "limiter". This affects liblzma's API. - doc/liblzma-security.txt | 14 +- - src/liblzma/api/lzma/base.h | 4 +- - src/liblzma/api/lzma/memlimit.h | 10 +- - src/liblzma/api/lzma/stream.h | 4 +- - src/liblzma/common/Makefile.am | 2 +- - src/liblzma/common/memory_limiter.c | 288 ++++++++++++++++++++++++++++++++++ - src/liblzma/common/memory_limitter.c | 288 ---------------------------------- - src/lzma/list.c | 6 +- - src/lzmadec/lzmadec.c | 12 +- - tests/test_memlimit.c | 4 +- + doc/liblzma-security.txt | 14 +- + src/liblzma/api/lzma/base.h | 4 +- + src/liblzma/api/lzma/memlimit.h | 10 +- + src/liblzma/api/lzma/stream.h | 4 +- + src/liblzma/common/Makefile.am | 2 +- + src/liblzma/common/memory_limiter.c | 288 +++++++++++++++++++++++++++++++++++ + src/liblzma/common/memory_limitter.c | 288 ----------------------------------- + src/lzma/list.c | 6 +- + src/lzmadec/lzmadec.c | 12 +- + tests/test_memlimit.c | 4 +- 10 files changed, 316 insertions(+), 316 deletions(-) commit beeb81060821dfec4e7898e0d44b7900dcb2215e @@ -8663,8 +9663,8 @@ Date: 2008-04-25 15:39:50 +0300 likely that support for encoding with known uncompressed size will go away anyway, I'm not fixing this problem now. - src/liblzma/lz/lz_encoder.c | 9 +++++++-- - 1 files changed, 7 insertions(+), 2 deletions(-) + src/liblzma/lz/lz_encoder.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) commit c324325f9f13cdeb92153c5d00962341ba070ca2 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8674,11 +9674,11 @@ Date: 2008-04-25 13:58:56 +0300 annoying, because "make dist" put two copies of sysdefs.h into the tarball instead of the symlink. - src/liblzma/check/crc32_table.c | 2 +- - src/liblzma/check/crc64_table.c | 2 +- - src/liblzma/common/Makefile.am | 1 - - src/liblzma/common/common.h | 2 +- - src/liblzma/common/sysdefs.h | 1 - + src/liblzma/check/crc32_table.c | 2 +- + src/liblzma/check/crc64_table.c | 2 +- + src/liblzma/common/Makefile.am | 1 - + src/liblzma/common/common.h | 2 +- + src/liblzma/common/sysdefs.h | 1 - 5 files changed, 3 insertions(+), 5 deletions(-) commit d3ba30243c75c13d094de1793f9c58acdbacc692 @@ -8687,9 +9687,9 @@ Date: 2008-04-25 13:41:29 +0300 Added memusage.c to debug directory. - debug/Makefile.am | 3 +- - debug/memusage.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 57 insertions(+), 1 deletions(-) + debug/Makefile.am | 3 ++- + debug/memusage.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 57 insertions(+), 1 deletion(-) commit 8f804c29aa8471ccd6438ddca254092b8869ca52 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8702,10 +9702,10 @@ Date: 2008-04-25 13:32:35 +0300 Made some small Automake-related changes to toplevel Makefile.am and configure.ac. - Makefile.am | 7 +++++-- - README | 29 +++++++++++++++++++++++++++++ - configure.ac | 4 ++-- - src/liblzma/api/lzma/version.h | 22 ++++++++++------------ + Makefile.am | 7 +++++-- + README | 29 +++++++++++++++++++++++++++++ + configure.ac | 4 ++-- + src/liblzma/api/lzma/version.h | 22 ++++++++++------------ 4 files changed, 46 insertions(+), 16 deletions(-) commit c99037ea10f121cbacf60c37a36c29768ae53447 @@ -8715,8 +9715,8 @@ Date: 2008-04-24 20:25:39 +0300 Fix a memory leak by calling free(extra->data) in lzma_extra_free(). - src/liblzma/common/extra.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/common/extra.c | 1 + + 1 file changed, 1 insertion(+) commit 22ba3b0b5043fa481903482ce85015fe775939e5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8724,8 +9724,8 @@ Date: 2008-04-24 20:23:05 +0300 Make unlzma and lzcat symlinks. - src/lzma/Makefile.am | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) + src/lzma/Makefile.am | 12 ++++++++++++ + 1 file changed, 12 insertions(+) commit 17c36422d4cbc2c70d5c83ec389406f92cd9e85e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8733,8 +9733,8 @@ Date: 2008-04-24 20:20:27 +0300 Fixed a bug in command line option parsing. - src/lzma/options.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzma/options.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 283f939974c32c47f05d495e8dea455ec646ed64 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8742,8 +9742,8 @@ Date: 2008-04-24 20:19:20 +0300 Added two assert()s. - src/liblzma/lzma/lzma_encoder.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + src/liblzma/lzma/lzma_encoder.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit eb348a60b6e19a7c093f892434f23c4756973ffd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8751,8 +9751,8 @@ Date: 2008-04-24 19:22:53 +0300 Switch to uint16_t as the type of range coder probabilities. - src/liblzma/rangecoder/range_common.h | 25 +++++++++++++++++++------ - 1 files changed, 19 insertions(+), 6 deletions(-) + src/liblzma/rangecoder/range_common.h | 25 +++++++++++++++++++------ + 1 file changed, 19 insertions(+), 6 deletions(-) commit 6c5306e312bcfd254cf654f88c04e34ba786df3d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8760,8 +9760,8 @@ Date: 2008-04-24 18:39:57 +0300 Fix wrong return type (uint32_t -> bool). - src/liblzma/lz/lz_encoder.c | 2 +- - src/liblzma/lz/lz_encoder.h | 2 +- + src/liblzma/lz/lz_encoder.c | 2 +- + src/liblzma/lz/lz_encoder.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 712cfe3ebfd24df24d8896b1315c53c3bc4369c8 @@ -8770,9 +9770,9 @@ Date: 2008-04-24 18:38:00 +0300 Fix data corruption in LZ encoder with LZMA_SYNC_FLUSH. - src/liblzma/lz/lz_encoder.c | 16 ++++++++++++++++ - src/liblzma/lz/lz_encoder.h | 4 ++++ - src/liblzma/lz/match_c.h | 23 ++++++++++++++++++----- + src/liblzma/lz/lz_encoder.c | 16 ++++++++++++++++ + src/liblzma/lz/lz_encoder.h | 4 ++++ + src/liblzma/lz/match_c.h | 23 ++++++++++++++++++----- 3 files changed, 38 insertions(+), 5 deletions(-) commit bc04486e368d20b3027cde625267762aae063965 @@ -8781,8 +9781,8 @@ Date: 2008-04-24 17:33:01 +0300 Fix fastpos problem in Makefile.am when built with --enable-small. - src/liblzma/lzma/Makefile.am | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + src/liblzma/lzma/Makefile.am | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) commit 7ab493924e0ed590a5121a15ee54038d238880d3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8792,8 +9792,8 @@ Date: 2008-04-24 17:30:51 +0300 theoretical data corruption, which should be very hard to trigger even intentionally. - src/liblzma/rangecoder/range_encoder.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/rangecoder/range_encoder.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 641998c3e1ecc8b598fe0eb051fab8b9535c291b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8804,9 +9804,9 @@ Date: 2008-03-24 16:38:40 +0200 arithmetic right shift. Removed the related check from configure.ac. - configure.ac | 1 - - m4/ax_c_arithmetic_rshift.m4 | 36 --------------------- - src/liblzma/rangecoder/range_decoder.h | 53 +++++++++---------------------- + configure.ac | 1 - + m4/ax_c_arithmetic_rshift.m4 | 36 ----------------------- + src/liblzma/rangecoder/range_decoder.h | 53 ++++++++++------------------------ 3 files changed, 16 insertions(+), 74 deletions(-) commit ad999efd279d95f1e7ac555b14170e8e9020488c @@ -8815,8 +9815,8 @@ Date: 2008-03-22 14:39:34 +0200 Take advantage of arithmetic right shift in range decoder. - src/liblzma/rangecoder/range_decoder.h | 52 ++++++++++++++++++++++--------- - 1 files changed, 37 insertions(+), 15 deletions(-) + src/liblzma/rangecoder/range_decoder.h | 52 ++++++++++++++++++++++++---------- + 1 file changed, 37 insertions(+), 15 deletions(-) commit 03e0e8a0d7228b6ff1f0af39e2c040a4e425973d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8825,9 +9825,9 @@ Date: 2008-03-22 14:18:29 +0200 Added autoconf check to detect if we can use arithmetic right shift for optimizations. - configure.ac | 1 + - m4/ax_c_arithmetic_rshift.m4 | 36 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 37 insertions(+), 0 deletions(-) + configure.ac | 1 + + m4/ax_c_arithmetic_rshift.m4 | 36 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 37 insertions(+) commit 7521bbdc83acab834594a22bec50c8e1bd836298 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8838,8 +9838,8 @@ Date: 2008-03-22 01:26:36 +0200 (And BTW, the previous commit actually did change the program logic slightly.) - src/liblzma/lzma/lzma_decoder.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/lzma/lzma_decoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 63b74d000eedaebb8485f623e56864ff5ab71064 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8854,12 +9854,12 @@ Date: 2008-03-22 00:57:33 +0200 This commit doesn't change the program logic. - src/liblzma/lzma/lzma_common.h | 69 +++++++++++++++++++++------- - src/liblzma/lzma/lzma_decoder.c | 47 ++++++++++--------- - src/liblzma/lzma/lzma_encoder.c | 14 +++--- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 34 +++++++------- - src/liblzma/lzma/lzma_encoder_init.c | 5 +- - src/liblzma/lzma/lzma_encoder_private.h | 8 ++-- + src/liblzma/lzma/lzma_common.h | 69 ++++++++++++++++++++++-------- + src/liblzma/lzma/lzma_decoder.c | 47 ++++++++++---------- + src/liblzma/lzma/lzma_encoder.c | 14 +++--- + src/liblzma/lzma/lzma_encoder_getoptimum.c | 34 +++++++-------- + src/liblzma/lzma/lzma_encoder_init.c | 5 ++- + src/liblzma/lzma/lzma_encoder_private.h | 8 ++-- 6 files changed, 107 insertions(+), 70 deletions(-) commit e6eb0a26757e851cef62b9440319a8e73b015cb9 @@ -8869,8 +9869,8 @@ Date: 2008-03-14 23:16:11 +0200 Fix data corruption in LZMA encoder. Note that this bug was specific to liblzma and was *not* present in LZMA SDK. - src/liblzma/lzma/lzma_encoder.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/liblzma/lzma/lzma_encoder.c | 4 ++++ + 1 file changed, 4 insertions(+) commit 7d516f5129e4373a6d57249d7f608c634c66bf12 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8878,8 +9878,8 @@ Date: 2008-03-14 21:32:37 +0200 Fix a comment API header. - src/liblzma/api/lzma/lzma.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/lzma.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 748d6e4274921a350bd0a317380309717441ef9c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8887,8 +9887,8 @@ Date: 2008-03-12 23:14:50 +0200 Make lzma_stream.next_in const. Let's see if anyone complains. - src/liblzma/api/lzma/base.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/base.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit bfde3b24a5ae25ce53c854762b6148952386b025 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8896,8 +9896,8 @@ Date: 2008-03-11 15:35:34 +0200 Apply a minor speed optimization to LZMA decoder. - src/liblzma/lzma/lzma_decoder.c | 85 ++++++++++++++++++++------------------- - 1 files changed, 43 insertions(+), 42 deletions(-) + src/liblzma/lzma/lzma_decoder.c | 85 +++++++++++++++++++++-------------------- + 1 file changed, 43 insertions(+), 42 deletions(-) commit f310c50286d9e4e9c6170bb65348c9bb430a65b4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8907,8 +9907,8 @@ Date: 2008-03-11 15:17:16 +0200 lz_get_byte(lz, 0) returns zero. This was broken by 1a3b21859818e4d8e89a1da99699233c1bfd197d. - src/liblzma/lz/lz_decoder.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/lz/lz_decoder.c | 1 + + 1 file changed, 1 insertion(+) commit 5ead36cf7f823093672a4e43c3180b38c9abbaff Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8916,8 +9916,8 @@ Date: 2008-03-10 15:57:55 +0200 Really fix the price count initialization. - src/liblzma/lzma/lzma_encoder_init.c | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + src/liblzma/lzma/lzma_encoder_init.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit d4d7feb83d1a1ded8f662a82e21e053841ca726c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8925,8 +9925,8 @@ Date: 2008-03-10 13:47:17 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 0541c5ea63ef3c0ff85eeddb0a420e56b0c65258 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8940,8 +9940,8 @@ Date: 2008-03-10 13:46:48 +0200 called in lzma_encoder_getoptimum.c in the beginning of a stream. - src/liblzma/lzma/lzma_encoder_init.c | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + src/liblzma/lzma/lzma_encoder_init.c | 2 ++ + 1 file changed, 2 insertions(+) commit 596fa1fac72823e4ef5bc26bb53f9090445bf748 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8951,8 +9951,8 @@ Date: 2008-03-10 13:44:29 +0200 get initialized as a side-effect after allocating a new decoder, but not when the decoder was reused. - src/liblzma/lz/lz_decoder.c | 11 ++++++----- - 1 files changed, 6 insertions(+), 5 deletions(-) + src/liblzma/lz/lz_decoder.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) commit 45e43e169527e7a98a8c8a821d37bf25822b764d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8961,8 +9961,8 @@ Date: 2008-03-10 13:41:25 +0200 Don't fill allocated memory with 0xFD when debugging is enabled. It hides errors from Valgrind. - src/liblzma/common/allocator.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + src/liblzma/common/allocator.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit c0e19e0662205f81a86da8903cdc325d50635870 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8972,8 +9972,8 @@ Date: 2008-02-28 10:24:31 +0200 These are already checked elsewhere, so omitting these gives (very) tiny speed up. - src/liblzma/lzma/lzma_decoder.c | 23 ++++------------------- - 1 files changed, 4 insertions(+), 19 deletions(-) + src/liblzma/lzma/lzma_decoder.c | 23 ++++------------------- + 1 file changed, 4 insertions(+), 19 deletions(-) commit de7485806284d1614095ae8cb2ebbb5d74c9ac45 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8981,8 +9981,8 @@ Date: 2008-02-06 13:25:32 +0200 Tiny clean up to file-format.txt. - doc/file-format.txt | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + doc/file-format.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 1a3b21859818e4d8e89a1da99699233c1bfd197d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -8994,8 +9994,8 @@ Date: 2008-02-02 14:51:06 +0200 with large dictionaries, which could make it easier to construct DoS attack to consume too much CPU time. - src/liblzma/lz/lz_decoder.c | 7 +++---- - 1 files changed, 3 insertions(+), 4 deletions(-) + src/liblzma/lz/lz_decoder.c | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) commit 7e796e312bf644ea95aea0ff85480f47cfa30fc0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9005,8 +10005,8 @@ Date: 2008-02-01 08:39:26 +0200 it gets done for not only raw encoder, but also Block and LZMA_Alone encoders. - src/liblzma/common/raw_encoder.c | 90 ++++++++++++++++++++++++++++++------- - 1 files changed, 73 insertions(+), 17 deletions(-) + src/liblzma/common/raw_encoder.c | 90 ++++++++++++++++++++++++++++++++-------- + 1 file changed, 73 insertions(+), 17 deletions(-) commit 7dd48578a3853e0cfab9f1830bc30927173ec4bc Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9014,8 +10014,8 @@ Date: 2008-02-01 08:32:05 +0200 Avoid unneeded function call in raw_common.c. - src/liblzma/common/raw_common.c | 20 +++++++++++--------- - 1 files changed, 11 insertions(+), 9 deletions(-) + src/liblzma/common/raw_common.c | 20 +++++++++++--------- + 1 file changed, 11 insertions(+), 9 deletions(-) commit b596fac963c3ff96f615d4d9b427a213ec341211 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9023,8 +10023,8 @@ Date: 2008-01-26 21:42:38 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit e9f6e9c075ad93141a568d94f7d4eb0f2edbd6c2 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9033,9 +10033,9 @@ Date: 2008-01-26 21:40:23 +0200 Added note.GNU-stack to x86 assembler files. It is needed when using non-executable stack. - src/liblzma/check/crc32_x86.S | 9 +++++++++ - src/liblzma/check/crc64_x86.S | 9 +++++++++ - 2 files changed, 18 insertions(+), 0 deletions(-) + src/liblzma/check/crc32_x86.S | 9 +++++++++ + src/liblzma/check/crc64_x86.S | 9 +++++++++ + 2 files changed, 18 insertions(+) commit 4c7ad179c78f97f68ad548cb40a9dfa6871655ae Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9044,8 +10044,8 @@ Date: 2008-01-26 19:12:50 +0200 Added api/lzma/easy.h. I had forgot to add this to the git repo. Thanks to Stephan Kulow. - src/liblzma/api/lzma/easy.h | 174 +++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 174 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/easy.h | 174 ++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 174 insertions(+) commit 288b232f54c3692cd36f471d4042f51daf3ea79f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9053,11 +10053,11 @@ Date: 2008-01-26 11:09:17 +0200 Added more test files. - tests/files/README | 11 +++++++++++ - tests/files/bad-multi-none-header_7.lzma | Bin 0 -> 59 bytes - tests/files/good-single-sparc-lzma.lzma | Bin 0 -> 2263 bytes - tests/files/good-single-x86-lzma.lzma | Bin 0 -> 1909 bytes - 4 files changed, 11 insertions(+), 0 deletions(-) + tests/files/README | 11 +++++++++++ + tests/files/bad-multi-none-header_7.lzma | Bin 0 -> 59 bytes + tests/files/good-single-sparc-lzma.lzma | Bin 0 -> 2263 bytes + tests/files/good-single-x86-lzma.lzma | Bin 0 -> 1909 bytes + 4 files changed, 11 insertions(+) commit c467b0defccf233d0c79234407bc38d7d09574d3 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9065,10 +10065,10 @@ Date: 2008-01-26 10:47:55 +0200 Added more test files. - tests/files/README | 6 ++++++ - tests/files/bad-multi-none-block_3.lzma | Bin 0 -> 58 bytes - tests/files/good-multi-none-block_2.lzma | Bin 0 -> 58 bytes - 3 files changed, 6 insertions(+), 0 deletions(-) + tests/files/README | 6 ++++++ + tests/files/bad-multi-none-block_3.lzma | Bin 0 -> 58 bytes + tests/files/good-multi-none-block_2.lzma | Bin 0 -> 58 bytes + 3 files changed, 6 insertions(+) commit f9842f712732c482f2def9f24437851e57dd83f8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9081,9 +10081,9 @@ Date: 2008-01-26 00:25:34 +0200 After this commit, using LZMA_SYNC_FLUSH shouldn't cause undefined behavior in any situation. - src/liblzma/api/lzma/simple.h | 9 +++++++++ - src/liblzma/simple/simple_coder.c | 8 ++++++++ - 2 files changed, 17 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/simple.h | 9 +++++++++ + src/liblzma/simple/simple_coder.c | 8 ++++++++ + 2 files changed, 17 insertions(+) commit e988ea1d1a286dd0f27af0657f9665d5cd8573aa Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9092,10 +10092,10 @@ Date: 2008-01-25 23:50:35 +0200 Added more Multi-Block test files. Improved some descriptions in the test files' README. - tests/files/README | 34 ++++++++++++++++++++++++----- - tests/files/bad-multi-none-block_1.lzma | Bin 0 -> 66 bytes - tests/files/bad-multi-none-block_2.lzma | Bin 0 -> 66 bytes - tests/files/good-multi-none-block_1.lzma | Bin 0 -> 66 bytes + tests/files/README | 34 +++++++++++++++++++++++++------ + tests/files/bad-multi-none-block_1.lzma | Bin 0 -> 66 bytes + tests/files/bad-multi-none-block_2.lzma | Bin 0 -> 66 bytes + tests/files/good-multi-none-block_1.lzma | Bin 0 -> 66 bytes 4 files changed, 28 insertions(+), 6 deletions(-) commit 4441e004185cd4c61bda184010eca5924c9dec87 @@ -9116,9 +10116,9 @@ Date: 2008-01-25 23:12:36 +0200 but it's not impossible that someone could find them useful in some custom file format. - src/liblzma/common/block_decoder.c | 37 +++++++++++---------------- - src/liblzma/common/block_encoder.c | 32 ++++------------------ - src/liblzma/common/block_private.h | 50 ++++++++++++++++++++++++++++++++++++ + src/liblzma/common/block_decoder.c | 37 ++++++++++++---------------- + src/liblzma/common/block_encoder.c | 32 +++++------------------- + src/liblzma/common/block_private.h | 50 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 48 deletions(-) commit bf4200c818fcf9102e56328d39cde91bfa13cfb6 @@ -9127,9 +10127,9 @@ Date: 2008-01-25 19:21:22 +0200 Added test_memlimit.c. - tests/Makefile.am | 2 + - tests/test_memlimit.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 116 insertions(+), 0 deletions(-) + tests/Makefile.am | 2 + + tests/test_memlimit.c | 114 ++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 116 insertions(+) commit 7b8fc7e6b501a32a36636dac79ecb57099269005 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9146,8 +10146,8 @@ Date: 2008-01-25 19:20:28 +0200 The description of lzma_memlimit_max() in memlimit.h is bad and should be improved. - src/liblzma/api/lzma/memlimit.h | 35 ++++++++++++ - src/liblzma/common/memory_limitter.c | 97 +++++++++++++++++++++++++++++----- + src/liblzma/api/lzma/memlimit.h | 35 +++++++++++++ + src/liblzma/common/memory_limitter.c | 97 ++++++++++++++++++++++++++++++------ 2 files changed, 118 insertions(+), 14 deletions(-) commit e0c3d0043da2f670cfdb1abbb3223d5a594ad8db @@ -9156,8 +10156,8 @@ Date: 2008-01-25 13:55:52 +0200 Use more parenthesis in succeed() macro in tests/tests.h. - tests/tests.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/tests.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 1fd76d488179580d37f31ee11948f4932aed31fd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9165,14 +10165,14 @@ Date: 2008-01-24 14:49:34 +0200 Added more Multi-Block Stream test files. - tests/files/README | 23 +++++++++++++++++++++++ - tests/files/bad-multi-none-header_2.lzma | Bin 0 -> 61 bytes - tests/files/bad-multi-none-header_3.lzma | Bin 0 -> 59 bytes - tests/files/bad-multi-none-header_4.lzma | Bin 0 -> 59 bytes - tests/files/bad-multi-none-header_5.lzma | Bin 0 -> 58 bytes - tests/files/bad-multi-none-header_6.lzma | Bin 0 -> 59 bytes - tests/files/good-multi-none-header_3.lzma | Bin 0 -> 59 bytes - 7 files changed, 23 insertions(+), 0 deletions(-) + tests/files/README | 23 +++++++++++++++++++++++ + tests/files/bad-multi-none-header_2.lzma | Bin 0 -> 61 bytes + tests/files/bad-multi-none-header_3.lzma | Bin 0 -> 59 bytes + tests/files/bad-multi-none-header_4.lzma | Bin 0 -> 59 bytes + tests/files/bad-multi-none-header_5.lzma | Bin 0 -> 58 bytes + tests/files/bad-multi-none-header_6.lzma | Bin 0 -> 59 bytes + tests/files/good-multi-none-header_3.lzma | Bin 0 -> 59 bytes + 7 files changed, 23 insertions(+) commit 6e27b1098a28f4ce09bfa6df68ad94182dfc2936 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9180,26 +10180,26 @@ Date: 2008-01-24 00:46:05 +0200 Added bunch of test files containing Multi-Block Streams. - tests/files/README | 53 +++++++++++++++++++++++++++++ - tests/files/bad-multi-none-1.lzma | Bin 0 -> 54 bytes - tests/files/bad-multi-none-2.lzma | Bin 0 -> 53 bytes - tests/files/bad-multi-none-3.lzma | Bin 0 -> 53 bytes - tests/files/bad-multi-none-extra_1.lzma | Bin 0 -> 54 bytes - tests/files/bad-multi-none-extra_2.lzma | Bin 0 -> 54 bytes - tests/files/bad-multi-none-extra_3.lzma | Bin 0 -> 55 bytes - tests/files/bad-multi-none-header_1.lzma | Bin 0 -> 57 bytes - tests/files/bad-multi-none-index_1.lzma | Bin 0 -> 51 bytes - tests/files/bad-multi-none-index_2.lzma | Bin 0 -> 49 bytes - tests/files/bad-multi-none-index_3.lzma | Bin 0 -> 51 bytes - tests/files/bad-multi-none-index_4.lzma | Bin 0 -> 51 bytes - tests/files/good-multi-none-1.lzma | Bin 0 -> 75 bytes - tests/files/good-multi-none-2.lzma | Bin 0 -> 53 bytes - tests/files/good-multi-none-extra_1.lzma | Bin 0 -> 51 bytes - tests/files/good-multi-none-extra_2.lzma | Bin 0 -> 79 bytes - tests/files/good-multi-none-extra_3.lzma | Bin 0 -> 55 bytes - tests/files/good-multi-none-header_1.lzma | Bin 0 -> 58 bytes - tests/files/good-multi-none-header_2.lzma | Bin 0 -> 66 bytes - 19 files changed, 53 insertions(+), 0 deletions(-) + tests/files/README | 53 ++++++++++++++++++++++++++++++ + tests/files/bad-multi-none-1.lzma | Bin 0 -> 54 bytes + tests/files/bad-multi-none-2.lzma | Bin 0 -> 53 bytes + tests/files/bad-multi-none-3.lzma | Bin 0 -> 53 bytes + tests/files/bad-multi-none-extra_1.lzma | Bin 0 -> 54 bytes + tests/files/bad-multi-none-extra_2.lzma | Bin 0 -> 54 bytes + tests/files/bad-multi-none-extra_3.lzma | Bin 0 -> 55 bytes + tests/files/bad-multi-none-header_1.lzma | Bin 0 -> 57 bytes + tests/files/bad-multi-none-index_1.lzma | Bin 0 -> 51 bytes + tests/files/bad-multi-none-index_2.lzma | Bin 0 -> 49 bytes + tests/files/bad-multi-none-index_3.lzma | Bin 0 -> 51 bytes + tests/files/bad-multi-none-index_4.lzma | Bin 0 -> 51 bytes + tests/files/good-multi-none-1.lzma | Bin 0 -> 75 bytes + tests/files/good-multi-none-2.lzma | Bin 0 -> 53 bytes + tests/files/good-multi-none-extra_1.lzma | Bin 0 -> 51 bytes + tests/files/good-multi-none-extra_2.lzma | Bin 0 -> 79 bytes + tests/files/good-multi-none-extra_3.lzma | Bin 0 -> 55 bytes + tests/files/good-multi-none-header_1.lzma | Bin 0 -> 58 bytes + tests/files/good-multi-none-header_2.lzma | Bin 0 -> 66 bytes + 19 files changed, 53 insertions(+) commit db9df0a9609c01a00a227329fb96e983971040f5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9210,8 +10210,8 @@ Date: 2008-01-23 23:43:00 +0200 such files; now they are prohibited as the file format specification requires. - src/liblzma/common/metadata_decoder.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + src/liblzma/common/metadata_decoder.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit 765f0b05f6e95ed9194fb90819cee189ebbac36b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9221,8 +10221,8 @@ Date: 2008-01-23 23:38:18 +0200 lzma_metadata.header_metadata_size was not properly set to zero if the Metadata had only the Metadata Flags field. - src/liblzma/common/metadata_decoder.c | 13 +++++++------ - 1 files changed, 7 insertions(+), 6 deletions(-) + src/liblzma/common/metadata_decoder.c | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) commit 3a7cc5c3dec7b078941f961b0393b86c418883b6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9230,8 +10230,8 @@ Date: 2008-01-23 23:35:49 +0200 Fix decoding of Extra Records that have empty Data. - src/liblzma/common/metadata_decoder.c | 13 ++++++++++++- - 1 files changed, 12 insertions(+), 1 deletions(-) + src/liblzma/common/metadata_decoder.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) commit e5fdec93e273855c1bcc2579b83cfb481a9a1492 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9240,8 +10240,8 @@ Date: 2008-01-23 22:02:38 +0200 Add the trailing '\0' to lzma_extra.data as the API header already documents. - src/liblzma/common/metadata_decoder.c | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + src/liblzma/common/metadata_decoder.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit ed40dc5a2c28a8dfccab8c165b3780738eeef93e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9249,9 +10249,9 @@ Date: 2008-01-23 21:21:21 +0200 Added debug/full_flush.c. - debug/Makefile.am | 3 +- - debug/full_flush.c | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 107 insertions(+), 1 deletions(-) + debug/Makefile.am | 3 +- + debug/full_flush.c | 105 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 107 insertions(+), 1 deletion(-) commit ae0cd09a666a1682da8fc09487322227679e218d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9261,8 +10261,8 @@ Date: 2008-01-23 21:05:33 +0200 LZMA_SYNC_FLUSH or LZMA_FULL_FLUSH is used when there's no unfinished Block open. - src/liblzma/common/stream_encoder_multi.c | 6 +++++- - 1 files changed, 5 insertions(+), 1 deletions(-) + src/liblzma/common/stream_encoder_multi.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) commit 0e80ded13dfceb98f9494cbb5381a95eb44d03db Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9271,10 +10271,10 @@ Date: 2008-01-23 20:05:01 +0200 Added bad-single-none-footer_filter_flags.lzma and bad-single-none-too_long_vli.lzma. - tests/files/README | 5 +++++ - .../files/bad-single-none-footer_filter_flags.lzma | Bin 0 -> 30 bytes - tests/files/bad-single-none-too_long_vli.lzma | Bin 0 -> 39 bytes - 3 files changed, 5 insertions(+), 0 deletions(-) + tests/files/README | 5 +++++ + tests/files/bad-single-none-footer_filter_flags.lzma | Bin 0 -> 30 bytes + tests/files/bad-single-none-too_long_vli.lzma | Bin 0 -> 39 bytes + 3 files changed, 5 insertions(+) commit 8c8eb14055d8dd536b1b1c58fb284d34bb8ed1dd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9282,8 +10282,8 @@ Date: 2008-01-23 13:42:35 +0200 Fixed a typo. - src/liblzma/subblock/subblock_decoder_helper.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/subblock/subblock_decoder_helper.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 980f65a9a10160c4d105767871e3002b9aaba3e0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9291,8 +10291,8 @@ Date: 2008-01-23 13:40:45 +0200 Fix a memory leak in the Subblock encoder. - src/liblzma/subblock/subblock_encoder.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/subblock/subblock_encoder.c | 1 + + 1 file changed, 1 insertion(+) commit 99e12af4e2b866c011fe0106cd1e0bfdcc8fe9c6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9311,10 +10311,10 @@ Date: 2008-01-23 13:36:07 +0200 not present in the Stream. With other Metadata fields, a missing field means only that the value is unknown. - src/liblzma/common/info.c | 13 ++++--------- - src/liblzma/common/metadata_decoder.c | 6 ++++++ - src/liblzma/common/metadata_encoder.c | 11 +++++------ - tests/test_info.c | 4 ++-- + src/liblzma/common/info.c | 13 ++++--------- + src/liblzma/common/metadata_decoder.c | 6 ++++++ + src/liblzma/common/metadata_encoder.c | 11 +++++------ + tests/test_info.c | 4 ++-- 4 files changed, 17 insertions(+), 17 deletions(-) commit 58b78ab20c1bcced45cf71ae6684868fc90b4b81 @@ -9323,8 +10323,8 @@ Date: 2008-01-23 13:15:55 +0200 Fix a memory leak in metadata_decoder.c. - src/liblzma/common/metadata_decoder.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/common/metadata_decoder.c | 1 + + 1 file changed, 1 insertion(+) commit 4d8cdbdab44400fd98f0f18a0f701e27cd1acdae Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9333,8 +10333,8 @@ Date: 2008-01-23 13:13:58 +0200 Fix the fix 863028cb7ad6d8d0455fa69348f56b376d7b908f which just moved to problem. Now it's really fixed. - src/liblzma/common/info.c | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + src/liblzma/common/info.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) commit 67321de963ccf69410b3868b8e31534fe18a90de Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9343,8 +10343,8 @@ Date: 2008-01-23 00:21:04 +0200 Take advantage of return_if_error() macro in lzma_info_metadata_set() in info.c. - src/liblzma/common/info.c | 24 ++++++++---------------- - 1 files changed, 8 insertions(+), 16 deletions(-) + src/liblzma/common/info.c | 24 ++++++++---------------- + 1 file changed, 8 insertions(+), 16 deletions(-) commit 863028cb7ad6d8d0455fa69348f56b376d7b908f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9352,8 +10352,8 @@ Date: 2008-01-23 00:18:32 +0200 Fixed a dangling pointer that caused invalid free(). - src/liblzma/common/info.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/liblzma/common/info.c | 1 + + 1 file changed, 1 insertion(+) commit cf49f42a6bd40143f54a6b10d6e605599e958c0b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9366,15 +10366,15 @@ Date: 2008-01-22 22:49:24 +0200 Note that Multi-Block Stream encoding is currently broken. The easy API should be OK, the bug(s) are elsewhere. - src/liblzma/api/Makefile.am | 1 + - src/liblzma/api/lzma.h | 1 + - src/liblzma/common/Makefile.am | 5 ++ - src/liblzma/common/easy_common.c | 54 +++++++++++++++ - src/liblzma/common/easy_common.h | 28 ++++++++ - src/liblzma/common/easy_multi.c | 103 +++++++++++++++++++++++++++++ - src/liblzma/common/easy_single.c | 37 ++++++++++ - src/liblzma/common/stream_encoder_multi.c | 3 +- - src/liblzma/common/stream_encoder_multi.h | 26 +++++++ + src/liblzma/api/Makefile.am | 1 + + src/liblzma/api/lzma.h | 1 + + src/liblzma/common/Makefile.am | 5 ++ + src/liblzma/common/easy_common.c | 54 ++++++++++++++++ + src/liblzma/common/easy_common.h | 28 ++++++++ + src/liblzma/common/easy_multi.c | 103 ++++++++++++++++++++++++++++++ + src/liblzma/common/easy_single.c | 37 +++++++++++ + src/liblzma/common/stream_encoder_multi.c | 3 +- + src/liblzma/common/stream_encoder_multi.h | 26 ++++++++ 9 files changed, 256 insertions(+), 2 deletions(-) commit 1747b85a43abc1c3f152dbd349be2ef4089ecf6a @@ -9383,8 +10383,8 @@ Date: 2008-01-22 21:16:22 +0200 Fix Multi-Block Stream encoder's EOPM usage. - src/liblzma/common/stream_encoder_multi.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/stream_encoder_multi.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 0ed6f1adcea540fb9593ca115d36de537f7f0dc6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9392,8 +10392,8 @@ Date: 2008-01-22 00:15:11 +0200 Made lzma_extra pointers const in lzma_options_stream. - src/liblzma/api/lzma/stream.h | 4 ++-- - src/liblzma/common/stream_encoder_multi.c | 8 ++++++-- + src/liblzma/api/lzma/stream.h | 4 ++-- + src/liblzma/common/stream_encoder_multi.c | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) commit 305afa38f64c75af8e81c4167e2d8fa8d85b53a4 @@ -9402,8 +10402,8 @@ Date: 2008-01-20 20:15:21 +0200 Updated debug/sync_flush.c. - debug/sync_flush.c | 26 ++++++++++++++++++++++++-- - 1 files changed, 24 insertions(+), 2 deletions(-) + debug/sync_flush.c | 26 ++++++++++++++++++++++++-- + 1 file changed, 24 insertions(+), 2 deletions(-) commit d53e9b77054cfade6a643e77d085273a348b189c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9411,9 +10411,9 @@ Date: 2008-01-20 20:14:26 +0200 Added debug/repeat.c. - debug/Makefile.am | 1 + - debug/repeat.c | 43 +++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 44 insertions(+), 0 deletions(-) + debug/Makefile.am | 1 + + debug/repeat.c | 43 +++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 44 insertions(+) commit 107259e306bcfc2336a0fb870fb58034c28faa52 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9435,8 +10435,8 @@ Date: 2008-01-20 20:12:58 +0200 misaligned data (no data corruption), this bug simply isn't worth fixing, because a proper fix isn't simple. - src/liblzma/subblock/subblock_encoder.c | 170 +++++++++++++++++++++--------- - 1 files changed, 119 insertions(+), 51 deletions(-) + src/liblzma/subblock/subblock_encoder.c | 170 ++++++++++++++++++++++---------- + 1 file changed, 119 insertions(+), 51 deletions(-) commit e141fe18950400faaa3503ff88ac20eacd73e88c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9449,8 +10449,8 @@ Date: 2008-01-19 21:16:33 +0200 A few sanity checks were added for Subfilter handling. Some small bugs were fixed. More comments were added. - src/liblzma/api/lzma/subblock.h | 29 ++-- - src/liblzma/subblock/subblock_encoder.c | 263 +++++++++++++++++++++++-------- + src/liblzma/api/lzma/subblock.h | 29 ++-- + src/liblzma/subblock/subblock_encoder.c | 263 ++++++++++++++++++++++++-------- 2 files changed, 214 insertions(+), 78 deletions(-) commit 23c227a864a3b69f38c6a74306161d4e6918d1cc @@ -9472,17 +10472,17 @@ Date: 2008-01-19 15:19:21 +0200 Support for LZMA_SYNC_FLUSH was added to the Delta encoder. This doesn't change anything in the file format. - src/liblzma/common/Makefile.am | 14 +++- - src/liblzma/common/delta_coder.c | 189 ------------------------------------ - src/liblzma/common/delta_coder.h | 31 ------ - src/liblzma/common/delta_common.c | 70 +++++++++++++ - src/liblzma/common/delta_common.h | 48 +++++++++ - src/liblzma/common/delta_decoder.c | 102 +++++++++++++++++++ - src/liblzma/common/delta_decoder.h | 28 ++++++ - src/liblzma/common/delta_encoder.c | 97 ++++++++++++++++++ - src/liblzma/common/delta_encoder.h | 28 ++++++ - src/liblzma/common/raw_decoder.c | 2 +- - src/liblzma/common/raw_encoder.c | 2 +- + src/liblzma/common/Makefile.am | 14 ++- + src/liblzma/common/delta_coder.c | 189 ------------------------------------- + src/liblzma/common/delta_coder.h | 31 ------ + src/liblzma/common/delta_common.c | 70 ++++++++++++++ + src/liblzma/common/delta_common.h | 48 ++++++++++ + src/liblzma/common/delta_decoder.c | 102 ++++++++++++++++++++ + src/liblzma/common/delta_decoder.h | 28 ++++++ + src/liblzma/common/delta_encoder.c | 97 +++++++++++++++++++ + src/liblzma/common/delta_encoder.h | 28 ++++++ + src/liblzma/common/raw_decoder.c | 2 +- + src/liblzma/common/raw_encoder.c | 2 +- 11 files changed, 387 insertions(+), 224 deletions(-) commit 61dc82f3e306b25ce3cd3d529df9ec7a0ec04b73 @@ -9493,12 +10493,12 @@ Date: 2008-01-18 20:18:08 +0200 (sync_flush). These tools are not built unless the user runs "make" in the debug directory. - Makefile.am | 1 + - configure.ac | 1 + - debug/Makefile.am | 30 +++++++++++++ - debug/README | 17 ++++++++ - debug/sync_flush.c | 116 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 165 insertions(+), 0 deletions(-) + Makefile.am | 1 + + configure.ac | 1 + + debug/Makefile.am | 30 ++++++++++++++ + debug/README | 17 ++++++++ + debug/sync_flush.c | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 5 files changed, 165 insertions(+) commit 0ae3208db94585eb8294b97ded387de0a3a07646 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9506,12 +10506,12 @@ Date: 2008-01-18 20:13:00 +0200 Added test files to test usage of flush marker in LZMA. - tests/files/README | 12 ++++++++++++ - tests/files/bad-single-lzma-flush_beginning.lzma | Bin 0 -> 53 bytes - tests/files/bad-single-lzma-flush_twice.lzma | Bin 0 -> 63 bytes - tests/files/good-single-lzma-flush_1.lzma | Bin 0 -> 48 bytes - tests/files/good-single-lzma-flush_2.lzma | Bin 0 -> 63 bytes - 5 files changed, 12 insertions(+), 0 deletions(-) + tests/files/README | 12 ++++++++++++ + tests/files/bad-single-lzma-flush_beginning.lzma | Bin 0 -> 53 bytes + tests/files/bad-single-lzma-flush_twice.lzma | Bin 0 -> 63 bytes + tests/files/good-single-lzma-flush_1.lzma | Bin 0 -> 48 bytes + tests/files/good-single-lzma-flush_2.lzma | Bin 0 -> 63 bytes + 5 files changed, 12 insertions(+) commit ab5feaf1fcc146ef9fd39360c53c290bec39524e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9522,9 +10522,9 @@ Date: 2008-01-18 20:02:52 +0200 it can be shared with other LZ77-based algorithms in future. - src/liblzma/lz/lz_encoder.c | 34 ++++++++++++++++++++++++++-------- - src/liblzma/lz/lz_encoder.h | 1 + - src/liblzma/lzma/lzma_encoder.c | 27 ++------------------------- + src/liblzma/lz/lz_encoder.c | 34 ++++++++++++++++++++++++++-------- + src/liblzma/lz/lz_encoder.h | 1 + + src/liblzma/lzma/lzma_encoder.c | 27 ++------------------------- 3 files changed, 29 insertions(+), 33 deletions(-) commit 079c4f7fc26b3d0b33d9ae7536697b45f3b73585 @@ -9534,8 +10534,8 @@ Date: 2008-01-18 17:21:24 +0200 Don't add -g to CFLAGS when --enable-debug is specified. It's the job of the user to put that in CFLAGS. - configure.ac | 1 - - 1 files changed, 0 insertions(+), 1 deletions(-) + configure.ac | 1 - + 1 file changed, 1 deletion(-) commit 61d1784d8f1761d979a6da6e223e279ca33815e6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9546,8 +10546,8 @@ Date: 2008-01-18 14:17:37 +0200 from lzma-utils-legacy.git. I don't know if the new code base builds on Windows, but this is a start. - src/lzmadec/lzmadec.c | 9 +++++++++ - 1 files changed, 9 insertions(+), 0 deletions(-) + src/lzmadec/lzmadec.c | 9 +++++++++ + 1 file changed, 9 insertions(+) commit c9cba976913e55ff9aac8a8133cc94416c7c1c9c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9558,12 +10558,12 @@ Date: 2008-01-18 00:50:29 +0200 test files with many different compression options. This set of tests will be extended later. - tests/Makefile.am | 30 ++++-- - tests/bcj_test.c | 66 +++++++++++++ - tests/compress_prepared_bcj_sparc | Bin 0 -> 6804 bytes - tests/compress_prepared_bcj_x86 | Bin 0 -> 4649 bytes - tests/create_compress_files.c | 164 +++++++++++++++++++++++++++++++++ - tests/test_compress.sh | 183 +++++++++++++++++++++++++++++++++++++ + tests/Makefile.am | 30 ++++--- + tests/bcj_test.c | 66 ++++++++++++++ + tests/compress_prepared_bcj_sparc | Bin 0 -> 6804 bytes + tests/compress_prepared_bcj_x86 | Bin 0 -> 4649 bytes + tests/create_compress_files.c | 164 ++++++++++++++++++++++++++++++++++ + tests/test_compress.sh | 183 ++++++++++++++++++++++++++++++++++++++ 6 files changed, 433 insertions(+), 10 deletions(-) commit 33be3c0e24d8f43376ccf71cc77d53671e792f07 @@ -9581,8 +10581,8 @@ Date: 2008-01-17 18:56:53 +0200 moved around. This made the diff big and ugly compared to the amount of the actual changes made. - src/liblzma/subblock/subblock_decoder.c | 272 ++++++++++++++++--------------- - 1 files changed, 139 insertions(+), 133 deletions(-) + src/liblzma/subblock/subblock_decoder.c | 272 ++++++++++++++++---------------- + 1 file changed, 139 insertions(+), 133 deletions(-) commit b254bd97b1cdb68d127523d91ca9e054ed89c4fd Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9595,8 +10595,8 @@ Date: 2008-01-17 17:39:42 +0200 This error was probably a copypaste mistake, since most of the simple filters use unfiltered_max = 4. - src/liblzma/simple/ia64.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/simple/ia64.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 8f5794c8f1a30e8e3b524b415bbe81af2e04c64a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9604,8 +10604,8 @@ Date: 2008-01-17 17:27:45 +0200 Added --delta to the output of "lzma --help". - src/lzma/help.c | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/lzma/help.c | 4 ++++ + 1 file changed, 4 insertions(+) commit f88590e0014b38d40465937c19f25f05f16c79ae Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9615,8 +10615,8 @@ Date: 2008-01-17 13:14:20 +0200 Uncompressed Size, and the last output byte was from RLE, the code didn't stop decoding as it should have done. - src/liblzma/subblock/subblock_decoder.c | 6 ++++++ - 1 files changed, 6 insertions(+), 0 deletions(-) + src/liblzma/subblock/subblock_decoder.c | 6 ++++++ + 1 file changed, 6 insertions(+) commit bc0b945ca376e333077644d2f7fd54c2848aab8a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9624,8 +10624,8 @@ Date: 2008-01-16 16:33:37 +0200 Tiny non-technical edits to file-format.txt. - doc/file-format.txt | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + doc/file-format.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 7599bb7064ccf007f054595dedda7927af868252 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9633,8 +10633,8 @@ Date: 2008-01-16 14:48:04 +0200 Plugged a memory leak in stream_decoder.c. - src/liblzma/common/stream_decoder.c | 20 ++++++++++++++++++++ - 1 files changed, 20 insertions(+), 0 deletions(-) + src/liblzma/common/stream_decoder.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) commit 0b581539311f3712946e81e747839f8fb5f441a7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9642,8 +10642,8 @@ Date: 2008-01-16 14:47:27 +0200 Added memory leak detection to lzmadec.c. - src/lzmadec/lzmadec.c | 3 +++ - 1 files changed, 3 insertions(+), 0 deletions(-) + src/lzmadec/lzmadec.c | 3 +++ + 1 file changed, 3 insertions(+) commit 5b5b13c7bb8fde6331064d21f3ebde41072480c4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9651,9 +10651,9 @@ Date: 2008-01-16 14:46:50 +0200 Added lzma_memlimit_count(). - src/liblzma/api/lzma/memlimit.h | 10 ++++++++++ - src/liblzma/common/memory_limitter.c | 19 +++++++++++++++++++ - 2 files changed, 29 insertions(+), 0 deletions(-) + src/liblzma/api/lzma/memlimit.h | 10 ++++++++++ + src/liblzma/common/memory_limitter.c | 19 +++++++++++++++++++ + 2 files changed, 29 insertions(+) commit 19389f2b82ec54fd4c847a18f16482e7be4c9887 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9661,8 +10661,8 @@ Date: 2008-01-16 14:31:44 +0200 Added ARRAY_SIZE(array) macro. - src/common/sysdefs.h | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + src/common/sysdefs.h | 4 ++++ + 1 file changed, 4 insertions(+) commit 9bc33a54cbf83952130adbcb1be32c6882485416 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9671,8 +10671,8 @@ Date: 2008-01-16 13:27:03 +0200 Make Uncompresed Size validation more strict in alone_decoder.c. - src/liblzma/common/alone_decoder.c | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + src/liblzma/common/alone_decoder.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 01d71d60b79027e1ce3eb9c79ae5191e1407c883 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9682,8 +10682,8 @@ Date: 2008-01-15 17:46:59 +0200 enabled. This should make it possible to detect possible memory leaks with Valgrind. - src/lzmadec/lzmadec.c | 7 +++++++ - 1 files changed, 7 insertions(+), 0 deletions(-) + src/lzmadec/lzmadec.c | 7 +++++++ + 1 file changed, 7 insertions(+) commit 8235e6e5b2878f76633afcda9a334640db503ef5 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9691,8 +10691,8 @@ Date: 2008-01-15 16:25:38 +0200 Fix memory leaks from test_block_header.c. - tests/test_block_header.c | 19 +++++++++++++++++-- - 1 files changed, 17 insertions(+), 2 deletions(-) + tests/test_block_header.c | 19 +++++++++++++++++-- + 1 file changed, 17 insertions(+), 2 deletions(-) commit f10fc6a69d40b6d5c9cfbf8d3746f49869c2e2f6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9701,8 +10701,8 @@ Date: 2008-01-15 14:23:35 +0200 Use fastpos.h when encoding LZMA dictionary size in Filter Flags encoder. - src/liblzma/common/filter_flags_encoder.c | 40 +++++++++++++--------------- - 1 files changed, 19 insertions(+), 21 deletions(-) + src/liblzma/common/filter_flags_encoder.c | 40 +++++++++++++++---------------- + 1 file changed, 19 insertions(+), 21 deletions(-) commit e5728142a2048979f5c0c2149ce71ae952a092e1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9717,16 +10717,16 @@ Date: 2008-01-15 14:02:22 +0200 default table-based version (see comments in fastpos.h), but on most systems the table-based code is faster. - src/liblzma/common/init_encoder.c | 3 - - src/liblzma/lzma/Makefile.am | 4 + - src/liblzma/lzma/fastpos.h | 156 +++++++++ - src/liblzma/lzma/fastpos_table.c | 519 ++++++++++++++++++++++++++++ - src/liblzma/lzma/fastpos_tablegen.c | 63 ++++ - src/liblzma/lzma/lzma_common.h | 3 +- - src/liblzma/lzma/lzma_encoder.c | 1 + - src/liblzma/lzma/lzma_encoder_getoptimum.c | 1 + - src/liblzma/lzma/lzma_encoder_init.c | 22 -- - src/liblzma/lzma/lzma_encoder_private.h | 21 -- + src/liblzma/common/init_encoder.c | 3 - + src/liblzma/lzma/Makefile.am | 4 + + src/liblzma/lzma/fastpos.h | 156 +++++++++ + src/liblzma/lzma/fastpos_table.c | 519 +++++++++++++++++++++++++++++ + src/liblzma/lzma/fastpos_tablegen.c | 63 ++++ + src/liblzma/lzma/lzma_common.h | 3 +- + src/liblzma/lzma/lzma_encoder.c | 1 + + src/liblzma/lzma/lzma_encoder_getoptimum.c | 1 + + src/liblzma/lzma/lzma_encoder_init.c | 22 -- + src/liblzma/lzma/lzma_encoder_private.h | 21 -- 10 files changed, 746 insertions(+), 47 deletions(-) commit 10437b5b567f6a025ff16c45a572e417a0a9cc26 @@ -9735,9 +10735,9 @@ Date: 2008-01-15 13:32:13 +0200 Added bsr.h. - src/liblzma/common/Makefile.am | 1 + - src/liblzma/common/bsr.h | 61 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 62 insertions(+), 0 deletions(-) + src/liblzma/common/Makefile.am | 1 + + src/liblzma/common/bsr.h | 61 ++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 62 insertions(+) commit f3c88e8b8d8dd57f4bba5f0921eebf276437c244 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9746,8 +10746,8 @@ Date: 2008-01-15 13:29:14 +0200 Fixed assembler detection in configure.ac, and added detection for x86_64. - configure.ac | 32 ++++++++++++++++---------------- - 1 files changed, 16 insertions(+), 16 deletions(-) + configure.ac | 32 ++++++++++++++++---------------- + 1 file changed, 16 insertions(+), 16 deletions(-) commit 54ec204f58287f50d3976288295da4188a19192b Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9756,8 +10756,8 @@ Date: 2008-01-15 12:20:41 +0200 Omit invalid space from printf() format string in price_table_gen.c. - src/liblzma/rangecoder/price_table_gen.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/rangecoder/price_table_gen.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 01b4b19f49f00e17a0f9cb8754c672ac0847b6e1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9765,8 +10765,8 @@ Date: 2008-01-15 09:54:34 +0200 Removed a few unused macros from lzma_common.h. - src/liblzma/lzma/lzma_common.h | 8 ++------ - 1 files changed, 2 insertions(+), 6 deletions(-) + src/liblzma/lzma/lzma_common.h | 8 ++------ + 1 file changed, 2 insertions(+), 6 deletions(-) commit 19bd7f3cf25e4ff8487ef7098ca4a7b58681961d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9774,8 +10774,8 @@ Date: 2008-01-15 08:37:42 +0200 Fix a typo in lzma_encoder.c. - src/liblzma/lzma/lzma_encoder.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/lzma/lzma_encoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9f9b1983013048f2142e8bc7e240149d2687bedc Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9784,9 +10784,9 @@ Date: 2008-01-15 08:36:25 +0200 Convert bittree_get_price() and bittree_reverse_get_price() from macros to inline functions. - src/liblzma/lzma/lzma_encoder.c | 19 +++---- - src/liblzma/lzma/lzma_encoder_getoptimum.c | 16 ++---- - src/liblzma/rangecoder/range_encoder.h | 76 ++++++++++++++++------------ + src/liblzma/lzma/lzma_encoder.c | 19 +++----- + src/liblzma/lzma/lzma_encoder_getoptimum.c | 16 +++---- + src/liblzma/rangecoder/range_encoder.h | 76 +++++++++++++++++------------- 3 files changed, 56 insertions(+), 55 deletions(-) commit 78e85cb1a7667c54853670d2eb09d754bcbda87d @@ -9795,11 +10795,11 @@ Date: 2008-01-15 07:44:59 +0200 Fix CRC code in case --enable-small is used. - src/liblzma/check/crc32_init.c | 2 +- - src/liblzma/check/crc64_init.c | 2 +- - src/liblzma/common/init_decoder.c | 2 -- - src/liblzma/common/init_encoder.c | 2 -- - tests/test_check.c | 2 ++ + src/liblzma/check/crc32_init.c | 2 +- + src/liblzma/check/crc64_init.c | 2 +- + src/liblzma/common/init_decoder.c | 2 -- + src/liblzma/common/init_encoder.c | 2 -- + tests/test_check.c | 2 ++ 5 files changed, 4 insertions(+), 6 deletions(-) commit 949d4346e2d75bcd9dcb66c394d8d851d8db3aa0 @@ -9808,8 +10808,8 @@ Date: 2008-01-15 07:41:39 +0200 Fix typo in test_index.c. - tests/test_index.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/test_index.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit d13d693155c176fc9e9ad5c50d48ccba27c2d9c6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9817,14 +10817,14 @@ Date: 2008-01-15 07:40:21 +0200 Added precomputed range coder probability price table. - src/liblzma/common/init_encoder.c | 5 +- - src/liblzma/rangecoder/Makefile.am | 9 +++- - src/liblzma/rangecoder/price_table.c | 70 +++++++++++++++++++++++++++++ - src/liblzma/rangecoder/price_table_gen.c | 55 ++++++++++++++++++++++ - src/liblzma/rangecoder/price_table_init.c | 48 ++++++++++++++++++++ - src/liblzma/rangecoder/range_common.h | 4 +- - src/liblzma/rangecoder/range_encoder.c | 46 ------------------- - src/liblzma/rangecoder/range_encoder.h | 21 ++++----- + src/liblzma/common/init_encoder.c | 5 ++- + src/liblzma/rangecoder/Makefile.am | 9 +++- + src/liblzma/rangecoder/price_table.c | 70 +++++++++++++++++++++++++++++++ + src/liblzma/rangecoder/price_table_gen.c | 55 ++++++++++++++++++++++++ + src/liblzma/rangecoder/price_table_init.c | 48 +++++++++++++++++++++ + src/liblzma/rangecoder/range_common.h | 4 +- + src/liblzma/rangecoder/range_encoder.c | 46 -------------------- + src/liblzma/rangecoder/range_encoder.h | 21 +++++----- 8 files changed, 197 insertions(+), 61 deletions(-) commit 362dc3843b373c1007a50a4719f378981f18ae03 @@ -9834,8 +10834,8 @@ Date: 2008-01-14 13:42:43 +0200 Remove RC_BUFFER_SIZE from lzma_encoder_private.h and replace it with a sanity check. - src/liblzma/lzma/lzma_encoder_private.h | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) + src/liblzma/lzma/lzma_encoder_private.h | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) commit e22b37968d153683fec61ad37b6b160cb7ca4ddc Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9846,10 +10846,10 @@ Date: 2008-01-14 13:39:54 +0200 encoder, and move the temporary buffer needed by range encoder from lzma_range_encoder structure to lzma_lz_encoder. - src/liblzma/lz/lz_encoder.c | 138 +++++++++++++++++++++++++++----- - src/liblzma/lz/lz_encoder.h | 17 +++- - src/liblzma/lzma/lzma_encoder.c | 74 ++++++++++------- - src/liblzma/rangecoder/range_encoder.h | 117 ++++++++------------------- + src/liblzma/lz/lz_encoder.c | 138 ++++++++++++++++++++++++++++----- + src/liblzma/lz/lz_encoder.h | 17 ++-- + src/liblzma/lzma/lzma_encoder.c | 74 ++++++++++-------- + src/liblzma/rangecoder/range_encoder.h | 117 ++++++++-------------------- 4 files changed, 206 insertions(+), 140 deletions(-) commit b59ef3973781f892c0a72b5e5934194567100be5 @@ -9858,8 +10858,8 @@ Date: 2008-01-14 13:34:29 +0200 Added one assert() to process.c of the command line tool. - src/lzma/process.c | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + src/lzma/process.c | 1 + + 1 file changed, 1 insertion(+) commit 9547e734a00ddb64c851fa3f116e4f9e7d763ea7 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9868,8 +10868,8 @@ Date: 2008-01-14 12:09:52 +0200 Don't use coder->lz.stream_end_was_reached in assertions in match_c.h. - src/liblzma/lz/match_c.h | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) + src/liblzma/lz/match_c.h | 2 -- + 1 file changed, 2 deletions(-) commit 3e09e1c05871f3757f759b801890ccccc9286608 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9881,8 +10881,8 @@ Date: 2008-01-14 12:08:02 +0200 Rearrange the check so that it doesn't make one to think that there could be an integer overflow. - src/liblzma/lzma/lzma_encoder_private.h | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/liblzma/lzma/lzma_encoder_private.h | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit a670fec8021e5962429689c194148a04c3418872 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9890,8 +10890,8 @@ Date: 2008-01-14 11:56:41 +0200 Small LZMA_SYNC_FLUSH fixes to Block and Single-Stream encoders. - src/liblzma/common/block_encoder.c | 4 ++-- - src/liblzma/common/stream_encoder_single.c | 1 + + src/liblzma/common/block_encoder.c | 4 ++-- + src/liblzma/common/stream_encoder_single.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) commit 3599dba9570a6972a16b6398d6c838e9b420e985 @@ -9900,8 +10900,8 @@ Date: 2008-01-14 11:54:56 +0200 More fixes to LZMA decoder's flush marker handling. - src/liblzma/lzma/lzma_decoder.c | 52 ++++++++++++++++++++++---------------- - 1 files changed, 30 insertions(+), 22 deletions(-) + src/liblzma/lzma/lzma_decoder.c | 52 ++++++++++++++++++++++++----------------- + 1 file changed, 30 insertions(+), 22 deletions(-) commit f73c2ab6079ed5675a42b39d584a567befbd4624 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9910,8 +10910,8 @@ Date: 2008-01-10 17:13:42 +0200 Eliminate lzma_lz_encoder.must_move_pos. It's needed only in one place which isn't performance criticial. - src/liblzma/lz/lz_encoder.c | 6 ++---- - src/liblzma/lz/lz_encoder.h | 4 ---- + src/liblzma/lz/lz_encoder.c | 6 ++---- + src/liblzma/lz/lz_encoder.h | 4 ---- 2 files changed, 2 insertions(+), 8 deletions(-) commit 382808514a42b2f4b4a64515e2dfb3fc1bc48ecd @@ -9921,8 +10921,8 @@ Date: 2008-01-09 20:05:57 +0200 Define HAVE_ASM_X86 when x86 assembler optimizations are used. This #define will be useful for inline assembly. - configure.ac | 5 ++++- - 1 files changed, 4 insertions(+), 1 deletions(-) + configure.ac | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) commit 0e70fbe4032351aab13a1cd8e5deced105c0b276 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9931,10 +10931,10 @@ Date: 2008-01-09 12:06:46 +0200 Added good-single-none-empty_3.lzma and bad-single-none-empty.lzma. - tests/files/README | 6 ++++++ - tests/files/bad-single-none-empty.lzma | Bin 0 -> 19 bytes - tests/files/good-single-none-empty_3.lzma | Bin 0 -> 19 bytes - 3 files changed, 6 insertions(+), 0 deletions(-) + tests/files/README | 6 ++++++ + tests/files/bad-single-none-empty.lzma | Bin 0 -> 19 bytes + tests/files/good-single-none-empty_3.lzma | Bin 0 -> 19 bytes + 3 files changed, 6 insertions(+) commit 379fbbe84d922c7cc00afa65c6f0c095da596b19 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9942,8 +10942,8 @@ Date: 2008-01-08 23:11:59 +0200 Take advantage of return_if_error() in block_decoder.c. - src/liblzma/common/block_decoder.c | 23 +++++++---------------- - 1 files changed, 7 insertions(+), 16 deletions(-) + src/liblzma/common/block_decoder.c | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) commit 97d5fa82077e57815dfad995dc393c2809a78539 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9951,8 +10951,8 @@ Date: 2008-01-08 23:10:57 +0200 Updated tests/files/README. - tests/files/README | 15 +++++++++------ - 1 files changed, 9 insertions(+), 6 deletions(-) + tests/files/README | 15 +++++++++------ + 1 file changed, 9 insertions(+), 6 deletions(-) commit 3bb9bb310936cba6a743b4f06739a397dec7c28f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9960,11 +10960,11 @@ Date: 2008-01-08 23:05:40 +0200 Added test files with empty Compressed Data. - tests/files/README | 6 ++++++ - tests/files/good-single-lzma-empty.lzma | Bin 0 -> 21 bytes - tests/files/good-single-none-empty_1.lzma | Bin 0 -> 18 bytes - tests/files/good-single-none-empty_2.lzma | Bin 0 -> 26 bytes - 4 files changed, 6 insertions(+), 0 deletions(-) + tests/files/README | 6 ++++++ + tests/files/good-single-lzma-empty.lzma | Bin 0 -> 21 bytes + tests/files/good-single-none-empty_1.lzma | Bin 0 -> 18 bytes + tests/files/good-single-none-empty_2.lzma | Bin 0 -> 26 bytes + 4 files changed, 6 insertions(+) commit 7054c5f5888ac6a7178cd43dc9583ce6c7e78c9f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9972,8 +10972,8 @@ Date: 2008-01-08 22:58:42 +0200 Fix decoding of Blocks that have only Block Header. - src/liblzma/common/block_decoder.c | 37 +++++++++++++---------------------- - 1 files changed, 14 insertions(+), 23 deletions(-) + src/liblzma/common/block_decoder.c | 37 ++++++++++++++----------------------- + 1 file changed, 14 insertions(+), 23 deletions(-) commit 753e4d95cd1cf29c632dfe1a670af7c67aeffbf4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9981,9 +10981,9 @@ Date: 2008-01-08 22:27:46 +0200 Added good-single-subblock_implicit.lzma. - tests/files/README | 2 ++ - tests/files/good-single-subblock_implicit.lzma | Bin 0 -> 35 bytes - 2 files changed, 2 insertions(+), 0 deletions(-) + tests/files/README | 2 ++ + tests/files/good-single-subblock_implicit.lzma | Bin 0 -> 35 bytes + 2 files changed, 2 insertions(+) commit faeac7b7aca75f86afed1e7cc06279d9d497c627 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -9992,8 +10992,8 @@ Date: 2008-01-08 18:50:30 +0200 Disable CRC32 from Block Headers when --check=none has been specified. - src/lzma/process.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzma/process.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit a751126dbb656767ed4666cf0e5d3e17349d93d1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10002,8 +11002,8 @@ Date: 2008-01-08 13:36:29 +0200 Fixed encoding of empty files. Arguments to is_size_valid() were in wrong order in block_encoder.c. - src/liblzma/common/block_encoder.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/common/block_encoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 9080267603b1006c4867c823307dca9df8be0d20 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10011,13 +11011,13 @@ Date: 2008-01-08 13:35:36 +0200 Added a few test files. - tests/files/README | 21 +++++++++++++++++-- - tests/files/bad-cat-single-none-pad_garbage_1.lzma | Bin 0 -> 65 bytes - tests/files/bad-cat-single-none-pad_garbage_2.lzma | Bin 0 -> 65 bytes - tests/files/bad-cat-single-none-pad_garbage_3.lzma | Bin 0 -> 65 bytes - tests/files/bad-single-data_after_eopm.lzma | Bin 55 -> 0 bytes - tests/files/bad-single-data_after_eopm_1.lzma | Bin 0 -> 55 bytes - tests/files/bad-single-none-truncated.lzma | Bin 0 -> 29 bytes + tests/files/README | 21 ++++++++++++++++++--- + tests/files/bad-cat-single-none-pad_garbage_1.lzma | Bin 0 -> 65 bytes + tests/files/bad-cat-single-none-pad_garbage_2.lzma | Bin 0 -> 65 bytes + tests/files/bad-cat-single-none-pad_garbage_3.lzma | Bin 0 -> 65 bytes + tests/files/bad-single-data_after_eopm.lzma | Bin 55 -> 0 bytes + tests/files/bad-single-data_after_eopm_1.lzma | Bin 0 -> 55 bytes + tests/files/bad-single-none-truncated.lzma | Bin 0 -> 29 bytes 7 files changed, 18 insertions(+), 3 deletions(-) commit b4943ccf73b64fc93a90a23474509c316f55eb2b @@ -10027,8 +11027,8 @@ Date: 2008-01-08 12:29:58 +0200 Avoid using ! in test_files.sh, because that doesn't work with some ancient /bin/sh versions. - tests/test_files.sh | 4 +++- - 1 files changed, 3 insertions(+), 1 deletions(-) + tests/test_files.sh | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) commit e2417b2b9134f3f65e14b61e23cd3644d8954353 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10037,11 +11037,11 @@ Date: 2008-01-08 00:48:30 +0200 More pre-C99 inttypes.h compatibility fixes. Now the code should work even if the system has no inttypes.h. - src/common/physmem.h | 11 ----------- - src/liblzma/check/crc32_init.c | 5 +---- - src/liblzma/check/crc32_tablegen.c | 7 ++----- - src/liblzma/check/crc64_init.c | 5 +---- - src/liblzma/check/crc64_tablegen.c | 7 ++----- + src/common/physmem.h | 11 ----------- + src/liblzma/check/crc32_init.c | 5 +---- + src/liblzma/check/crc32_tablegen.c | 7 ++----- + src/liblzma/check/crc64_init.c | 5 +---- + src/liblzma/check/crc64_tablegen.c | 7 ++----- 5 files changed, 6 insertions(+), 29 deletions(-) commit 5d227e51c23639423f4ade06aabb54e131f8505e @@ -10050,8 +11050,8 @@ Date: 2008-01-07 23:25:32 +0200 Updated fi.po although it's currently pretty much crap. - po/fi.po | 12 ++++++------ - 1 files changed, 6 insertions(+), 6 deletions(-) + po/fi.po | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) commit c7189d981a1b27c63da0c1ee80d9b5cd8ce1733d Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10061,8 +11061,8 @@ Date: 2008-01-07 23:14:25 +0200 way it is possible to use ac_cv_c_compiler_gnu=no to force configure to think it is using non-GNU C compiler. - configure.ac | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 3dbbea82b74bb841c995ad332a3aeca613015e10 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10071,8 +11071,8 @@ Date: 2008-01-07 21:49:41 +0200 Added test_files.sh to tests/Makefile.am so it gets included in the tarball with "make dist". - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2fd2d181543feab1b4003f3ac6e85625fbee04f0 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10080,8 +11080,8 @@ Date: 2008-01-07 18:22:24 +0200 Cosmetic edit to test_files.sh. - tests/test_files.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) + tests/test_files.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) commit 9a71d573100a990ceb30ce0bec6a9a15d795605f Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10089,8 +11089,8 @@ Date: 2008-01-07 18:09:44 +0200 Added tests/files/README. - tests/files/README | 108 ++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 files changed, 108 insertions(+), 0 deletions(-) + tests/files/README | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 108 insertions(+) commit 47f48fe9936ed72617a60fbd015df7e0e47a1e43 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10099,8 +11099,8 @@ Date: 2008-01-07 14:20:57 +0200 Tell in COPYING that everything in tests/files is public domain. - COPYING | 3 ++- - 1 files changed, 2 insertions(+), 1 deletions(-) + COPYING | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) commit 3502b3e1d00251d3c8dda96079440705c28d8225 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10108,11 +11108,11 @@ Date: 2008-01-07 14:19:05 +0200 Cleaned up the tests/files directory. - tests/files/bad-single-subblock-padding_loop.lzma | Bin 0 -> 43 bytes - tests/files/bad-single-subblock1023-slow.lzma | Bin 0 -> 7886 bytes - tests/files/malicious-single-subblock-loop.lzma | Bin 43 -> 0 bytes - tests/files/malicious-single-subblock-lzma.lzma | Bin 505 -> 0 bytes - .../files/malicious-single-subblock1023-slow.lzma | Bin 7886 -> 0 bytes + tests/files/bad-single-subblock-padding_loop.lzma | Bin 0 -> 43 bytes + tests/files/bad-single-subblock1023-slow.lzma | Bin 0 -> 7886 bytes + tests/files/malicious-single-subblock-loop.lzma | Bin 43 -> 0 bytes + tests/files/malicious-single-subblock-lzma.lzma | Bin 505 -> 0 bytes + tests/files/malicious-single-subblock1023-slow.lzma | Bin 7886 -> 0 bytes 5 files changed, 0 insertions(+), 0 deletions(-) commit 908b2ac604b9940369d7fe8a45e9eb6da5d2a24c @@ -10123,9 +11123,9 @@ Date: 2008-01-07 13:49:19 +0200 the tests/files directory. It doesn't test the malicious files yet. - tests/Makefile.am | 4 +++- - tests/test_files.sh | 40 ++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 43 insertions(+), 1 deletions(-) + tests/Makefile.am | 4 +++- + tests/test_files.sh | 40 ++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 43 insertions(+), 1 deletion(-) commit ecb2a6548f5978022a8fa931719dc575f5fd3bf6 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10133,8 +11133,8 @@ Date: 2008-01-07 11:23:13 +0200 Updated README regarding the assembler optimizations. - README | 10 +++++----- - 1 files changed, 5 insertions(+), 5 deletions(-) + README | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) commit eacb8050438d3e6146c86eb9732d3fb1ef1825cb Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10142,8 +11142,8 @@ Date: 2008-01-07 10:58:00 +0200 Updated THANKS. - THANKS | 1 + - 1 files changed, 1 insertions(+), 0 deletions(-) + THANKS | 1 + + 1 file changed, 1 insertion(+) commit 1239649f96132b18e3b7e2dd152ecf53a195caa8 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10151,8 +11151,8 @@ Date: 2008-01-06 21:47:17 +0200 Cosmetic changes to configure.ac. - configure.ac | 14 ++++++-------- - 1 files changed, 6 insertions(+), 8 deletions(-) + configure.ac | 14 ++++++-------- + 1 file changed, 6 insertions(+), 8 deletions(-) commit 88ee301ec2e4506a30ec7ac9aaa2288e2dcadd0e Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10162,8 +11162,8 @@ Date: 2008-01-06 19:46:38 +0200 Darwin has different ABI than GNU+Linux and Solaris, thus the assembler code doesn't assemble on Darwin. - configure.ac | 17 +++++++++++++++-- - 1 files changed, 15 insertions(+), 2 deletions(-) + configure.ac | 17 +++++++++++++++-- + 1 file changed, 15 insertions(+), 2 deletions(-) commit c15a7abf66e3a70792f7444115e484c7981c8284 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10172,8 +11172,8 @@ Date: 2008-01-06 19:45:27 +0200 With printf(), use PRIu64 with a cast to uint64_t instead of %zu, because some pre-C99 libc versions don't support %zu. - src/lzma/help.c | 13 +++++++------ - src/lzmadec/lzmadec.c | 6 ++++-- + src/lzma/help.c | 13 +++++++------ + src/lzmadec/lzmadec.c | 6 ++++-- 2 files changed, 11 insertions(+), 8 deletions(-) commit 4e7e54c4c522ab2f6a7abb92cefc4f707e9568fb @@ -10197,19 +11197,19 @@ Date: 2008-01-06 16:27:41 +0200 introducing lzma_uint32 and similar types, but that would just be an extra pain on modern systems. - configure.ac | 13 +++++++- - doc/liblzma-intro.txt | 10 +++++- - src/common/sysdefs.h | 59 +++++++++++++++++++++++++++++++++++- - src/liblzma/api/lzma.h | 40 ++++++++++++++++-------- - src/liblzma/check/crc32_table.c | 4 +-- - src/liblzma/check/crc32_table_be.h | 2 - - src/liblzma/check/crc32_table_le.h | 2 - - src/liblzma/check/crc32_tablegen.c | 1 - - src/liblzma/check/crc64_table.c | 4 +-- - src/liblzma/check/crc64_table_be.h | 2 - - src/liblzma/check/crc64_table_le.h | 2 - - src/liblzma/check/crc64_tablegen.c | 1 - - src/lzma/private.h | 1 - + configure.ac | 13 ++++++++- + doc/liblzma-intro.txt | 10 +++++-- + src/common/sysdefs.h | 59 +++++++++++++++++++++++++++++++++++++- + src/liblzma/api/lzma.h | 40 +++++++++++++++++--------- + src/liblzma/check/crc32_table.c | 4 +-- + src/liblzma/check/crc32_table_be.h | 2 -- + src/liblzma/check/crc32_table_le.h | 2 -- + src/liblzma/check/crc32_tablegen.c | 1 - + src/liblzma/check/crc64_table.c | 4 +-- + src/liblzma/check/crc64_table_be.h | 2 -- + src/liblzma/check/crc64_table_le.h | 2 -- + src/liblzma/check/crc64_tablegen.c | 1 - + src/lzma/private.h | 1 - 13 files changed, 106 insertions(+), 35 deletions(-) commit a71864f77dfb76b5d78a270641539947c312583a @@ -10218,8 +11218,8 @@ Date: 2008-01-05 19:57:00 +0200 Fix typo in comment (INT64_MAX -> UINT64_MAX). - src/liblzma/api/lzma/vli.h | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/api/lzma/vli.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 072927905a3b66281c6311b4b351caa501d8b73a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10227,8 +11227,8 @@ Date: 2008-01-05 19:42:04 +0200 Rearranged testing of GCC-specific flags. - configure.ac | 33 +++++++++++++++++++++++---------- - 1 files changed, 23 insertions(+), 10 deletions(-) + configure.ac | 33 +++++++++++++++++++++++---------- + 1 file changed, 23 insertions(+), 10 deletions(-) commit d160ee32598c6d1cd9054ef019e8c9331208b188 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10236,8 +11236,8 @@ Date: 2008-01-05 01:20:24 +0200 Another bug fix for flush marker detection. - src/liblzma/lzma/lzma_decoder.c | 10 +++++++++- - 1 files changed, 9 insertions(+), 1 deletions(-) + src/liblzma/lzma/lzma_decoder.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) commit fc67f79f607cbfa78c6f47a69dec098d8659b162 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10245,8 +11245,8 @@ Date: 2008-01-04 21:37:01 +0200 Fix stupid bugs in flush marker detection. - src/liblzma/lzma/lzma_decoder.c | 7 ++++--- - 1 files changed, 4 insertions(+), 3 deletions(-) + src/liblzma/lzma/lzma_decoder.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) commit 0029cbbabe87d491fc046a55a629a6d556010baa Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10264,8 +11264,8 @@ Date: 2008-01-04 21:30:33 +0200 if one wants to fit the code in 80 columns. This makes the code easier to read. - src/liblzma/lzma/lzma_common.h | 4 + - src/liblzma/lzma/lzma_decoder.c | 217 ++++++++++++++++++--------------------- + src/liblzma/lzma/lzma_common.h | 4 + + src/liblzma/lzma/lzma_decoder.c | 217 ++++++++++++++++++---------------------- 2 files changed, 104 insertions(+), 117 deletions(-) commit bbfd1f6ab058a7e661545205befcb7f70c5685ab @@ -10276,8 +11276,8 @@ Date: 2008-01-04 20:45:05 +0200 five input bytes) from LZMA decoder to range decoder header. Did the same for decoding of direct bits. - src/liblzma/lzma/lzma_decoder.c | 42 ++------------- - src/liblzma/rangecoder/range_decoder.h | 87 ++++++++++++++++++++++---------- + src/liblzma/lzma/lzma_decoder.c | 42 +++------------- + src/liblzma/rangecoder/range_decoder.h | 87 +++++++++++++++++++++++----------- 2 files changed, 66 insertions(+), 63 deletions(-) commit 5db745cd2a74f6ed2e52f5c716c08ed0daf17ebc @@ -10287,8 +11287,8 @@ Date: 2007-12-14 11:15:21 +0200 Added a note to README that --disable-assembler must be used on Darwin. - README | 4 ++++ - 1 files changed, 4 insertions(+), 0 deletions(-) + README | 4 ++++ + 1 file changed, 4 insertions(+) commit 44b333d4615b5aabc557a0e1b6bb0096da3fae24 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10299,11 +11299,11 @@ Date: 2007-12-14 10:07:10 +0200 which are not supported by some non-GNU assemblers (Solaris) that otherwise work with this code. - src/liblzma/check/Makefile.am | 4 +- - src/liblzma/check/crc32_x86.S | 217 +++++++++++++++++++++++++++++++++++++++++ - src/liblzma/check/crc32_x86.s | 217 ----------------------------------------- - src/liblzma/check/crc64_x86.S | 203 ++++++++++++++++++++++++++++++++++++++ - src/liblzma/check/crc64_x86.s | 203 -------------------------------------- + src/liblzma/check/Makefile.am | 4 +- + src/liblzma/check/crc32_x86.S | 217 ++++++++++++++++++++++++++++++++++++++++++ + src/liblzma/check/crc32_x86.s | 217 ------------------------------------------ + src/liblzma/check/crc64_x86.S | 203 +++++++++++++++++++++++++++++++++++++++ + src/liblzma/check/crc64_x86.s | 203 --------------------------------------- 5 files changed, 422 insertions(+), 422 deletions(-) commit ec1c82b2e82f395f6e8e19ac212a639644330cd7 @@ -10312,8 +11312,8 @@ Date: 2007-12-14 09:59:05 +0200 Fixed wrong symbol name in crc64_x86.s. - src/liblzma/check/crc64_x86.s | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/check/crc64_x86.s | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 2881570df6803eed2fe550af34574e8e61794804 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10322,8 +11322,8 @@ Date: 2007-12-14 09:53:24 +0200 Use .globl instead of .global in x86 assembler code for better portability. Still needs fixing the commenting. - src/liblzma/check/crc32_x86.s | 2 +- - src/liblzma/check/crc64_x86.s | 2 +- + src/liblzma/check/crc32_x86.s | 2 +- + src/liblzma/check/crc64_x86.s | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit 698470b8f33fc0e5f27dafa93b39b6dd5dde5a66 @@ -10335,8 +11335,8 @@ Date: 2007-12-13 20:14:37 +0200 required argument. Thanks to Fabio Pedretti for the bug report. - src/lzma/args.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/lzma/args.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 918bcb0e0728d2d976621e9f35b56f224f11d989 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10344,8 +11344,8 @@ Date: 2007-12-11 17:08:04 +0200 Removed uncompressed size tracking from Delta encoder too. - src/liblzma/common/delta_coder.c | 21 +++------------------ - 1 files changed, 3 insertions(+), 18 deletions(-) + src/liblzma/common/delta_coder.c | 21 +++------------------ + 1 file changed, 3 insertions(+), 18 deletions(-) commit 3e16d51dd645667b05ff826665b1fc353aa41cd9 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10367,9 +11367,9 @@ Date: 2007-12-11 16:49:19 +0200 validate the uncompressed size instead of having it in every filter. - src/liblzma/common/copy_coder.c | 25 +------------------ - src/liblzma/simple/simple_coder.c | 29 +++-------------------- - src/liblzma/subblock/subblock_encoder.c | 38 +++++-------------------------- + src/liblzma/common/copy_coder.c | 25 ++-------------------- + src/liblzma/simple/simple_coder.c | 29 ++++--------------------- + src/liblzma/subblock/subblock_encoder.c | 38 ++++++--------------------------- 3 files changed, 12 insertions(+), 80 deletions(-) commit 5286723e0d1ac386d5b07f08d78e61becf895a5a @@ -10380,9 +11380,9 @@ Date: 2007-12-11 14:10:53 +0200 working with Automake. People who want smaller lzmadec should use --disable-nls on non-GNU systems. - lib/Makefile.am | 10 +--------- - src/lzma/Makefile.am | 2 +- - src/lzmadec/Makefile.am | 4 +++- + lib/Makefile.am | 10 +--------- + src/lzma/Makefile.am | 2 +- + src/lzmadec/Makefile.am | 4 +++- 3 files changed, 5 insertions(+), 11 deletions(-) commit ce8b036a6c7a43b290356b673d953f6d76b2be64 @@ -10392,8 +11392,8 @@ Date: 2007-12-11 14:09:35 +0200 Fixed a typo in tests/Makefile.am which prevented building the tests if gnulib was needed. - tests/Makefile.am | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + tests/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit 7c1ad41eb611ed89e5bb8792a3beb533b7aa59f4 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10401,8 +11401,8 @@ Date: 2007-12-11 11:18:58 +0200 Fixed wrong type of flags_size in Subblock encoder. - src/liblzma/subblock/subblock_encoder.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) + src/liblzma/subblock/subblock_encoder.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) commit ce64df716243fdc40359090d1f6541f3a4f5f21a Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10410,8 +11410,8 @@ Date: 2007-12-10 20:44:16 +0200 Bumped version number to 4.42.3alpha. - configure.ac | 2 +- - src/liblzma/api/lzma/version.h | 2 +- + configure.ac | 2 +- + src/liblzma/api/lzma/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit b499a0403ea5c41d6a25b40275eb6c57643052ce @@ -10420,9 +11420,9 @@ Date: 2007-12-10 15:02:50 +0200 Disabled some unneeded warnings and made "make dist" work. - Makefile.am | 9 +++------ - configure.ac | 9 ++++++--- - po/fi.po | 47 ++++++++++++++++++++++++----------------------- + Makefile.am | 9 +++------ + configure.ac | 9 ++++++--- + po/fi.po | 47 ++++++++++++++++++++++++----------------------- 3 files changed, 33 insertions(+), 32 deletions(-) commit 2ab8adb5165a0b77114a7eb21f9ff1e6a266f172 @@ -10431,8 +11431,8 @@ Date: 2007-12-09 21:43:15 +0200 Added LZMA_SYNC_FLUSH support to the Copy filter. - src/liblzma/common/copy_coder.c | 92 ++++++++++++++++++++++++--------------- - 1 files changed, 57 insertions(+), 35 deletions(-) + src/liblzma/common/copy_coder.c | 92 +++++++++++++++++++++++++---------------- + 1 file changed, 57 insertions(+), 35 deletions(-) commit 329c272d501e88793dda5540358d55c12428d194 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10441,8 +11441,8 @@ Date: 2007-12-09 17:14:07 +0200 Added missing LZMA_API to the C versions of the CRC functions. The x86 assembler versions were already OK. - src/liblzma/check/crc32.c | 2 +- - src/liblzma/check/crc64.c | 2 +- + src/liblzma/check/crc32.c | 2 +- + src/liblzma/check/crc64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) commit c90daf86ce683fa8cf80491d624ffb158dfbd9d7 @@ -10451,9 +11451,9 @@ Date: 2007-12-09 15:34:25 +0100 * tests/test_block_header.c (test3): Remove duplicate initializer. - autogen.sh | 2 +- - tests/test_block_header.c | 1 - - 2 files changed, 1 insertions(+), 2 deletions(-) + autogen.sh | 2 +- + tests/test_block_header.c | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) commit 07ac881779a8477f2c1ab112b91a129e24aa743c Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10462,13 +11462,13 @@ Date: 2007-12-09 17:06:45 +0200 Take advantage of return_if_error() macro in more places. Cleaned Subblock filter's initialization code too. - src/liblzma/common/block_decoder.c | 22 +++------- - src/liblzma/common/delta_coder.c | 8 +--- - src/liblzma/common/stream_decoder.c | 17 +++----- - src/liblzma/common/stream_encoder_multi.c | 68 +++++++++------------------ - src/liblzma/common/stream_encoder_single.c | 8 +-- - src/liblzma/subblock/subblock_decoder.c | 33 +++++--------- - src/liblzma/subblock/subblock_encoder.c | 45 +++++------------- + src/liblzma/common/block_decoder.c | 22 +++------- + src/liblzma/common/delta_coder.c | 8 +--- + src/liblzma/common/stream_decoder.c | 17 +++----- + src/liblzma/common/stream_encoder_multi.c | 68 ++++++++++-------------------- + src/liblzma/common/stream_encoder_single.c | 8 ++-- + src/liblzma/subblock/subblock_decoder.c | 33 +++++---------- + src/liblzma/subblock/subblock_encoder.c | 45 ++++++-------------- 7 files changed, 63 insertions(+), 138 deletions(-) commit 41338717964f510ee61d70b25bd4c502ec9f77cf @@ -10477,23 +11477,23 @@ Date: 2007-12-09 12:13:01 +0200 Added a bunch of .lzma test files. - tests/files/bad-single-data_after_eopm.lzma | Bin 0 -> 55 bytes - tests/files/bad-single-data_after_eopm_2.lzma | Bin 0 -> 56 bytes - tests/files/bad-single-subblock_subblock.lzma | Bin 0 -> 26 bytes - tests/files/good-cat-single-none-pad.lzma | Bin 0 -> 64 bytes - tests/files/good-single-delta-lzma.tiff.lzma | Bin 0 -> 51409 bytes - tests/files/good-single-lzma.lzma | Bin 0 -> 44 bytes - tests/files/good-single-none-pad.lzma | Bin 0 -> 32 bytes - tests/files/good-single-none.lzma | Bin 0 -> 30 bytes - tests/files/good-single-subblock-lzma.lzma | Bin 0 -> 50 bytes - tests/files/good-single-subblock_rle.lzma | Bin 0 -> 118 bytes - tests/files/malicious-multi-metadata-64PiB.lzma | Bin 0 -> 51 bytes - tests/files/malicious-single-subblock-256MiB.lzma | Bin 0 -> 30 bytes - tests/files/malicious-single-subblock-64PiB.lzma | Bin 0 -> 45 bytes - tests/files/malicious-single-subblock-loop.lzma | Bin 0 -> 43 bytes - tests/files/malicious-single-subblock-lzma.lzma | Bin 0 -> 505 bytes - .../files/malicious-single-subblock1023-slow.lzma | Bin 0 -> 7886 bytes - tests/files/malicious-single-subblock31-slow.lzma | Bin 0 -> 1233 bytes + tests/files/bad-single-data_after_eopm.lzma | Bin 0 -> 55 bytes + tests/files/bad-single-data_after_eopm_2.lzma | Bin 0 -> 56 bytes + tests/files/bad-single-subblock_subblock.lzma | Bin 0 -> 26 bytes + tests/files/good-cat-single-none-pad.lzma | Bin 0 -> 64 bytes + tests/files/good-single-delta-lzma.tiff.lzma | Bin 0 -> 51409 bytes + tests/files/good-single-lzma.lzma | Bin 0 -> 44 bytes + tests/files/good-single-none-pad.lzma | Bin 0 -> 32 bytes + tests/files/good-single-none.lzma | Bin 0 -> 30 bytes + tests/files/good-single-subblock-lzma.lzma | Bin 0 -> 50 bytes + tests/files/good-single-subblock_rle.lzma | Bin 0 -> 118 bytes + tests/files/malicious-multi-metadata-64PiB.lzma | Bin 0 -> 51 bytes + tests/files/malicious-single-subblock-256MiB.lzma | Bin 0 -> 30 bytes + tests/files/malicious-single-subblock-64PiB.lzma | Bin 0 -> 45 bytes + tests/files/malicious-single-subblock-loop.lzma | Bin 0 -> 43 bytes + tests/files/malicious-single-subblock-lzma.lzma | Bin 0 -> 505 bytes + tests/files/malicious-single-subblock1023-slow.lzma | Bin 0 -> 7886 bytes + tests/files/malicious-single-subblock31-slow.lzma | Bin 0 -> 1233 bytes 17 files changed, 0 insertions(+), 0 deletions(-) commit ff946ceb7975d4f11950afd33f6315b4d20d1a03 @@ -10503,8 +11503,8 @@ Date: 2007-12-09 11:24:48 +0200 Re-enabled the security checks in Subblock decoder that were disabled for debugging reasons. - src/liblzma/subblock/subblock_decoder.c | 6 +++--- - 1 files changed, 3 insertions(+), 3 deletions(-) + src/liblzma/subblock/subblock_decoder.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) commit 2bf36d22d2c24ac3f488e63b35564fa2f6dab8d1 Author: Lasse Collin <lasse.collin@tukaani.org> @@ -10512,12 +11512,12 @@ Date: 2007-12-09 11:03:28 +0200 Fixed the tests to build with -Werror. - tests/test_block_header.c | 2 +- - tests/test_check.c | 2 +- - tests/test_filter_flags.c | 2 +- - tests/test_index.c | 14 +++++++------- - tests/test_info.c | 2 +- - tests/test_stream_flags.c | 2 +- + tests/test_block_header.c | 2 +- + tests/test_check.c | 2 +- + tests/test_filter_flags.c | 2 +- + tests/test_index.c | 14 +++++++------- + tests/test_info.c | 2 +- + tests/test_stream_flags.c | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) commit 5d018dc03549c1ee4958364712fb0c94e1bf2741 @@ -10534,6 +11534,7 @@ Date: 2007-12-09 00:42:33 +0200 ChangeLog | 2 + Doxyfile.in | 1229 ++++++++++++++++ Makefile.am | 38 + + NEWS | 0 README | 151 ++ THANKS | 23 + TODO | 109 ++ @@ -10543,7 +11544,7 @@ Date: 2007-12-09 00:42:33 +0200 doc/faq.txt | 247 ++++ doc/file-format.txt | 1861 ++++++++++++++++++++++++ doc/history.txt | 140 ++ - doc/liblzma-advanced.txt | 324 ++++ + doc/liblzma-advanced.txt | 324 +++++ doc/liblzma-hacking.txt | 112 ++ doc/liblzma-intro.txt | 188 +++ doc/liblzma-security.txt | 219 +++ @@ -10619,7 +11620,7 @@ Date: 2007-12-09 00:42:33 +0200 src/liblzma/common/alone_decoder.h | 24 + src/liblzma/common/alone_encoder.c | 167 +++ src/liblzma/common/auto_decoder.c | 113 ++ - src/liblzma/common/block_decoder.c | 405 +++++ + src/liblzma/common/block_decoder.c | 405 ++++++ src/liblzma/common/block_decoder.h | 29 + src/liblzma/common/block_encoder.c | 375 +++++ src/liblzma/common/block_encoder.h | 29 + @@ -10666,7 +11667,7 @@ Date: 2007-12-09 00:42:33 +0200 src/liblzma/common/sysdefs.h | 1 + src/liblzma/common/version.c | 25 + src/liblzma/common/vli_decoder.c | 69 + - src/liblzma/common/vli_encoder.c | 81 + + src/liblzma/common/vli_encoder.c | 81 ++ src/liblzma/common/vli_reverse_decoder.c | 55 + src/liblzma/lz/Makefile.am | 63 + src/liblzma/lz/bt2.c | 27 + @@ -10708,7 +11709,7 @@ Date: 2007-12-09 00:42:33 +0200 src/liblzma/rangecoder/range_encoder.h | 317 ++++ src/liblzma/simple/Makefile.am | 46 + src/liblzma/simple/arm.c | 76 + - src/liblzma/simple/armthumb.c | 81 + + src/liblzma/simple/armthumb.c | 81 ++ src/liblzma/simple/ia64.c | 117 ++ src/liblzma/simple/powerpc.c | 80 + src/liblzma/simple/simple_coder.c | 306 ++++ @@ -10765,4 +11766,4 @@ Date: 2007-12-09 00:42:33 +0200 tests/test_info.c | 717 +++++++++ tests/test_stream_flags.c | 191 +++ tests/tests.h | 148 ++ - 239 files changed, 42513 insertions(+), 0 deletions(-) + 240 files changed, 42513 insertions(+) diff --git a/Build/source/extra/xz/INSTALL b/Build/source/extra/xz/INSTALL index 992f9073b34..8b393190447 100644 --- a/Build/source/extra/xz/INSTALL +++ b/Build/source/extra/xz/INSTALL @@ -6,13 +6,14 @@ XZ Utils Installation 1. Supported platforms 1.1. Compilers 1.2. Platform-specific notes - 1.2.1. IRIX - 1.2.2. MINIX 3 - 1.2.3. OpenVMS - 1.2.4. Solaris, OpenSolaris, and derivatives - 1.2.5. Tru64 - 1.2.6. Windows - 1.2.7. DOS + 1.2.1. AIX + 1.2.2. IRIX + 1.2.3. MINIX 3 + 1.2.4. OpenVMS + 1.2.5. Solaris, OpenSolaris, and derivatives + 1.2.6. Tru64 + 1.2.7. Windows + 1.2.8. DOS 1.3. Adding support for new platforms 2. configure options 2.1. Static vs. dynamic linking of liblzma @@ -63,7 +64,14 @@ XZ Utils Installation 1.2. Platform-specific notes -1.2.1. IRIX +1.2.1. AIX + + If you use IBM XL C compiler, pass CC=xlc_r to configure. If + you use CC=xlc instead, you must disable threading support + with --disable-threads (usually not recommended). + + +1.2.2. IRIX MIPSpro 7.4.4m has been reported to produce broken code if using the -O2 optimization flag ("make check" fails). Using -O1 should @@ -74,16 +82,18 @@ XZ Utils Installation putting "-64" to CFLAGS to build a 64-bit version might help too. -1.2.2. MINIX 3 +1.2.3. MINIX 3 The default install of MINIX 3 includes Amsterdam Compiler Kit (ACK), which doesn't support C99. Install GCC to compile XZ Utils. - MINIX 3.1.8 (and possibly some other versions too) has bugs in - /usr/include/stdint.h, which has to be patched before XZ Utils - can be compiled correctly. See + MINIX 3.1.8 and older have bugs in /usr/include/stdint.h, which has + to be patched before XZ Utils can be compiled correctly. See <http://gforge.cs.vu.nl/gf/project/minix/tracker/?action=TrackerItemEdit&tracker_item_id=537>. + MINIX 3.2.0 and later use a different libc and aren't affected by + the above bug. + XZ Utils doesn't have code to detect the amount of physical RAM and number of CPU cores on MINIX 3. @@ -91,7 +101,7 @@ XZ Utils Installation may want to pass gl_cv_cc_visibility=no to configure). -1.2.3. OpenVMS +1.2.4. OpenVMS XZ Utils can be built for OpenVMS, but the build system files are not included in the XZ Utils source package. The required @@ -101,7 +111,7 @@ XZ Utils Installation http://nchrem.tnw.tudelft.nl/openvms/software2.html#xzutils -1.2.4. Solaris, OpenSolaris, and derivatives +1.2.5. Solaris, OpenSolaris, and derivatives The following linker error has been reported on some x86 systems: @@ -111,14 +121,14 @@ XZ Utils Installation as an argument to the configure script. -1.2.5. Tru64 +1.2.6. Tru64 If you try to use the native C compiler on Tru64 (passing CC=cc to configure), you may need the workaround mention in section 4.1 in this file (pass also ac_cv_prog_cc_c99= to configure). -1.2.6. Windows +1.2.7. Windows Building XZ Utils on Windows is supported under MinGW + MSYS, MinGW-w64 + MSYS, and Cygwin. There is windows/build.bash to @@ -138,7 +148,7 @@ XZ Utils Installation windows/README-Windows.txt for details. -1.2.7. DOS +1.2.8. DOS There is an experimental Makefile in the "dos" directory to build XZ Utils on DOS using DJGPP. Support for long file names (LFN) is diff --git a/Build/source/extra/xz/Makefile.am b/Build/source/extra/xz/Makefile.am index 2ce74aa5dee..8aa6dfc5612 100644 --- a/Build/source/extra/xz/Makefile.am +++ b/Build/source/extra/xz/Makefile.am @@ -5,6 +5,9 @@ ## You can do whatever you want with this file. ## +# Use -n to prevent gzip from adding a timestamp to the .gz headers. +GZIP_ENV = -9n + DIST_SUBDIRS = lib src po tests debug SUBDIRS = @@ -29,13 +32,22 @@ dist_doc_DATA = \ examplesdir = $(docdir)/examples dist_examples_DATA = \ - doc/examples/xz_pipe_comp.c \ - doc/examples/xz_pipe_decomp.c + doc/examples/00_README.txt \ + doc/examples/01_compress_easy.c \ + doc/examples/02_decompress.c \ + doc/examples/03_compress_custom.c \ + doc/examples/Makefile + +examplesolddir = $(docdir)/examples_old +dist_examplesold_DATA = \ + doc/examples_old/xz_pipe_comp.c \ + doc/examples_old/xz_pipe_decomp.c EXTRA_DIST = \ extra \ dos \ windows \ + macosx \ autogen.sh \ Doxyfile.in \ COPYING.GPLv2 \ diff --git a/Build/source/extra/xz/Makefile.in b/Build/source/extra/xz/Makefile.in index 97ebe1ffaff..3ee1ac3b74f 100644 --- a/Build/source/extra/xz/Makefile.in +++ b/Build/source/extra/xz/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,24 +80,32 @@ build_triplet = @build@ host_triplet = @host@ @COND_GNULIB_TRUE@am__append_1 = lib subdir = . -DIST_COMMON = README $(am__configure_deps) $(dist_doc_DATA) \ - $(dist_examples_DATA) $(srcdir)/Doxyfile.in \ - $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/config.h.in $(top_srcdir)/configure ABOUT-NLS \ - AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \ +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/configure $(am__configure_deps) \ + $(srcdir)/config.h.in $(srcdir)/Doxyfile.in $(dist_doc_DATA) \ + $(dist_examples_DATA) $(dist_examplesold_DATA) ABOUT-NLS \ + AUTHORS COPYING ChangeLog INSTALL NEWS README THANKS TODO \ build-aux/compile build-aux/config.guess \ - build-aux/config.rpath build-aux/config.sub build-aux/depcomp \ - build-aux/install-sh build-aux/ltmain.sh build-aux/missing + build-aux/config.rpath build-aux/config.sub \ + build-aux/install-sh build-aux/missing build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/compile \ + $(top_srcdir)/build-aux/config.guess \ + $(top_srcdir)/build-aux/config.rpath \ + $(top_srcdir)/build-aux/config.sub \ + $(top_srcdir)/build-aux/install-sh \ + $(top_srcdir)/build-aux/ltmain.sh \ + $(top_srcdir)/build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -68,15 +120,33 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = Doxyfile CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -98,22 +168,54 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" -DATA = $(dist_doc_DATA) $(dist_examples_DATA) +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } +am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" \ + "$(DESTDIR)$(examplesolddir)" +DATA = $(dist_doc_DATA) $(dist_examples_DATA) $(dist_examplesold_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ - distdir dist dist-all distcheck +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ + cscope distdir dist dist-all distcheck +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) \ + $(LISP)config.h.in +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +CSCOPE = cscope DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) am__remove_distdir = \ - { test ! -d "$(distdir)" \ - || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ - && rm -fr "$(distdir)"; }; } + if test -d "$(distdir)"; then \ + find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -rf "$(distdir)" \ + || { sleep 5 && rm -rf "$(distdir)"; }; \ + else :; fi +am__post_remove_distdir = $(am__remove_distdir) am__relativize = \ dir0=`pwd`; \ sed_first='s,^\([^/]*\)/.*$$,\1,'; \ @@ -140,12 +242,15 @@ am__relativize = \ done; \ reldir="$$dir2" DIST_ARCHIVES = $(distdir).tar.gz -GZIP_ENV = --best +DIST_TARGETS = dist-gzip distuninstallcheck_listfiles = find . -type f -print +am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \ + | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$' distcleancheck_listfiles = find . -type f -print ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -174,6 +279,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -234,6 +340,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -241,12 +348,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -288,6 +395,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xz = @xz@ + +# Use -n to prevent gzip from adding a timestamp to the .gz headers. +GZIP_ENV = -9n DIST_SUBDIRS = lib src po tests debug SUBDIRS = $(am__append_1) src po tests dist_doc_DATA = \ @@ -305,13 +415,22 @@ dist_doc_DATA = \ examplesdir = $(docdir)/examples dist_examples_DATA = \ - doc/examples/xz_pipe_comp.c \ - doc/examples/xz_pipe_decomp.c + doc/examples/00_README.txt \ + doc/examples/01_compress_easy.c \ + doc/examples/02_decompress.c \ + doc/examples/03_compress_custom.c \ + doc/examples/Makefile + +examplesolddir = $(docdir)/examples_old +dist_examplesold_DATA = \ + doc/examples_old/xz_pipe_comp.c \ + doc/examples_old/xz_pipe_decomp.c EXTRA_DIST = \ extra \ dos \ windows \ + macosx \ autogen.sh \ Doxyfile.in \ COPYING.GPLv2 \ @@ -338,7 +457,7 @@ all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive .SUFFIXES: -am--refresh: +am--refresh: Makefile @: $(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) @for dep in $?; do \ @@ -374,10 +493,8 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then \ - rm -f stamp-h1; \ - $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \ - else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -402,8 +519,11 @@ distclean-libtool: -rm -f libtool config.lt install-dist_docDATA: $(dist_doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -417,13 +537,14 @@ uninstall-dist_docDATA: @$(NORMAL_UNINSTALL) @list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-dist_examplesDATA: $(dist_examples_DATA) @$(NORMAL_INSTALL) - test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)" @list='$(dist_examples_DATA)'; test -n "$(examplesdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -437,27 +558,49 @@ uninstall-dist_examplesDATA: @$(NORMAL_UNINSTALL) @list='$(dist_examples_DATA)'; test -n "$(examplesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(examplesdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(examplesdir)" && rm -f $$files + 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. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -472,57 +615,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -538,12 +636,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -555,15 +648,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -572,9 +661,31 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscope: cscope.files + test ! -s cscope.files \ + || $(CSCOPE) -b -q $(AM_CSCOPEFLAGS) $(CSCOPEFLAGS) -i cscope.files $(CSCOPE_ARGS) +clean-cscope: + -rm -f cscope.files +cscope.files: clean-cscope cscopelist +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + -rm -f cscope.out cscope.in.out cscope.po.out cscope.files distdir: $(DISTFILES) $(am__remove_distdir) @@ -610,13 +721,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -653,36 +761,42 @@ distdir: $(DISTFILES) else :; fi dist-gzip: distdir tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-bzip2: distdir - tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2 + $(am__post_remove_distdir) -dist-lzma: distdir - tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma - $(am__remove_distdir) +dist-lzip: distdir + tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz + $(am__post_remove_distdir) dist-xz: distdir - tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz - $(am__remove_distdir) + tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz + $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z - $(am__remove_distdir) + $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz - $(am__remove_distdir) + $(am__post_remove_distdir) dist-zip: distdir -rm -f $(distdir).zip zip -rq $(distdir).zip $(distdir) - $(am__remove_distdir) + $(am__post_remove_distdir) -dist dist-all: distdir - tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz - $(am__remove_distdir) +dist dist-all: + $(MAKE) $(AM_MAKEFLAGS) $(DIST_TARGETS) am__post_remove_distdir='@:' + $(am__post_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 @@ -693,8 +807,8 @@ distcheck: dist GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ - *.tar.lzma*) \ - lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ + *.tar.lz*) \ + lzip -dc $(distdir).tar.lz | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ @@ -704,9 +818,9 @@ distcheck: dist *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) - mkdir $(distdir)/_build - mkdir $(distdir)/_inst + chmod -R a-w $(distdir) + chmod u+w $(distdir) + mkdir $(distdir)/_build $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ @@ -714,6 +828,7 @@ distcheck: dist && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ @@ -737,13 +852,21 @@ distcheck: dist && $(MAKE) $(AM_MAKEFLAGS) distcleancheck \ && cd "$$am__cwd" \ || exit 1 - $(am__remove_distdir) + $(am__post_remove_distdir) @(echo "$(distdir) archives ready for distribution: "; \ list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' distuninstallcheck: - @$(am__cd) '$(distuninstallcheck_dir)' \ - && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + @test -n '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: trying to run $@ with an empty' \ + '$$(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + $(am__cd) '$(distuninstallcheck_dir)' || { \ + echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \ + exit 1; \ + }; \ + test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \ || { echo "ERROR: files left after uninstall:" ; \ if test -n "$(DESTDIR)"; then \ echo " (check DESTDIR support)"; \ @@ -764,7 +887,7 @@ check: check-recursive all-am: Makefile $(DATA) config.h installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)"; do \ + for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(examplesdir)" "$(DESTDIR)$(examplesolddir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -777,10 +900,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -814,7 +942,8 @@ info: info-recursive info-am: -install-data-am: install-dist_docDATA install-dist_examplesDATA +install-data-am: install-dist_docDATA install-dist_examplesDATA \ + install-dist_examplesoldDATA install-dvi: install-dvi-recursive @@ -860,28 +989,30 @@ ps: ps-recursive ps-am: -uninstall-am: uninstall-dist_docDATA uninstall-dist_examplesDATA - -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) all \ - ctags-recursive install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am am--refresh check check-am clean clean-generic \ - clean-libtool ctags ctags-recursive dist dist-all dist-bzip2 \ - dist-gzip dist-hook dist-lzma dist-shar dist-tarZ dist-xz \ - dist-zip distcheck distclean 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-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-recursive uninstall uninstall-am \ - uninstall-dist_docDATA uninstall-dist_examplesDATA +uninstall-am: uninstall-dist_docDATA uninstall-dist_examplesDATA \ + uninstall-dist_examplesoldDATA + +.MAKE: $(am__recursive_targets) all install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am \ + am--refresh check check-am clean clean-cscope clean-generic \ + clean-libtool cscope cscopelist-am ctags ctags-am dist \ + dist-all dist-bzip2 dist-gzip dist-hook dist-lzip dist-shar \ + dist-tarZ dist-xz dist-zip distcheck distclean \ + 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-dist_docDATA \ + install-dist_examplesDATA install-dist_examplesoldDATA \ + 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 # Create ChangeLog from output of "git log --date=iso --stat". @@ -921,4 +1052,3 @@ mydist: # 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: - diff --git a/Build/source/extra/xz/NEWS b/Build/source/extra/xz/NEWS index e3ea4989440..b4f55fc9596 100644 --- a/Build/source/extra/xz/NEWS +++ b/Build/source/extra/xz/NEWS @@ -2,6 +2,95 @@ XZ Utils Release Notes ====================== +5.0.5 (2013-06-30) + + * lzmadec and liblzma's lzma_alone_decoder(): Support decompressing + .lzma files that have less common settings in the headers + (dictionary size other than 2^n or 2^n + 2^(n-1), or uncompressed + size greater than 256 GiB). The limitations existed to avoid false + positives when detecting .lzma files. The lc + lp <= 4 limitation + still remains since liblzma's LZMA decoder has that limitation. + + NOTE: xz's .lzma support or liblzma's lzma_auto_decoder() are NOT + affected by this change. They still consider uncommon .lzma headers + as not being in the .lzma format. Changing this would give way too + many false positives. + + * xz: + + - Interaction of preset and custom filter chain options was + made less illogical. This affects only certain less typical + uses cases so few people are expected to notice this change. + + Now when a custom filter chain option (e.g. --lzma2) is + specified, all preset options (-0 ... -9, -e) earlier are on + the command line are completely forgotten. Similarly, when + a preset option is specified, all custom filter chain options + earlier on the command line are completely forgotten. + + Example 1: "xz -9 --lzma2=preset=5 -e" is equivalent to "xz -e" + which is equivalent to "xz -6e". Earlier -e didn't put xz back + into preset mode and thus the example command was equivalent + to "xz --lzma2=preset=5". + + Example 2: "xz -9e --lzma2=preset=5 -7" is equivalent to + "xz -7". Earlier a custom filter chain option didn't make + xz forget the -e option so the example was equivalent to + "xz -7e". + + - Fixes and improvements to error handling. + + - Various fixes to the man page. + + * xzless: Fixed to work with "less" versions 448 and later. + + * xzgrep: Made -h an alias for --no-filename. + + * Include the previously missing debug/translation.bash which can + be useful for translators. + + * Include a build script for Mac OS X. This has been in the Git + repository since 2010 but due to a mistake in Makefile.am the + script hasn't been included in a release tarball before. + + +5.0.4 (2012-06-22) + + * liblzma: + + - Fix lzma_index_init(). It could crash if memory allocation + failed. + + - Fix the possibility of an incorrect LZMA_BUF_ERROR when a BCJ + filter is used and the application only provides exactly as + much output space as is the uncompressed size of the file. + + - Fix a bug in doc/examples_old/xz_pipe_decompress.c. It didn't + check if the last call to lzma_code() really returned + LZMA_STREAM_END, which made the program think that truncated + files are valid. + + - New example programs in doc/examples (old programs are now in + doc/examples_old). These have more comments and more detailed + error handling. + + * Fix "xz -lvv foo.xz". It could crash on some corrupted files. + + * Fix output of "xz --robot -lv" and "xz --robot -lvv" which + incorrectly printed the filename also in the "foo (x/x)" format. + + * Fix exit status of "xzdiff foo.xz bar.xz". + + * Fix exit status of "xzgrep foo binary_file". + + * Fix portability to EBCDIC systems. + + * Fix a configure issue on AIX with the XL C compiler. See INSTALL + for details. + + * Update French, German, Italian, and Polish translations. + + 5.0.3 (2011-05-21) * liblzma fixes: diff --git a/Build/source/extra/xz/README b/Build/source/extra/xz/README index d6cfda78d3d..ab8aadfb533 100644 --- a/Build/source/extra/xz/README +++ b/Build/source/extra/xz/README @@ -5,7 +5,7 @@ XZ Utils 0. Overview 1. Documentation 1.1. Overall documentation - 1.2. Documentation for command line tools + 1.2. Documentation for command-line tools 1.3. Documentation for liblzma 2. Version numbering 3. Reporting bugs @@ -17,21 +17,21 @@ XZ Utils 0. Overview ----------- - XZ Utils provide a general-purpose data compression library and - command line tools. The native file format is the .xz format, but + XZ Utils provide a general-purpose data-compression library plus + command-line tools. The native file format is the .xz format, but also the legacy .lzma format is supported. The .xz format supports - multiple compression algorithms, which are called "filters" in + multiple compression algorithms, which are called "filters" in the context of XZ Utils. The primary filter is currently LZMA2. With typical files, XZ Utils create about 30 % smaller files than gzip. To ease adapting support for the .xz format into existing applications and scripts, the API of liblzma is somewhat similar to the API of the - popular zlib library. For the same reason, the command line tool xz - has similar command line syntax than that of gzip. + popular zlib library. For the same reason, the command-line tool xz + has a command-line syntax similar to that of gzip. - When aiming for the highest compression ratio, LZMA2 encoder uses + When aiming for the highest compression ratio, the LZMA2 encoder uses a lot of CPU time and may use, depending on the settings, even - hundreds of megabytes of RAM. However, in fast modes, LZMA2 encoder + hundreds of megabytes of RAM. However, in fast modes, the LZMA2 encoder competes with bzip2 in compression speed, RAM usage, and compression ratio. @@ -44,8 +44,8 @@ XZ Utils since that needs to be done only once to benefit many people. With some file types, combining (or "chaining") LZMA2 with an - additional filter can improve compression ratio. A filter chain may - contain up to four filters, although usually only one two is used. + additional filter can improve the compression ratio. A filter chain may + contain up to four filters, although usually only one or two are used. For example, putting a BCJ (Branch/Call/Jump) filter before LZMA2 in the filter chain can improve compression ratio of executable files. @@ -88,9 +88,9 @@ XZ Utils packages. -1.2. Documentation for command line tools +1.2. Documentation for command-line tools - The command line tools are documented as man pages. In source code + The command-line tools are documented as man pages. In source code releases (and possibly also in some binary packages), the man pages are also provided in plain text (ASCII only) and PDF formats in the directory "doc/man" to make the man pages more accessible to those @@ -109,8 +109,8 @@ XZ Utils written yet. For now, if you have never used liblzma, libbzip2, or zlib, I - recommend learning *basics* of zlib API. Once you know that, it - should be easier to learn liblzma. + recommend learning the *basics* of the zlib API. Once you know that, + it should be easier to learn liblzma. http://zlib.net/manual.html http://zlib.net/zlib_how.html @@ -124,23 +124,27 @@ XZ Utils - X is the major version. When this is incremented, the library API and ABI break. - - Y is the minor version. It is incremented when new features are - added without breaking existing API or ABI. Even Y indicates - stable release and odd Y indicates unstable (alpha or beta - version). + - Y is the minor version. It is incremented when new features + are added without breaking the existing API or ABI. An even Y + indicates a stable release and an odd Y indicates unstable + (alpha or beta version). - - Z is the revision. This has different meaning for stable and + - Z is the revision. This has a different meaning for stable and unstable releases: + * Stable: Z is incremented when bugs get fixed without adding - any new features. + any new features. This is intended to be convenient for + downstream distributors that want bug fixes but don't want + any new features to minimize the risk of introducing new bugs. + * Unstable: Z is just a counter. API or ABI of features added in earlier unstable releases having the same X.Y may break. - S indicates stability of the release. It is missing from the - stable releases where Y is an even number. When Y is odd, S + stable releases, where Y is an even number. When Y is odd, S is either "alpha" or "beta" to make it very clear that such versions are not stable releases. The same X.Y.Z combination is - not used for more than one stability level i.e. after X.Y.Zalpha, + not used for more than one stability level, i.e. after X.Y.Zalpha, the next version can be X.Y.(Z+1)beta but not X.Y.Zbeta. @@ -176,7 +180,7 @@ XZ Utils Don't send core dump files or any executables. If you have a small example file(s) (total size less than 256 KiB), please include it/them as an attachment. If you have bigger test files, put them - online somewhere and include an URL to the file(s) in the bug report. + online somewhere and include a URL to the file(s) in the bug report. Always include the exact version number of XZ Utils in the bug report. If you are using a snapshot from the git repository, use "git describe" @@ -193,7 +197,7 @@ XZ Utils The messages from the xz tool have been translated into a few languages. Before starting to translate into a new language, ask - the author that someone else hasn't already started working on it. + the author whether someone else hasn't already started working on it. Test your translation. Testing includes comparing the translated output to the original English version by running the same commands @@ -206,15 +210,15 @@ XZ Utils # <Edit the .po file in the po directory.> make -C po update-po make install - bash debug/translations.bash | less - bash debug/translations.bash | less -S # For --list outputs + bash debug/translation.bash | less + bash debug/translation.bash | less -S # For --list outputs Repeat the above as needed (no need to re-run configure though). Note especially the following: - The output of --help and --long-help must look nice on - a 80-column terminal. It's OK to add extra lines if needed. + an 80-column terminal. It's OK to add extra lines if needed. - In contrast, don't add extra lines to error messages and such. They are often preceded with e.g. a filename on the same line, diff --git a/Build/source/extra/xz/THANKS b/Build/source/extra/xz/THANKS index 70303e0a1be..36b2e74c9fe 100644 --- a/Build/source/extra/xz/THANKS +++ b/Build/source/extra/xz/THANKS @@ -6,6 +6,7 @@ Some people have helped more, some less, but nevertheless everyone's help has been important. :-) In alphabetical order: - Mark Adler - H. Peter Anvin + - Jeff Bastian - Nelson H. F. Beebe - Karl Berry - Anders F. Björklund @@ -14,16 +15,19 @@ has been important. :-) In alphabetical order: - Jakub Bogusz - Maarten Bosmans - Trent W. Buck + - James Buren - David Burklund - Daniel Mealha Cabrita - Milo Casagrande - Marek Černocký + - Chris Donawa - Andrew Dudman - Markus Duft - İsmail Dönmez - Robert Elz - Gilles Espinasse - Denis Excoffier + - Michael Felt - Mike Frysinger - Jason Gorski - Juan Manuel Guerrero @@ -38,26 +42,33 @@ has been important. :-) In alphabetical order: - Peter Lawler - Hin-Tak Leung - Andraž 'ruskie' Levstik + - Cary Lewis - Wim Lewis - Lorenzo De Liso + - Bela Lubkin - Gregory Margo - Jim Meyering + - Conley Moorhous - Rafał Mużyło - Adrien Nader - Hongbo Ni - Jonathan Nieder - Andre Noll - Peter O'Gorman + - Peter Pallinger - Igor Pavlov - Diego Elio Pettenò - Elbert Pol - Mikko Pouru + - Pavel Raiskup - Robert Readman - Bernhard Reutner-Fischer + - Eric S. Raymond - Cristian Rodríguez - Christian von Roques - Jukka Salmi - Alexandre Sauvé + - Benno Schulenberg - Andreas Schwab - Dan Shechter - Stuart Shelton diff --git a/Build/source/extra/xz/aclocal.m4 b/Build/source/extra/xz/aclocal.m4 index c8516bc02de..46f49bf922b 100644 --- a/Build/source/extra/xz/aclocal.m4 +++ b/Build/source/extra/xz/aclocal.m4 @@ -1,7 +1,7 @@ -# generated automatically by aclocal 1.11.1 -*- Autoconf -*- +# generated automatically by aclocal 1.14 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -11,15 +11,16 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl -m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, -[m4_warning([this file was generated for autoconf 2.68. +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. You have another version of autoconf. It may work, but is not guaranteed to. If you have problems, you may need to regenerate the build system entirely. -To do so, use the procedure documented by the package, typically `autoreconf'.])]) +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) -# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -31,10 +32,10 @@ To do so, use the procedure documented by the package, typically `autoreconf'.]) # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.11' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.11.1], [], +m4_if([$1], [1.14], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -50,21 +51,19 @@ m4_define([_AM_AUTOCONF_VERSION], []) # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.11.1])dnl +[AM_AUTOMAKE_VERSION([1.14])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # Figure out how to run the assembler. -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 - # AM_PROG_AS # ---------- AC_DEFUN([AM_PROG_AS], @@ -79,15 +78,15 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets -# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to -# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. # # Of course, Automake must honor this variable whenever it calls a # tool from the auxiliary directory. The problem is that $srcdir (and @@ -106,7 +105,7 @@ _AM_IF_OPTION([no-dependencies],, [_AM_DEPENDENCIES([CCAS])])dnl # # The reason of the latter failure is that $top_srcdir and $ac_aux_dir # are both prefixed by $srcdir. In an in-source build this is usually -# harmless because $srcdir is `.', but things will broke when you +# harmless because $srcdir is '.', but things will broke when you # start a VPATH build or use an absolute $srcdir. # # So we could use something similar to $top_srcdir/$ac_aux_dir/missing, @@ -132,22 +131,19 @@ am_aux_dir=`cd $ac_aux_dir && pwd` # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005, 2006, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 9 - # AM_CONDITIONAL(NAME, SHELL-CONDITION) # ------------------------------------- # Define a conditional. AC_DEFUN([AM_CONDITIONAL], -[AC_PREREQ(2.52)dnl - ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], - [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl AC_SUBST([$1_TRUE])dnl AC_SUBST([$1_FALSE])dnl _AM_SUBST_NOTMAKE([$1_TRUE])dnl @@ -166,16 +162,14 @@ AC_CONFIG_COMMANDS_PRE( Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 10 -# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be # written in clear, in which case automake, when reading aclocal.m4, # will think it sees a *use*, and therefore will trigger all it's # C support machinery. Also note that it means that autoscan, seeing @@ -185,7 +179,7 @@ fi])]) # _AM_DEPENDENCIES(NAME) # ---------------------- # See how the compiler implements dependency checking. -# NAME is "CC", "CXX", "GCJ", or "OBJC". +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". # We try a few techniques and use that to set a single cache variable. # # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was @@ -198,12 +192,13 @@ AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl AC_REQUIRE([AM_MAKE_INCLUDE])dnl AC_REQUIRE([AM_DEP_TRACK])dnl -ifelse([$1], CC, [depcc="$CC" am_compiler_list=], - [$1], CXX, [depcc="$CXX" am_compiler_list=], - [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'], - [$1], UPC, [depcc="$UPC" am_compiler_list=], - [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], - [depcc="$$1" am_compiler_list=]) +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) AC_CACHE_CHECK([dependency style of $depcc], [am_cv_$1_dependencies_compiler_type], @@ -211,8 +206,9 @@ AC_CACHE_CHECK([dependency style of $depcc], # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -251,16 +247,16 @@ AC_CACHE_CHECK([dependency style of $depcc], : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -269,16 +265,16 @@ AC_CACHE_CHECK([dependency style of $depcc], test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -326,7 +322,7 @@ AM_CONDITIONAL([am__fastdep$1], [ # AM_SET_DEPDIR # ------------- # Choose a directory name for dependency files. -# This macro is AC_REQUIREd in _AM_DEPENDENCIES +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. AC_DEFUN([AM_SET_DEPDIR], [AC_REQUIRE([AM_SET_LEADING_DOT])dnl AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl @@ -336,34 +332,39 @@ AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl # AM_DEP_TRACK # ------------ AC_DEFUN([AM_DEP_TRACK], -[AC_ARG_ENABLE(dependency-tracking, -[ --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors]) +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) AC_SUBST([AMDEPBACKSLASH])dnl _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl ]) # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 5 # _AM_OUTPUT_DEPENDENCY_COMMANDS # ------------------------------ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], [{ - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -376,7 +377,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -388,21 +389,19 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`AS_DIRNAME(["$file"])` @@ -420,7 +419,7 @@ AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], # This macro should only be invoked once -- use via AC_REQUIRE. # # This code is only required when automatic dependency tracking -# is enabled. FIXME. This creates each `.P' file that we will +# is enabled. FIXME. This creates each '.P' file that we will # need in order to bootstrap the dependency handling code. AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], [AC_CONFIG_COMMANDS([depfiles], @@ -430,18 +429,21 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, -# 2005, 2006, 2008, 2009 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 16 - # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -454,7 +456,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], # arguments mandatory, and then we can depend on a new Autoconf # release and drop the old call support. AC_DEFUN([AM_INIT_AUTOMAKE], -[AC_PREREQ([2.62])dnl +[AC_PREREQ([2.65])dnl dnl Autoconf wants to disallow AM_ names. We explicitly allow dnl the ones we care about. m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl @@ -483,31 +485,40 @@ AC_SUBST([CYGPATH_W]) # Define the identity of the package. dnl Distinguish between old-style and new-style calls. m4_ifval([$2], -[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl AC_SUBST([PACKAGE], [$1])dnl AC_SUBST([VERSION], [$2])], [_AM_SET_OPTIONS([$1])dnl dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. -m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, [m4_fatal([AC_INIT should be called with package and version arguments])])dnl AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl _AM_IF_OPTION([no-define],, -[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) - AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl # Some tools Automake needs. AC_REQUIRE([AM_SANITY_CHECK])dnl AC_REQUIRE([AC_ARG_PROGRAM])dnl -AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -AM_MISSING_PROG(AUTOCONF, autoconf) -AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -AM_MISSING_PROG(AUTOHEADER, autoheader) -AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) AC_REQUIRE([AM_PROG_INSTALL_SH])dnl AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl -AC_REQUIRE([AM_PROG_MKDIR_P])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) # We need awk for the "check" target. The system "awk" is bad on # some platforms. AC_REQUIRE([AC_PROG_AWK])dnl @@ -518,34 +529,78 @@ _AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], [_AM_PROG_TAR([v7])])]) _AM_IF_OPTION([no-dependencies],, [AC_PROVIDE_IFELSE([AC_PROG_CC], - [_AM_DEPENDENCIES(CC)], - [define([AC_PROG_CC], - defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl AC_PROVIDE_IFELSE([AC_PROG_CXX], - [_AM_DEPENDENCIES(CXX)], - [define([AC_PROG_CXX], - defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl AC_PROVIDE_IFELSE([AC_PROG_OBJC], - [_AM_DEPENDENCIES(OBJC)], - [define([AC_PROG_OBJC], - defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl ]) -_AM_IF_OPTION([silent-rules], [AC_REQUIRE([AM_SILENT_RULES])])dnl -dnl The `parallel-tests' driver may need to know about EXEEXT, so add the -dnl `am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This macro -dnl is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl -]) -dnl Hook into `_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further dnl mangled by Autoconf and run in a shell conditional statement. m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -567,7 +622,7 @@ for _am_header in $config_headers :; do done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -586,16 +641,14 @@ if test x"${install_sh}" != xset; then install_sh="\${SHELL} $am_aux_dir/install-sh" esac fi -AC_SUBST(install_sh)]) +AC_SUBST([install_sh])]) -# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # Check whether the underlying file-system supports filenames # with a leading dot. For instance MS-DOS doesn't. AC_DEFUN([AM_SET_LEADING_DOT], @@ -611,14 +664,12 @@ AC_SUBST([am__leading_dot])]) # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2009 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # AM_MAKE_INCLUDE() # ----------------- # Check to see how make treats includes. @@ -636,7 +687,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -661,52 +712,14 @@ AC_MSG_RESULT([$_am_result]) rm -f confinc confmf ]) -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# serial 6 - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 6 - # AM_MISSING_PROG(NAME, PROGRAM) # ------------------------------ AC_DEFUN([AM_MISSING_PROG], @@ -714,11 +727,10 @@ AC_DEFUN([AM_MISSING_PROG], $1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) - # AM_MISSING_HAS_RUN # ------------------ -# Define MISSING if not defined so far and test if it supports --run. -# If it does, set am_missing_run to use it, otherwise, to nothing. +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. AC_DEFUN([AM_MISSING_HAS_RUN], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl AC_REQUIRE_AUX_FILE([missing])dnl @@ -731,15 +743,15 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - AC_MSG_WARN([`missing' script is too old or missing]) + AC_MSG_WARN(['missing' script is too old or missing]) fi ]) -# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2003-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -747,10 +759,16 @@ fi # AM_PROG_MKDIR_P # --------------- -# Check for `mkdir -p'. +# Check for 'mkdir -p'. AC_DEFUN([AM_PROG_MKDIR_P], [AC_PREREQ([2.60])dnl AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, dnl while keeping a definition of mkdir_p for backward compatibility. dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. @@ -767,27 +785,25 @@ esac # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001, 2002, 2003, 2005, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 4 - # _AM_MANGLE_OPTION(NAME) # ----------------------- AC_DEFUN([_AM_MANGLE_OPTION], [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) # _AM_SET_OPTION(NAME) -# ------------------------------ +# -------------------- # Set option NAME. Presently that only means defining a flag for this option. AC_DEFUN([_AM_SET_OPTION], -[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) # _AM_SET_OPTIONS(OPTIONS) -# ---------------------------------- +# ------------------------ # OPTIONS is a space-separated list of Automake options. AC_DEFUN([_AM_SET_OPTIONS], [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) @@ -798,24 +814,82 @@ AC_DEFUN([_AM_SET_OPTIONS], AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Check to make sure that the build environment is sane. -*- Autoconf -*- +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 5 +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. # AM_SANITY_CHECK # --------------- AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -826,32 +900,40 @@ case `pwd` in esac case $srcdir in *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) - AC_MSG_ERROR([unsafe srcdir value: `$srcdir']);; + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$[*]" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$[*]" != "X $srcdir/configure conftest.file" \ - && test "$[*]" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -alias in your environment]) - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$[2]" = conftest.file ) then @@ -861,9 +943,85 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -AC_MSG_RESULT(yes)]) +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) -# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -871,34 +1029,32 @@ AC_MSG_RESULT(yes)]) # AM_PROG_INSTALL_STRIP # --------------------- -# One issue with vendor `install' (even GNU) is that you can't +# One issue with vendor 'install' (even GNU) is that you can't # specify the program used to strip binaries. This is especially # annoying in cross-compiling environments, where the build's strip # is unlikely to handle the host's binaries. # Fortunately install-sh will honor a STRIPPROG variable, so we -# always use install-sh in `make install-strip', and initialize +# always use install-sh in "make install-strip", and initialize # STRIPPROG with the value of the STRIP variable (set by the user). AC_DEFUN([AM_PROG_INSTALL_STRIP], [AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. -dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. if test "$cross_compiling" != no; then AC_CHECK_TOOL([STRIP], [strip], :) fi INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2006-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_SUBST_NOTMAKE(VARIABLE) # --------------------------- # Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. @@ -906,24 +1062,22 @@ AC_SUBST([INSTALL_STRIP_PROGRAM])]) AC_DEFUN([_AM_SUBST_NOTMAKE]) # AM_SUBST_NOTMAKE(VARIABLE) -# --------------------------- +# -------------------------- # Public sister of _AM_SUBST_NOTMAKE. AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2004-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -# serial 2 - # _AM_PROG_TAR(FORMAT) # -------------------- # Check how to create a tarball in format FORMAT. -# FORMAT should be one of `v7', `ustar', or `pax'. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. # # Substitute a variable $(am__tar) that is a command # writing to stdout a FORMAT-tarball containing the directory @@ -933,83 +1087,123 @@ AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) # Substitute a variable $(am__untar) that extract such # a tarball read from stdin. # $(am__untar) < result.tar +# AC_DEFUN([_AM_PROG_TAR], -[# Always define AMTAR for backward compatibility. -AM_MISSING_PROG([AMTAR], [tar]) -m4_if([$1], [v7], - [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], - [m4_case([$1], [ustar],, [pax],, - [m4_fatal([Unknown tar format])]) -AC_MSG_CHECKING([how to create a $1 tar archive]) -# Loop over all known methods to create a tar archive until one works. +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. _am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' -_am_tools=${am_cv_prog_tar_$1-$_am_tools} -# Do not fold the above two line into one, because Tru64 sh and -# Solaris sh will not grok spaces in the rhs of `-'. -for _am_tool in $_am_tools -do - case $_am_tool in - gnutar) - for _am_tar in tar gnutar gtar; - do - AM_RUN_LOG([$_am_tar --version]) && break - done - am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' - am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' - am__untar="$_am_tar -xf -" - ;; - plaintar) - # Must skip GNU tar: if it does not support --format= it doesn't create - # ustar tarball either. - (tar --version) >/dev/null 2>&1 && continue - am__tar='tar chf - "$$tardir"' - am__tar_='tar chf - "$tardir"' - am__untar='tar xf -' - ;; - pax) - am__tar='pax -L -x $1 -w "$$tardir"' - am__tar_='pax -L -x $1 -w "$tardir"' - am__untar='pax -r' - ;; - cpio) - am__tar='find "$$tardir" -print | cpio -o -H $1 -L' - am__tar_='find "$tardir" -print | cpio -o -H $1 -L' - am__untar='cpio -i -H $1 -d' - ;; - none) - am__tar=false - am__tar_=false - am__untar=false - ;; - esac - # If the value was cached, stop now. We just wanted to have am__tar - # and am__untar set. - test -n "${am_cv_prog_tar_$1}" && break +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac - # tar/untar a dummy directory, and stop if the command works - rm -rf conftest.dir - mkdir conftest.dir - echo GrepMe > conftest.dir/file - AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar <conftest.tar]) + AM_RUN_LOG([cat conftest.dir/file]) + grep GrepMe conftest.dir/file >/dev/null 2>&1 && break + fi + done rm -rf conftest.dir - if test -s conftest.tar; then - AM_RUN_LOG([$am__untar <conftest.tar]) - grep GrepMe conftest.dir/file >/dev/null 2>&1 && break - fi -done -rm -rf conftest.dir -AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) -AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + AC_SUBST([am__tar]) AC_SUBST([am__untar]) ]) # _AM_PROG_TAR -m4_include([m4/acx_pthread.m4]) +m4_include([m4/ax_pthread.m4]) m4_include([m4/getopt.m4]) m4_include([m4/gettext.m4]) m4_include([m4/iconv.m4]) +m4_include([m4/intlmacosx.m4]) m4_include([m4/lib-ld.m4]) m4_include([m4/lib-link.m4]) m4_include([m4/lib-prefix.m4]) diff --git a/Build/source/extra/xz/build-aux/compile b/Build/source/extra/xz/build-aux/compile index c0096a7b563..531136b068e 100755 --- a/Build/source/extra/xz/build-aux/compile +++ b/Build/source/extra/xz/build-aux/compile @@ -1,10 +1,9 @@ #! /bin/sh -# Wrapper for compilers which do not understand `-c -o'. +# Wrapper for compilers which do not understand '-c -o'. -scriptversion=2009-10-06.20; # UTC +scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2013 Free Software Foundation, Inc. # Written by Tom Tromey <tromey@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -29,21 +28,224 @@ scriptversion=2009-10-06.20; # UTC # bugs to <bug-automake@gnu.org> or send patches to # <automake-patches@gnu.org>. +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + case $1 in '') - echo "$0: No command. Try \`$0 --help' for more information." 1>&2 + echo "$0: No command. Try '$0 --help' for more information." 1>&2 exit 1; ;; -h | --h*) cat <<\EOF Usage: compile [--help] [--version] PROGRAM [ARGS] -Wrapper for compilers which do not understand `-c -o'. -Remove `-o dest.o' from ARGS, run PROGRAM with the remaining +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining arguments, and rename the output as expected. If you are trying to build a whole package this is not the -right script to run: please start by reading the file `INSTALL'. +right script to run: please start by reading the file 'INSTALL'. Report bugs to <bug-automake@gnu.org>. EOF @@ -53,11 +255,13 @@ EOF echo "compile $scriptversion" exit $? ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; esac ofile= cfile= -eat= for arg do @@ -66,8 +270,8 @@ do else case $1 in -o) - # configure might choose to run compile as `compile cc -o foo foo.c'. - # So we strip `-o arg' only if arg is an object. + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. eat=1 case $2 in *.o | *.obj) @@ -94,10 +298,10 @@ do done if test -z "$ofile" || test -z "$cfile"; then - # If no `-o' option was seen then we might have been invoked from a + # If no '-o' option was seen then we might have been invoked from a # pattern rule where we don't need one. That is ok -- this is a # normal compilation that the losing compiler can handle. If no - # `.c' file was seen then we are probably linking. That is also + # '.c' file was seen then we are probably linking. That is also # ok. exec "$@" fi @@ -106,7 +310,7 @@ fi cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` # Create the lock directory. -# Note: use `[/\\:.-]' here to ensure that we don't use the same name +# Note: use '[/\\:.-]' here to ensure that we don't use the same name # that we are using for the .o file. Also, base the name on the expected # object file name, since that is what matters with a parallel build. lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d diff --git a/Build/source/extra/xz/build-aux/config.rpath b/Build/source/extra/xz/build-aux/config.rpath index c492a93b663..17298f2348b 100755 --- a/Build/source/extra/xz/build-aux/config.rpath +++ b/Build/source/extra/xz/build-aux/config.rpath @@ -2,7 +2,7 @@ # Output a system dependent set of variables, describing how to set the # run time search path of shared libraries in an executable. # -# Copyright 1996-2006 Free Software Foundation, Inc. +# Copyright 1996-2010 Free Software Foundation, Inc. # Taken from GNU libtool, 2001 # Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # @@ -47,7 +47,7 @@ for cc_temp in $CC""; do done cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` -# Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. +# Code taken from libtool.m4's _LT_COMPILER_PIC. wl= if test "$GCC" = yes; then @@ -64,7 +64,7 @@ else ;; esac ;; - mingw* | pw32* | os2*) + mingw* | cygwin* | pw32* | os2* | cegcc*) ;; hpux9* | hpux10* | hpux11*) wl='-Wl,' @@ -74,9 +74,15 @@ else ;; newsos6) ;; - linux*) + linux* | k*bsd*-gnu) case $cc_basename in - icc* | ecc*) + ecc*) + wl='-Wl,' + ;; + icc* | ifort*) + wl='-Wl,' + ;; + lf95*) wl='-Wl,' ;; pgcc | pgf77 | pgf90) @@ -100,7 +106,7 @@ else osf3* | osf4* | osf5*) wl='-Wl,' ;; - sco3.2v5*) + rdos*) ;; solaris*) wl='-Wl,' @@ -108,11 +114,14 @@ else sunos4*) wl='-Qoption ld ' ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.2uw2* | sysv4.3*) wl='-Wl,' ;; sysv4*MP*) ;; + sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) + wl='-Wl,' + ;; unicos*) wl='-Wl,' ;; @@ -121,7 +130,7 @@ else esac fi -# Code taken from libtool.m4's AC_LIBTOOL_PROG_LD_SHLIBS. +# Code taken from libtool.m4's _LT_LINKER_SHLIBS. hardcode_libdir_flag_spec= hardcode_libdir_separator= @@ -129,7 +138,7 @@ hardcode_direct=no hardcode_minus_L=no case "$host_os" in - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # FIXME: the MSVC++ port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using # Microsoft Visual C++. @@ -155,7 +164,7 @@ if test "$with_gnu_ld" = yes; then # option of GNU ld is called -rpath, not --rpath. hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in - aix3* | aix4* | aix5*) + aix[3-9]*) # On AIX/PPC, the GNU linker is very broken if test "$host_cpu" != ia64; then ld_shlibs=no @@ -179,7 +188,7 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. hardcode_libdir_flag_spec='-L$libdir' @@ -189,11 +198,11 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; - interix3*) + interix[3-9]*) hardcode_direct=no hardcode_libdir_flag_spec='${wl}-rpath,$libdir' ;; - linux*) + gnu* | linux* | k*bsd*-gnu) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : else @@ -251,7 +260,7 @@ else hardcode_direct=unsupported fi ;; - aix4* | aix5*) + aix[4-9]*) if test "$host_cpu" = ia64; then # On IA64, the linker does run time linking by default, so we don't # have to do anything special. @@ -261,7 +270,7 @@ else # Test if we are trying to use run time linking or normal # AIX style linking. If -brtl is somewhere in LDFLAGS, we # need to do runtime linking. - case $host_os in aix4.[23]|aix4.[23].*|aix5*) + case $host_os in aix4.[23]|aix4.[23].*|aix[5-9]*) for ld_flag in $LDFLAGS; do if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then aix_use_runtimelinking=yes @@ -280,7 +289,7 @@ else strings "$collect2name" | grep resolve_lib_name >/dev/null then # We have reworked collect2 - hardcode_direct=yes + : else # We have old collect2 hardcode_direct=unsupported @@ -323,7 +332,7 @@ else ;; bsdi[45]*) ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using # Microsoft Visual C++. # hardcode_libdir_flag_spec is actually meaningless, as there is @@ -359,7 +368,7 @@ else hardcode_direct=yes hardcode_minus_L=yes ;; - freebsd* | kfreebsd*-gnu | dragonfly*) + freebsd* | dragonfly*) hardcode_libdir_flag_spec='-R$libdir' hardcode_direct=yes ;; @@ -412,18 +421,22 @@ else hardcode_libdir_separator=: ;; openbsd*) - hardcode_direct=yes - if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + if test -f /usr/libexec/ld.so; then + hardcode_direct=yes + if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + else + case "$host_os" in + openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) + hardcode_libdir_flag_spec='-R$libdir' + ;; + *) + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + esac + fi else - case "$host_os" in - openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*) - hardcode_libdir_flag_spec='-R$libdir' - ;; - *) - hardcode_libdir_flag_spec='${wl}-rpath,$libdir' - ;; - esac + ld_shlibs=no fi ;; os2*) @@ -471,7 +484,7 @@ else ld_shlibs=yes fi ;; - sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7* | sco3.2v5.0.[024]*) ;; sysv5* | sco3.2v5* | sco5v6*) hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' @@ -487,34 +500,52 @@ else fi # Check dynamic linker characteristics -# Code taken from libtool.m4's AC_LIBTOOL_SYS_DYNAMIC_LINKER. +# Code taken from libtool.m4's _LT_SYS_DYNAMIC_LINKER. +# Unlike libtool.m4, here we don't care about _all_ names of the library, but +# only about the one the linker finds when passed -lNAME. This is the last +# element of library_names_spec in libtool.m4, or possibly two of them if the +# linker has special search rules. +library_names_spec= # the last element of library_names_spec in libtool.m4 libname_spec='lib$name' case "$host_os" in aix3*) + library_names_spec='$libname.a' ;; - aix4* | aix5*) + aix[4-9]*) + library_names_spec='$libname$shrext' ;; amigaos*) + library_names_spec='$libname.a' ;; beos*) + library_names_spec='$libname$shrext' ;; bsdi[45]*) + library_names_spec='$libname$shrext' ;; - cygwin* | mingw* | pw32*) + cygwin* | mingw* | pw32* | cegcc*) shrext=.dll + library_names_spec='$libname.dll.a $libname.lib' ;; darwin* | rhapsody*) shrext=.dylib + library_names_spec='$libname$shrext' ;; dgux*) + library_names_spec='$libname$shrext' ;; freebsd1*) ;; - kfreebsd*-gnu) - ;; freebsd* | dragonfly*) + case "$host_os" in + freebsd[123]*) + library_names_spec='$libname$shrext$versuffix' ;; + *) + library_names_spec='$libname$shrext' ;; + esac ;; gnu*) + library_names_spec='$libname$shrext' ;; hpux9* | hpux10* | hpux11*) case $host_cpu in @@ -528,10 +559,13 @@ case "$host_os" in shrext=.sl ;; esac + library_names_spec='$libname$shrext' ;; - interix3*) + interix[3-9]*) + library_names_spec='$libname$shrext' ;; irix5* | irix6* | nonstopux*) + library_names_spec='$libname$shrext' case "$host_os" in irix5* | nonstopux*) libsuff= shlibsuff= @@ -548,41 +582,59 @@ case "$host_os" in ;; linux*oldld* | linux*aout* | linux*coff*) ;; - linux*) + linux* | k*bsd*-gnu) + library_names_spec='$libname$shrext' ;; knetbsd*-gnu) + library_names_spec='$libname$shrext' ;; netbsd*) + library_names_spec='$libname$shrext' ;; newsos6) + library_names_spec='$libname$shrext' ;; nto-qnx*) + library_names_spec='$libname$shrext' ;; openbsd*) + library_names_spec='$libname$shrext$versuffix' ;; os2*) libname_spec='$name' shrext=.dll + library_names_spec='$libname.a' ;; osf3* | osf4* | osf5*) + library_names_spec='$libname$shrext' + ;; + rdos*) ;; solaris*) + library_names_spec='$libname$shrext' ;; sunos4*) + library_names_spec='$libname$shrext$versuffix' ;; sysv4 | sysv4.3*) + library_names_spec='$libname$shrext' ;; sysv4*MP*) + library_names_spec='$libname$shrext' ;; sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + library_names_spec='$libname$shrext' ;; uts4*) + library_names_spec='$libname$shrext' ;; esac sed_quote_subst='s/\(["`$\\]\)/\\\1/g' escaped_wl=`echo "X$wl" | sed -e 's/^X//' -e "$sed_quote_subst"` shlibext=`echo "$shrext" | sed -e 's,^\.,,'` +escaped_libname_spec=`echo "X$libname_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` +escaped_library_names_spec=`echo "X$library_names_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` escaped_hardcode_libdir_flag_spec=`echo "X$hardcode_libdir_flag_spec" | sed -e 's/^X//' -e "$sed_quote_subst"` LC_ALL=C sed -e 's/^\([a-zA-Z0-9_]*\)=/acl_cv_\1=/' <<EOF @@ -596,6 +648,12 @@ libext="$libext" # Shared library suffix (normally "so"). shlibext="$shlibext" +# Format of library name prefix. +libname_spec="$escaped_libname_spec" + +# Library names that the linker finds when passed -lNAME. +library_names_spec="$escaped_library_names_spec" + # Flag to hardcode \$libdir into a binary during linking. # This must work even if \$libdir does not exist. hardcode_libdir_flag_spec="$escaped_hardcode_libdir_flag_spec" diff --git a/Build/source/extra/xz/build-aux/depcomp b/Build/source/extra/xz/build-aux/depcomp index 31788017b8f..4ebd5b3a2f2 100755 --- a/Build/source/extra/xz/build-aux/depcomp +++ b/Build/source/extra/xz/build-aux/depcomp @@ -251,6 +251,41 @@ hp) exit 1 ;; +sgi) + if test "$libtool" = yes; then + "$@" "-Wp,-MDupdate,$tmpdepfile" + else + "$@" -MDupdate "$tmpdepfile" + fi + stat=$? + if test $stat -ne 0; then + rm -f "$tmpdepfile" + exit $stat + fi + rm -f "$depfile" + + if test -f "$tmpdepfile"; then # yes, the sourcefile depend on other files + echo "$object : \\" > "$depfile" + # Clip off the initial element (the dependent). Don't try to be + # clever and replace this with sed code, as IRIX sed won't handle + # lines with more than a fixed number of characters (4096 in + # IRIX 6.2 sed, 8192 in IRIX 6.5). We also remove comment lines; + # the IRIX cc adds comments like '#:fec' to the end of the + # dependency line. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' \ + | tr "$nl" ' ' >> "$depfile" + echo >> "$depfile" + # The second pass generates a dummy entry for each header file. + tr ' ' "$nl" < "$tmpdepfile" \ + | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \ + >> "$depfile" + else + make_dummy_depfile + fi + rm -f "$tmpdepfile" + ;; + xlc) # This case exists only to let depend.m4 do its work. It works by # looking at the text of this script. This case will never be run, diff --git a/Build/source/extra/xz/build-aux/ltmain.sh b/Build/source/extra/xz/build-aux/ltmain.sh index 3061e3c5a2f..63ae69dc6fe 100755 --- a/Build/source/extra/xz/build-aux/ltmain.sh +++ b/Build/source/extra/xz/build-aux/ltmain.sh @@ -1,9 +1,9 @@ -# libtool (GNU libtool) 2.4 +# libtool (GNU libtool) 2.4.2 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, -# 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. # This is free software; see the source for copying conditions. There is NO # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. @@ -41,6 +41,7 @@ # --quiet, --silent don't print informational messages # --no-quiet, --no-silent # print informational messages (default) +# --no-warn don't display warning messages # --tag=TAG use configuration variables from tag TAG # -v, --verbose print more informational messages than default # --no-verbose don't print the extra informational messages @@ -69,7 +70,7 @@ # compiler: $LTCC # compiler flags: $LTCFLAGS # linker: $LD (gnu? $with_gnu_ld) -# $progname: (GNU libtool) 2.4 +# $progname: (GNU libtool) 2.4.2 # automake: $automake_version # autoconf: $autoconf_version # @@ -79,9 +80,9 @@ PROGRAM=libtool PACKAGE=libtool -VERSION=2.4 +VERSION=2.4.2 TIMESTAMP="" -package_revision=1.3293 +package_revision=1.3337 # Be Bourne compatible if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then @@ -136,15 +137,10 @@ progpath="$0" : ${CP="cp -f"} test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'} -: ${EGREP="grep -E"} -: ${FGREP="grep -F"} -: ${GREP="grep"} -: ${LN_S="ln -s"} : ${MAKE="make"} : ${MKDIR="mkdir"} : ${MV="mv -f"} : ${RM="rm -f"} -: ${SED="sed"} : ${SHELL="${CONFIG_SHELL-/bin/sh}"} : ${Xsed="$SED -e 1s/^X//"} @@ -387,7 +383,7 @@ case $progpath in ;; *) save_IFS="$IFS" - IFS=: + IFS=${PATH_SEPARATOR-:} for progdir in $PATH; do IFS="$save_IFS" test -x "$progdir/$progname" && break @@ -771,8 +767,8 @@ func_help () s*\$LTCFLAGS*'"$LTCFLAGS"'* s*\$LD*'"$LD"'* s/\$with_gnu_ld/'"$with_gnu_ld"'/ - s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/ - s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/ + s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/ + s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/ p d } @@ -1052,6 +1048,7 @@ opt_finish=false opt_help=false opt_help_all=false opt_silent=: +opt_warning=: opt_verbose=: opt_silent=false opt_verbose=false @@ -1120,6 +1117,10 @@ esac opt_silent=false func_append preserve_args " $opt" ;; + --no-warning|--no-warn) + opt_warning=false +func_append preserve_args " $opt" + ;; --no-verbose) opt_verbose=false func_append preserve_args " $opt" @@ -2059,7 +2060,7 @@ func_mode_compile () *.[cCFSifmso] | \ *.ada | *.adb | *.ads | *.asm | \ *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \ - *.[fF][09]? | *.for | *.java | *.obj | *.sx | *.cu | *.cup) + *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup) func_xform "$libobj" libobj=$func_xform_result ;; @@ -3201,11 +3202,13 @@ func_mode_install () # Set up the ranlib parameters. oldlib="$destdir/$name" + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result func_show_eval "$install_prog \$file \$oldlib" 'exit $?' if test -n "$stripme" && test -n "$old_striplib"; then - func_show_eval "$old_striplib $oldlib" 'exit $?' + func_show_eval "$old_striplib $tool_oldlib" 'exit $?' fi # Do each command in the postinstall commands. @@ -3470,7 +3473,7 @@ static const void *lt_preloaded_setup() { # linked before any other PIC object. But we must not use # pic_flag when linking with -static. The problem exists in # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1. - *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) + *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;; *-*-hpux*) pic_flag_for_symtable=" $pic_flag" ;; @@ -3982,14 +3985,17 @@ func_exec_program_core () # launches target application with the remaining arguments. func_exec_program () { - for lt_wr_arg - do - case \$lt_wr_arg in - --lt-*) ;; - *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; - esac - shift - done + case \" \$* \" in + *\\ --lt-*) + for lt_wr_arg + do + case \$lt_wr_arg in + --lt-*) ;; + *) set x \"\$@\" \"\$lt_wr_arg\"; shift;; + esac + shift + done ;; + esac func_exec_program_core \${1+\"\$@\"} } @@ -5057,9 +5063,15 @@ void lt_dump_script (FILE* f) { EOF func_emit_wrapper yes | - $SED -e 's/\([\\"]\)/\\\1/g' \ - -e 's/^/ fputs ("/' -e 's/$/\\n", f);/' - + $SED -n -e ' +s/^\(.\{79\}\)\(..*\)/\1\ +\2/ +h +s/\([\\"]\)/\\\1/g +s/$/\\n/ +s/\([^\n]*\).*/ fputs ("\1", f);/p +g +D' cat <<"EOF" } EOF @@ -5643,7 +5655,8 @@ func_mode_link () continue ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) func_append compiler_flags " $arg" func_append compile_command " $arg" func_append finalize_command " $arg" @@ -6147,7 +6160,8 @@ func_mode_link () lib= found=no case $deplib in - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads) + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ + |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) if test "$linkmode,$pass" = "prog,link"; then compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" @@ -6831,7 +6845,7 @@ func_mode_link () test "$hardcode_direct_absolute" = no; then add="$dir/$linklib" elif test "$hardcode_minus_L" = yes; then - add_dir="-L$dir" + add_dir="-L$absdir" # Try looking first in the location we're being installed to. if test -n "$inst_prefix_dir"; then case $libdir in @@ -7316,6 +7330,7 @@ func_mode_link () # which has an extra 1 added just for fun # case $version_type in + # correct linux to gnu/linux during the next big refactor darwin|linux|osf|windows|none) func_arith $number_major + $number_minor current=$func_arith_result @@ -7432,7 +7447,7 @@ func_mode_link () versuffix="$major.$revision" ;; - linux) + linux) # correct to gnu/linux during the next big refactor func_arith $current - $age major=.$func_arith_result versuffix="$major.$age.$revision" @@ -8020,6 +8035,11 @@ EOF # Test again, we may have decided not to build it any more if test "$build_libtool_libs" = yes; then + # Remove ${wl} instances when linking with ld. + # FIXME: should test the right _cmds variable. + case $archive_cmds in + *\$LD\ *) wl= ;; + esac if test "$hardcode_into_libs" = yes; then # Hardcode the library paths hardcode_libdirs= @@ -8050,7 +8070,7 @@ EOF elif test -n "$runpath_var"; then case "$perm_rpath " in *" $libdir "*) ;; - *) func_apped perm_rpath " $libdir" ;; + *) func_append perm_rpath " $libdir" ;; esac fi done @@ -8058,11 +8078,7 @@ EOF if test -n "$hardcode_libdir_separator" && test -n "$hardcode_libdirs"; then libdir="$hardcode_libdirs" - if test -n "$hardcode_libdir_flag_spec_ld"; then - eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" - else - eval dep_rpath=\"$hardcode_libdir_flag_spec\" - fi + eval "dep_rpath=\"$hardcode_libdir_flag_spec\"" fi if test -n "$runpath_var" && test -n "$perm_rpath"; then # We should set the runpath_var. @@ -9152,6 +9168,8 @@ EOF esac done fi + func_to_tool_file "$oldlib" func_convert_file_msys_to_w32 + tool_oldlib=$func_to_tool_file_result eval cmds=\"$old_archive_cmds\" func_len " $cmds" @@ -9261,7 +9279,8 @@ EOF *.la) func_basename "$deplib" name="$func_basename_result" - eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` + func_resolve_sysroot "$deplib" + eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result` test -z "$libdir" && \ func_fatal_error "\`$deplib' is not a valid libtool archive" func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name" diff --git a/Build/source/extra/xz/build-aux/missing b/Build/source/extra/xz/build-aux/missing index ed429b4dd9b..cdea514931f 100755 --- a/Build/source/extra/xz/build-aux/missing +++ b/Build/source/extra/xz/build-aux/missing @@ -3,7 +3,7 @@ scriptversion=2012-06-26.16; # UTC -# Copyright (C) 1996-2012 Free Software Foundation, Inc. +# Copyright (C) 1996-2013 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff --git a/Build/source/extra/xz/config.h.in b/Build/source/extra/xz/config.h.in index 3f0ae116bfa..f9fc57f628f 100644 --- a/Build/source/extra/xz/config.h.in +++ b/Build/source/extra/xz/config.h.in @@ -125,7 +125,7 @@ /* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if you have the iconv() function. */ +/* Define if you have the iconv() function and it works. */ #undef HAVE_ICONV /* Define to 1 if you have the <inttypes.h> header file. */ @@ -161,6 +161,9 @@ /* Define if you have POSIX threads libraries and header files. */ #undef HAVE_PTHREAD +/* Have PTHREAD_PRIO_INHERIT. */ +#undef HAVE_PTHREAD_PRIO_INHERIT + /* Define to 1 if optimizing for size. */ #undef HAVE_SMALL @@ -241,9 +244,6 @@ /* Define to 1 to disable debugging code. */ #undef NDEBUG -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE @@ -356,6 +356,11 @@ # endif #endif +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS @@ -418,4 +423,3 @@ /* Define to the type of an unsigned integer type wide enough to hold a pointer, if such a type exists, and if the system does not define it. */ #undef uintptr_t - diff --git a/Build/source/extra/xz/configure b/Build/source/extra/xz/configure index b63c4bd6990..57316967cc9 100755 --- a/Build/source/extra/xz/configure +++ b/Build/source/extra/xz/configure @@ -1,13 +1,11 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for XZ Utils 5.0.3. +# Generated by GNU Autoconf 2.69 for XZ Utils 5.0.5. # # Report bugs to <lasse.collin@tukaani.org>. # # -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software -# Foundation, Inc. +# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. # # # This configure script is free software; the Free Software Foundation @@ -136,6 +134,31 @@ export LANGUAGE # CDPATH. (unset CDPATH) >/dev/null 2>&1 && unset CDPATH +# Use a proper internal environment variable to ensure we don't fall + # into an infinite loop, continuously re-executing ourselves. + if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then + _as_can_reexec=no; export _as_can_reexec; + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +as_fn_exit 255 + fi + # We don't want this to propagate to other subprocesses. + { _as_can_reexec=; unset _as_can_reexec;} if test "x$CONFIG_SHELL" = x; then as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : emulate sh @@ -169,7 +192,8 @@ if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : else exitcode=1; echo positional parameters were not saved. fi -test x\$exitcode = x0 || exit 1" +test x\$exitcode = x0 || exit 1 +test -x / || exit 1" as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && @@ -222,21 +246,25 @@ IFS=$as_save_IFS if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - # Preserve -v and -x to the replacement shell. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - case $- in # (((( - *v*x* | *x*v* ) as_opts=-vx ;; - *v* ) as_opts=-v ;; - *x* ) as_opts=-x ;; - * ) as_opts= ;; - esac - exec "$CONFIG_SHELL" $as_opts "$as_myself" ${1+"$@"} + export CONFIG_SHELL + # We cannot yet assume a decent shell, so we have to provide a +# neutralization value for shells without unset; and this also +# works around shells that cannot unset nonexistent variables. +# Preserve -v and -x to the replacement shell. +BASH_ENV=/dev/null +ENV=/dev/null +(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV +case $- in # (((( + *v*x* | *x*v* ) as_opts=-vx ;; + *v* ) as_opts=-v ;; + *x* ) as_opts=-x ;; + * ) as_opts= ;; +esac +exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"} +# Admittedly, this is quite paranoid, since all the known shells bail +# out after a failed `exec'. +$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2 +exit 255 fi if test x$as_have_required = xno; then : @@ -339,6 +367,14 @@ $as_echo X"$as_dir" | } # as_fn_mkdir_p + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p # as_fn_append VAR VALUE # ---------------------- # Append the text in VALUE to the end of the definition contained in VAR. Take @@ -460,6 +496,10 @@ as_cr_alnum=$as_cr_Letters$as_cr_digits chmod +x "$as_me.lineno" || { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + # If we had to re-execute with $CONFIG_SHELL, we're ensured to have + # already done that, so ensure we don't try to do so again and fall + # in an infinite loop. This has already happened in practice. + _as_can_reexec=no; export _as_can_reexec # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the # original and so on. Autoconf is especially sensitive to this). @@ -494,16 +534,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -515,28 +555,8 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -570,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='XZ Utils' PACKAGE_TARNAME='xz' -PACKAGE_VERSION='5.0.3' -PACKAGE_STRING='XZ Utils 5.0.3' +PACKAGE_VERSION='5.0.5' +PACKAGE_STRING='XZ Utils 5.0.5' PACKAGE_BUGREPORT='lasse.collin@tukaani.org' PACKAGE_URL='http://tukaani.org/xz/' @@ -631,6 +651,7 @@ INTLLIBS LTLIBICONV LIBICONV INTL_MACOSX_LIBS +XGETTEXT_EXTRA_OPTIONS MSGMERGE XGETTEXT_015 XGETTEXT @@ -638,6 +659,7 @@ GMSGFMT_015 MSGFMT_015 GMSGFMT MSGFMT +GETTEXT_MACRO_VERSION USE_NLS COND_SHARED_FALSE COND_SHARED_TRUE @@ -664,7 +686,7 @@ AS PTHREAD_CFLAGS PTHREAD_LIBS PTHREAD_CC -acx_pthread_config +ax_pthread_config EGREP GREP CPP @@ -676,6 +698,7 @@ CCAS am__fastdepCC_FALSE am__fastdepCC_TRUE CCDEPMODE +am__nodep AMDEPBACKSLASH AMDEP_FALSE AMDEP_TRUE @@ -690,6 +713,10 @@ LDFLAGS CFLAGS CC LN_S +AM_BACKSLASH +AM_DEFAULT_VERBOSITY +AM_DEFAULT_V +AM_V am__untar am__tar AMTAR @@ -876,6 +903,7 @@ enable_lzmadec enable_lzmainfo enable_lzma_links enable_scripts +enable_silent_rules enable_dependency_tracking enable_shared enable_static @@ -1358,8 +1386,6 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host. - If a cross compiler is detected then cross compile mode will be used" >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes fi @@ -1445,7 +1471,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures XZ Utils 5.0.3 to adapt to many kinds of systems. +\`configure' configures XZ Utils 5.0.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1515,7 +1541,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of XZ Utils 5.0.3:";; + short | recursive ) echo "Configuration of XZ Utils 5.0.5:";; esac cat <<\_ACEOF @@ -1557,8 +1583,12 @@ Optional Features: --disable-lzma-links do not create symlinks for LZMA Utils compatibility --disable-scripts do not install the scripts xzdiff, xzgrep, xzless, xzmore, and their symlinks - --disable-dependency-tracking speeds up one-time build - --enable-dependency-tracking do not reject slow dependency extractors + --enable-silent-rules less verbose build output (undo: "make V=1") + --disable-silent-rules verbose build output (undo: "make V=0") + --enable-dependency-tracking + do not reject slow dependency extractors + --disable-dependency-tracking + speeds up one-time build --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] --enable-fast-install[=PKGS] @@ -1578,7 +1608,7 @@ Optional Features: Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) - --with-pic try to use only PIC/non-PIC objects [default=use + --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use both] --with-gnu-ld assume the C compiler uses GNU ld [default=no] --with-sysroot=DIR Search for dependent libraries within DIR @@ -1668,10 +1698,10 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -XZ Utils configure 5.0.3 -generated by GNU Autoconf 2.68 +XZ Utils configure 5.0.5 +generated by GNU Autoconf 2.69 -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF @@ -1948,7 +1978,7 @@ $as_echo "$ac_try_echo"; } >&5 test ! -s conftest.err } && test -s conftest$ac_exeext && { test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext + test -x conftest$ac_exeext }; then : ac_retval=0 else @@ -2112,7 +2142,8 @@ int main () { static int test_array [1 - 2 * !((($ac_type) -1 >> ($2 / 2 - 1)) >> ($2 / 2 - 1) == 3)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2166,7 +2197,8 @@ int main () { static int test_array [1 - 2 * !(0 < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2182,7 +2214,8 @@ main () { static int test_array [1 - 2 * !(($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 1) < ($ac_type) ((((($ac_type) 1 << N) << N) - 1) * 2 + 2))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2232,7 +2265,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2248,7 +2282,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2274,7 +2309,8 @@ int main () { static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2290,7 +2326,8 @@ int main () { static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2324,7 +2361,8 @@ int main () { static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -2499,8 +2537,8 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by XZ Utils $as_me 5.0.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +It was created by XZ Utils $as_me 5.0.5, which was +generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4027,7 +4065,8 @@ fi echo echo "Initializing Automake:" -am__api_version='1.11' +# Automake 1.10 should still be enough but you need to omit serial-tests. +am__api_version='1.14' # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or @@ -4066,7 +4105,7 @@ case $as_dir/ in #(( # by default. for ac_prog in ginstall scoinst install; do for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then if test $ac_prog = install && grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. @@ -4124,9 +4163,6 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } -# Just in case -sleep 1 -echo timestamp > conftest.file # Reject unsafe characters in $srcdir or the absolute working directory # name. Accept space and tab only in the latter. am_lf=' @@ -4137,32 +4173,40 @@ case `pwd` in esac case $srcdir in *[\\\"\#\$\&\'\`$am_lf\ \ ]*) - as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;; + as_fn_error $? "unsafe srcdir value: '$srcdir'" "$LINENO" 5;; esac -# Do `set' in a subshell so we don't clobber the current shell's +# Do 'set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` - if test "$*" = "X"; then - # -L didn't work. - set X `ls -t "$srcdir/configure" conftest.file` - fi - rm -f conftest.file - if test "$*" != "X $srcdir/configure conftest.file" \ - && test "$*" != "X conftest.file $srcdir/configure"; then - - # If neither matched, then we have a broken ls. This can happen - # if, for instance, CONFIG_SHELL is bash and it inherits a - # broken ls alias from the environment. This has actually - # happened. Such a system could not be considered "sane". - as_fn_error $? "ls -t appears to fail. Make sure there is not a broken -alias in your environment" "$LINENO" 5 - fi - + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + as_fn_error $? "ls -t appears to fail. Make sure there is not a broken + alias in your environment" "$LINENO" 5 + fi + if test "$2" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done test "$2" = conftest.file ) then @@ -4174,6 +4218,16 @@ Check your system clock" "$LINENO" 5 fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi + +rm -f conftest.file + test "$program_prefix" != NONE && program_transform_name="s&^&$program_prefix&;$program_transform_name" # Use a double $ so make ignores it. @@ -4196,12 +4250,12 @@ if test x"${MISSING+set}" != xset; then esac fi # Use eval to expand $SHELL -if eval "$MISSING --run true"; then - am_missing_run="$MISSING --run " +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " else am_missing_run= - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5 -$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: 'missing' script is too old or missing" >&5 +$as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi if test x"${install_sh}" != xset; then @@ -4213,10 +4267,10 @@ if test x"${install_sh}" != xset; then esac fi -# Installed binaries are usually stripped using `strip' when the user -# run `make install-strip'. However `strip' might not be the right +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right # tool to use in cross-compilation environments, therefore Automake -# will honor the `STRIP' environment variable to overrule this program. +# will honor the 'STRIP' environment variable to overrule this program. if test "$cross_compiling" != no; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. @@ -4235,7 +4289,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4275,7 +4329,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4326,7 +4380,7 @@ do test -z "$as_dir" && as_dir=. for ac_prog in mkdir gmkdir; do for ac_exec_ext in '' $ac_executable_extensions; do - { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( 'mkdir (GNU coreutils) '* | \ 'mkdir (coreutils) '* | \ @@ -4355,12 +4409,6 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5 $as_echo "$MKDIR_P" >&6; } -mkdir_p="$MKDIR_P" -case $mkdir_p in - [\\/$]* | ?:[\\/]*) ;; - */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; -esac - for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -4379,7 +4427,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4443,6 +4491,45 @@ else fi rmdir .tst 2>/dev/null +# Check whether --enable-silent-rules was given. +if test "${enable_silent_rules+set}" = set; then : + enableval=$enable_silent_rules; +fi + +case $enable_silent_rules in # ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=1;; +esac +am_make=${MAKE-make} +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $am_make supports nested variables" >&5 +$as_echo_n "checking whether $am_make supports nested variables... " >&6; } +if ${am_cv_make_support_nested_variables+:} false; then : + $as_echo_n "(cached) " >&6 +else + if $as_echo 'TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit' | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_make_support_nested_variables" >&5 +$as_echo "$am_cv_make_support_nested_variables" >&6; } +if test $am_cv_make_support_nested_variables = yes; then + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AM_BACKSLASH='\' + if test "`cd $srcdir && pwd`" != "`pwd`"; then # Use -I$(srcdir) only when $(srcdir) != ., so that make's output # is not polluted with repeated "-I." @@ -4465,7 +4552,7 @@ fi # Define the identity of the package. PACKAGE='xz' - VERSION='5.0.3' + VERSION='5.0.5' cat >>confdefs.h <<_ACEOF @@ -4493,18 +4580,70 @@ AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00001.html> +# <http://lists.gnu.org/archive/html/automake/2012-07/msg00014.html> +mkdir_p='$(MKDIR_P)' + # We need awk for the "check" target. The system "awk" is bad on # some platforms. -# Always define AMTAR for backward compatibility. +# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AMTAR='$${TAR-tar}' + + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar pax cpio none' + +am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -' + -AMTAR=${AMTAR-"${am_missing_run}tar"} -am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5 $as_echo_n "checking whether ln -s works... " >&6; } LN_S=$as_ln_s @@ -4536,7 +4675,7 @@ am__quote= _am_result=none # First try GNU make style include. echo "include confinc" > confmf -# Ignore all kinds of additional output from `make'. +# Ignore all kinds of additional output from 'make'. case `$am_make -s -f confmf 2> /dev/null` in #( *the\ am__doit\ target*) am__include=include @@ -4569,6 +4708,7 @@ fi if test "x$enable_dependency_tracking" != xno; then am_depcomp="$ac_aux_dir/depcomp" AMDEPBACKSLASH='\' + am__nodep='_no' fi if test "x$enable_dependency_tracking" != xno; then AMDEP_TRUE= @@ -4601,7 +4741,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4641,7 +4781,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4694,7 +4834,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4735,7 +4875,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue @@ -4793,7 +4933,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -4837,7 +4977,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -5283,8 +5423,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <stdarg.h> #include <stdio.h> -#include <sys/types.h> -#include <sys/stat.h> +struct stat; /* Most of the following tests are stolen from RCS 5.7's src/conf.sh. */ struct buf { int x; }; FILE * (*rcsopen) (struct buf *, struct stat *, int); @@ -5369,6 +5508,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + depcc="$CC" am_compiler_list= { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5 @@ -5380,8 +5578,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5415,16 +5614,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5433,16 +5632,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -5642,7 +5841,7 @@ main () return 0; } _ACEOF -for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -xc99=all -qlanglvl=extc99 +for ac_arg in '' -std=gnu99 -std=c99 -c99 -AC99 -D_STDC_C99= -qlanglvl=extc99 do CC="$ac_save_CC $ac_arg" if ac_fn_c_try_compile "$LINENO"; then : @@ -5677,131 +5876,6 @@ if test x$ac_cv_prog_cc_c99 = xno ; then as_fn_error $? "No C99 compiler was found." "$LINENO" 5 fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - # By default we simply use the C compiler to build assembly code. @@ -5821,8 +5895,9 @@ else # We make a subdir and do the tests there. Otherwise we can end up # making bogus files that we don't know about and never remove. For # instance it was reported that on HP-UX the gcc test will end up - # making a dummy file named `D' -- because `-MD' means `put the output - # in D'. + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir mkdir conftest.dir # Copy depcomp to subdir because otherwise we won't find it if we're # using a relative directory. @@ -5854,16 +5929,16 @@ else : > sub/conftest.c for i in 1 2 3 4 5 6; do echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with - # Solaris 8's {/usr,}/bin/sh. - touch sub/conftst$i.h + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h done echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf - # We check with `-c' and `-o' for the sake of the "dashmstdout" + # We check with '-c' and '-o' for the sake of the "dashmstdout" # mode. It turns out that the SunPro C++ compiler does not properly - # handle `-M -o', and we need to detect this. Also, some Intel - # versions had trouble with output in subdirs + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. am__obj=sub/conftest.${OBJEXT-o} am__minus_obj="-o $am__obj" case $depmode in @@ -5872,16 +5947,16 @@ else test "$am__universal" = false || continue ;; nosideeffect) - # after this tag, mechanisms are not by side-effect, so they'll - # only be used when explicitly requested + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. if test "x$enable_dependency_tracking" = xyes; then continue else break fi ;; - msvisualcpp | msvcmsys) - # This compiler won't grok `-c -o', but also, the minuso test has + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has # not run yet. These depmodes are late enough in the game, and # so weak that their functioning should not be impacted. am__obj=conftest.${OBJEXT-o} @@ -6090,7 +6165,7 @@ do for ac_prog in grep ggrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue + as_fn_executable_p "$ac_path_GREP" || continue # Check for GNU ac_path_GREP and select it if it is found. # Check for GNU $ac_path_GREP case `"$ac_path_GREP" --version 2>&1` in @@ -6156,7 +6231,7 @@ do for ac_prog in egrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue + as_fn_executable_p "$ac_path_EGREP" || continue # Check for GNU ac_path_EGREP and select it if it is found. # Check for GNU $ac_path_EGREP case `"$ac_path_EGREP" --version 2>&1` in @@ -6363,8 +6438,8 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -# define __EXTENSIONS__ 1 - $ac_includes_default +# define __EXTENSIONS__ 1 + $ac_includes_default int main () { @@ -6400,14 +6475,13 @@ if test "x$enable_threads" = xyes; then echo "Threading support:" - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -acx_pthread_ok=no +ax_pthread_ok=no # We used to check for pthread.h first, but this fails if pthread.h # requires special compiler flags (e.g. on True64 or Sequent). @@ -6442,13 +6516,13 @@ return pthread_join (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes + ax_pthread_ok=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test x"$acx_pthread_ok" = xno; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +$as_echo "$ax_pthread_ok" >&6; } + if test x"$ax_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" fi @@ -6466,7 +6540,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -6488,8 +6562,8 @@ acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -m # --thread-safe: KAI C++ # pthread-config: use pthread-config program (for GNU Pth library) -case "${host_cpu}-${host_os}" in - *solaris*) +case ${host_os} in + solaris*) # On Solaris (at least, for some versions), libc contains stubbed # (non-functional) versions of the pthreads routines, so link-based @@ -6499,12 +6573,16 @@ case "${host_cpu}-${host_os}" in # who knows whether they'll stub that too in a future libc.) So, # we'll just look for -pthreads and -lpthread first: - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; + + darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" ;; esac -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do +if test x"$ax_pthread_ok" = xno; then +for flag in $ax_pthread_flags; do case $flag in none) @@ -6518,16 +6596,16 @@ $as_echo_n "checking whether pthreads work with $flag... " >&6; } PTHREAD_CFLAGS="$flag" ;; - pthread-config) - # Extract the first word of "pthread-config", so it can be a program name with args. + pthread-config) + # Extract the first word of "pthread-config", so it can be a program name with args. set dummy pthread-config; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_prog_acx_pthread_config+:} false; then : +if ${ac_cv_prog_ax_pthread_config+:} false; then : $as_echo_n "(cached) " >&6 else - if test -n "$acx_pthread_config"; then - ac_cv_prog_acx_pthread_config="$acx_pthread_config" # Let the user override the test. + if test -n "$ax_pthread_config"; then + ac_cv_prog_ax_pthread_config="$ax_pthread_config" # Let the user override the test. else as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH @@ -6535,8 +6613,8 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then - ac_cv_prog_acx_pthread_config="yes" + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ax_pthread_config="yes" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi @@ -6544,23 +6622,23 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_prog_acx_pthread_config" && ac_cv_prog_acx_pthread_config="no" + test -z "$ac_cv_prog_ax_pthread_config" && ac_cv_prog_ax_pthread_config="no" fi fi -acx_pthread_config=$ac_cv_prog_acx_pthread_config -if test -n "$acx_pthread_config"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_config" >&5 -$as_echo "$acx_pthread_config" >&6; } +ax_pthread_config=$ac_cv_prog_ax_pthread_config +if test -n "$ax_pthread_config"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_config" >&5 +$as_echo "$ax_pthread_config" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking for the pthreads library -l$flag" >&5 @@ -6586,18 +6664,23 @@ $as_echo_n "checking for the pthreads library -l$flag... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; } int main () { -pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); +pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */ ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - acx_pthread_ok=yes + ax_pthread_ok=yes fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext @@ -6605,9 +6688,9 @@ rm -f core conftest.err conftest.$ac_objext \ LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acx_pthread_ok" >&5 -$as_echo "$acx_pthread_ok" >&6; } - if test "x$acx_pthread_ok" = xyes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_pthread_ok" >&5 +$as_echo "$ax_pthread_ok" >&6; } + if test "x$ax_pthread_ok" = xyes; then break; fi @@ -6617,24 +6700,24 @@ done fi # Various other checks: -if test "x$acx_pthread_ok" = xyes; then +if test "x$ax_pthread_ok" = xyes; then save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for joinable pthread attribute" >&5 $as_echo_n "checking for joinable pthread attribute... " >&6; } - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ #include <pthread.h> int main () { -int attr=$attr; return attr; +int attr = $attr; return attr /* ; */ ; return 0; } @@ -6644,7 +6727,7 @@ if ac_fn_c_try_link "$LINENO"; then : fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - done + done { $as_echo "$as_me:${as_lineno-$LINENO}: result: $attr_name" >&5 $as_echo "$attr_name" >&6; } if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then @@ -6658,9 +6741,16 @@ _ACEOF { $as_echo "$as_me:${as_lineno-$LINENO}: checking if more special flags are required for pthreads" >&5 $as_echo_n "checking if more special flags are required for pthreads... " >&6; } flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + case ${host_os} in + aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; + osf* | hpux*) flag="-D_REENTRANT";; + solaris*) + if test "$GCC" = "yes"; then + flag="-D_REENTRANT" + else + flag="-mt -D_REENTRANT" + fi + ;; esac { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${flag}" >&5 $as_echo "${flag}" >&6; } @@ -6668,11 +6758,46 @@ $as_echo "${flag}" >&6; } PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PTHREAD_PRIO_INHERIT" >&5 +$as_echo_n "checking for PTHREAD_PRIO_INHERIT... " >&6; } +if ${ax_cv_PTHREAD_PRIO_INHERIT+:} false; then : + $as_echo_n "(cached) " >&6 +else + + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + + #include <pthread.h> +int +main () +{ +int i = PTHREAD_PRIO_INHERIT; + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ax_cv_PTHREAD_PRIO_INHERIT=yes +else + ax_cv_PTHREAD_PRIO_INHERIT=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_PTHREAD_PRIO_INHERIT" >&5 +$as_echo "$ax_cv_PTHREAD_PRIO_INHERIT" >&6; } + if test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"; then : + +$as_echo "#define HAVE_PTHREAD_PRIO_INHERIT 1" >>confdefs.h + +fi + LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then + if test x"$GCC" != xyes; then for ac_prog in xlc_r cc_r do # Extract the first word of "$ac_prog", so it can be a program name with args. @@ -6691,7 +6816,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_PTHREAD_CC="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -6718,7 +6843,7 @@ test -n "$PTHREAD_CC" || PTHREAD_CC="${CC}" else PTHREAD_CC=$CC - fi + fi else PTHREAD_CC="$CC" fi @@ -6728,13 +6853,13 @@ fi # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then +if test x"$ax_pthread_ok" = xyes; then $as_echo "#define HAVE_PTHREAD 1" >>confdefs.h : else - acx_pthread_ok=no + ax_pthread_ok=no fi ac_ext=c @@ -6746,8 +6871,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu LIBS="$LIBS $PTHREAD_LIBS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" - CC="$PTHREAD_CC" -fi + + fi echo echo "Initializing Libtool:" @@ -6760,8 +6885,8 @@ esac -macro_version='2.4' -macro_revision='1.3293' +macro_version='2.4.2' +macro_revision='1.3337' @@ -6868,7 +6993,7 @@ do for ac_prog in sed gsed; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_SED="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue + as_fn_executable_p "$ac_path_SED" || continue # Check for GNU ac_path_SED and select it if it is found. # Check for GNU $ac_path_SED case `"$ac_path_SED" --version 2>&1` in @@ -6947,7 +7072,7 @@ do for ac_prog in fgrep; do for ac_exec_ext in '' $ac_executable_extensions; do ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue + as_fn_executable_p "$ac_path_FGREP" || continue # Check for GNU ac_path_FGREP and select it if it is found. # Check for GNU $ac_path_FGREP case `"$ac_path_FGREP" --version 2>&1` in @@ -7203,7 +7328,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7247,7 +7372,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DUMPBIN="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7394,6 +7519,11 @@ else lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -7433,7 +7563,7 @@ else # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -7655,7 +7785,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7695,7 +7825,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -7859,7 +7989,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -7998,7 +8128,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8038,7 +8168,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8138,7 +8268,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AR="$ac_tool_prefix$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8182,7 +8312,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AR="$ac_prog" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8307,7 +8437,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_STRIP="${ac_tool_prefix}strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8347,7 +8477,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_STRIP="strip" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8406,7 +8536,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8446,7 +8576,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RANLIB="ranlib" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -8496,13 +8626,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -8649,6 +8779,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK '"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -9037,7 +9168,7 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; } CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5 @@ -9048,7 +9179,20 @@ sparc*-*solaris*) case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -9081,7 +9225,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9121,7 +9265,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MANIFEST_TOOL="mt" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9201,7 +9345,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9241,7 +9385,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DSYMUTIL="dsymutil" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9293,7 +9437,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9333,7 +9477,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_NMEDIT="nmedit" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9385,7 +9529,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_LIPO="${ac_tool_prefix}lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9425,7 +9569,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_LIPO="lipo" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9477,7 +9621,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL="${ac_tool_prefix}otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9517,7 +9661,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL="otool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9569,7 +9713,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9609,7 +9753,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OTOOL64="otool64" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9688,7 +9832,13 @@ else $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&5 + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&5 @@ -9699,6 +9849,7 @@ else fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5 $as_echo "$lt_cv_apple_cc_single_mod" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; } if ${lt_cv_ld_exported_symbols_list+:} false; then : @@ -9731,6 +9882,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5 $as_echo_n "checking for -force_load linker flag... " >&6; } if ${lt_cv_ld_force_load+:} false; then : @@ -9752,7 +9904,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5 $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&5 + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&5 @@ -9837,7 +9991,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AS="${ac_tool_prefix}as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9877,7 +10031,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_AS="as" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9929,7 +10083,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -9969,7 +10123,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_DLLTOOL="dlltool" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10021,7 +10175,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10061,7 +10215,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_OBJDUMP="objdump" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -10188,7 +10342,22 @@ fi # Check whether --with-pic was given. if test "${with_pic+set}" = set; then : - withval=$with_pic; pic_mode="$withval" + withval=$with_pic; lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac else pic_mode=default fi @@ -10266,6 +10435,10 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtool' + + + + test -z "$LN_S" && LN_S="ln -s" @@ -10725,7 +10898,9 @@ lt_prog_compiler_static= case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 lt_prog_compiler_wl='-Xlinker ' - lt_prog_compiler_pic='-Xcompiler -fPIC' + if test -n "$lt_prog_compiler_pic"; then + lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic" + fi ;; esac else @@ -10816,18 +10991,33 @@ lt_prog_compiler_static= ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='' ;; + *Sun\ F* | *Sun*Fortran*) + lt_prog_compiler_pic='-KPIC' + lt_prog_compiler_static='-Bstatic' + lt_prog_compiler_wl='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 lt_prog_compiler_pic='-KPIC' lt_prog_compiler_static='-Bstatic' lt_prog_compiler_wl='-Wl,' ;; + *Intel*\ [CF]*Compiler*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fPIC' + lt_prog_compiler_static='-static' + ;; + *Portland\ Group*) + lt_prog_compiler_wl='-Wl,' + lt_prog_compiler_pic='-fpic' + lt_prog_compiler_static='-Bstatic' + ;; esac ;; esac @@ -11189,7 +11379,6 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie hardcode_direct=no hardcode_direct_absolute=no hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld= hardcode_libdir_separator= hardcode_minus_L=no hardcode_shlibpath_var=unsupported @@ -11439,8 +11628,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive' - hardcode_libdir_flag_spec= - hardcode_libdir_flag_spec_ld='-rpath $libdir' + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~ @@ -11819,6 +12007,7 @@ fi # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, )='true' enable_shared_with_static_runtimes=yes + exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib old_postinstall_cmds='chmod 644 $oldlib' @@ -11864,6 +12053,7 @@ fi hardcode_shlibpath_var=unsupported if test "$lt_cv_ld_force_load" = "yes"; then whole_archive_flag_spec='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + else whole_archive_flag_spec='' fi @@ -11892,10 +12082,6 @@ fi hardcode_shlibpath_var=no ;; - freebsd1*) - ld_shlibs=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -11908,7 +12094,7 @@ fi ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' hardcode_direct=yes hardcode_minus_L=yes @@ -11947,7 +12133,6 @@ fi fi if test "$with_gnu_ld" = no; then hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_flag_spec_ld='+b $libdir' hardcode_libdir_separator=: hardcode_direct=yes hardcode_direct_absolute=yes @@ -12571,11 +12756,6 @@ esac - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5 $as_echo_n "checking dynamic linker characteristics... " >&6; } @@ -12665,7 +12845,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -12674,7 +12854,7 @@ aix3*) ;; aix[4-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -12739,7 +12919,7 @@ beos*) ;; bsdi[45]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -12878,7 +13058,7 @@ darwin* | rhapsody*) ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -12886,10 +13066,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -12897,7 +13073,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[123]*) objformat=aout ;; + freebsd[23].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -12915,7 +13091,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[01]* | freebsdelf3.[01]*) @@ -12935,17 +13111,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -13006,7 +13183,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[3-9]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -13022,7 +13199,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -13059,9 +13236,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13143,7 +13320,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -13212,7 +13389,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13237,7 +13414,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -13261,7 +13438,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -13292,7 +13469,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -13302,7 +13479,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -14084,6 +14261,8 @@ CC="$lt_save_CC" + + ac_config_commands="$ac_config_commands libtool" @@ -14109,7 +14288,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_RC="${ac_tool_prefix}windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14149,7 +14328,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_RC="windres" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14292,6 +14471,13 @@ echo echo "Initializing gettext:" +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether NLS is requested" >&5 $as_echo_n "checking whether NLS is requested... " >&6; } # Check whether --enable-nls was given. @@ -14307,6 +14493,9 @@ $as_echo "$USE_NLS" >&6; } + GETTEXT_MACRO_VERSION=0.18 + + # Prepare PATH_SEPARATOR. @@ -14396,7 +14585,7 @@ do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext" $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 @@ -14582,6 +14771,9 @@ fi test -n "$localedir" || localedir='${datadir}/locale' + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + + ac_config_commands="$ac_config_commands po-directories" @@ -14641,7 +14833,7 @@ $as_echo_n "checking for ld used by GCC... " >&6; } # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -14675,9 +14867,9 @@ else # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -14732,12 +14924,14 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $acl_cv_rpath" >&5 $as_echo "$acl_cv_rpath" >&6; } wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" # Check whether --enable-rpath was given. if test "${enable_rpath+set}" = set; then : enableval=$enable_rpath; : @@ -14747,23 +14941,71 @@ fi - acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + + acl_libdirstem=lib + acl_libdirstem2= + case "$host_os" in + solaris*) + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 64-bit host" >&5 +$as_echo_n "checking for 64-bit host... " >&6; } +if ${gl_cv_solaris_64bit+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#ifdef _LP64 +sixtyfour bits +#endif + +_ACEOF +if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | + $EGREP "sixtyfour bits" >/dev/null 2>&1; then : + gl_cv_solaris_64bit=yes +else + gl_cv_solaris_64bit=no +fi +rm -f conftest* + + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_solaris_64bit" >&5 +$as_echo "$gl_cv_solaris_64bit" >&6; } + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" + + + + @@ -14808,6 +15050,10 @@ if test "${with_libiconv_prefix+set}" = set; then : else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -14816,6 +15062,8 @@ fi LIBICONV= LTLIBICONV= INCICONV= + LIBICONV_PREFIX= + HAVE_LIBICONV= rpathdirs= ltrpathdirs= names_already_handled= @@ -14849,27 +15097,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -14887,26 +15158,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -14919,7 +15206,9 @@ fi if test "X$found_dir" != "X"; then LTLIBICONV="${LTLIBICONV}${LTLIBICONV:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else haveit= @@ -14932,10 +15221,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" haveit= for x in $rpathdirs; do @@ -14967,7 +15256,7 @@ fi if test -z "$haveit"; then LIBICONV="${LIBICONV}${LIBICONV:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBICONV="${LIBICONV}${LIBICONV:+ }$found_so" else LIBICONV="${LIBICONV}${LIBICONV:+ }-l$name" @@ -14986,6 +15275,16 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'iconv'; then + LIBICONV_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -15034,9 +15333,11 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -15136,21 +15437,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBICONV="${LIBICONV}${LIBICONV:+ }$flag" done @@ -15186,6 +15487,12 @@ fi + + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for CFPreferencesCopyAppValue" >&5 $as_echo_n "checking for CFPreferencesCopyAppValue... " >&6; } if ${gt_cv_func_CFPreferencesCopyAppValue+:} false; then : @@ -15416,6 +15723,123 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv" >&5 $as_echo "$am_cv_func_iconv" >&6; } if test "$am_cv_func_iconv" = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working iconv" >&5 +$as_echo_n "checking for working iconv... " >&6; } +if ${am_cv_func_iconv_works+:} false; then : + $as_echo_n "(cached) " >&6 +else + + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + if test "$cross_compiling" = yes; then : + case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +#include <iconv.h> +#include <string.h> +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + am_cv_func_iconv_works=yes +else + am_cv_func_iconv_works=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + + LIBS="$am_save_LIBS" + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_func_iconv_works" >&5 +$as_echo "$am_cv_func_iconv_works" >&6; } + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then $as_echo "#define HAVE_ICONV 1" >>confdefs.h @@ -15437,6 +15861,10 @@ $as_echo "$LIBICONV" >&6; } + + + + use_additional=yes acl_save_prefix="$prefix" @@ -15473,6 +15901,10 @@ if test "${with_libintl_prefix+set}" = set; then : else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi @@ -15481,6 +15913,8 @@ fi LIBINTL= LTLIBINTL= INCINTL= + LIBINTL_PREFIX= + HAVE_LIBINTL= rpathdirs= ltrpathdirs= names_already_handled= @@ -15514,27 +15948,50 @@ fi found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -15552,26 +16009,42 @@ fi case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -15584,7 +16057,9 @@ fi if test "X$found_dir" != "X"; then LTLIBINTL="${LTLIBINTL}${LTLIBINTL:+ }-L$found_dir -l$name" if test "X$found_so" != "X"; then - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else haveit= @@ -15597,10 +16072,10 @@ fi if test -z "$haveit"; then ltrpathdirs="$ltrpathdirs $found_dir" fi - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" haveit= for x in $rpathdirs; do @@ -15632,7 +16107,7 @@ fi if test -z "$haveit"; then LIBINTL="${LIBINTL}${LIBINTL:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then LIBINTL="${LIBINTL}${LIBINTL:+ }$found_so" else LIBINTL="${LIBINTL}${LIBINTL:+ }-l$name" @@ -15651,6 +16126,16 @@ fi case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = 'intl'; then + LIBINTL_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -15699,9 +16184,11 @@ fi case "$dep" in -L*) additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -15801,21 +16288,21 @@ fi done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" else for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIBINTL="${LIBINTL}${LIBINTL:+ }$flag" done @@ -15827,6 +16314,11 @@ fi done fi + + + + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU gettext in libintl" >&5 $as_echo_n "checking for GNU gettext in libintl... " >&6; } if eval \${$gt_func_gnugettext_libintl+:} false; then : @@ -16044,60 +16536,60 @@ else cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -#include <stdbool.h> -#ifndef bool - "error: bool is not defined" -#endif -#ifndef false - "error: false is not defined" -#endif -#if false - "error: false is not 0" -#endif -#ifndef true - "error: true is not defined" -#endif -#if true != 1 - "error: true is not 1" -#endif -#ifndef __bool_true_false_are_defined - "error: __bool_true_false_are_defined is not defined" -#endif - - struct s { _Bool s: 1; _Bool t; } s; - - char a[true == 1 ? 1 : -1]; - char b[false == 0 ? 1 : -1]; - char c[__bool_true_false_are_defined == 1 ? 1 : -1]; - char d[(bool) 0.5 == true ? 1 : -1]; - /* See body of main program for 'e'. */ - char f[(_Bool) 0.0 == false ? 1 : -1]; - char g[true]; - char h[sizeof (_Bool)]; - char i[sizeof s.t]; - enum { j = false, k = true, l = false * true, m = true * 256 }; - /* The following fails for - HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ - _Bool n[m]; - char o[sizeof n == m * sizeof n[0] ? 1 : -1]; - char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; - /* Catch a bug in an HP-UX C compiler. See - http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html - http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html - */ - _Bool q = true; - _Bool *pq = &q; + #include <stdbool.h> + #ifndef bool + "error: bool is not defined" + #endif + #ifndef false + "error: false is not defined" + #endif + #if false + "error: false is not 0" + #endif + #ifndef true + "error: true is not defined" + #endif + #if true != 1 + "error: true is not 1" + #endif + #ifndef __bool_true_false_are_defined + "error: __bool_true_false_are_defined is not defined" + #endif + + struct s { _Bool s: 1; _Bool t; } s; + + char a[true == 1 ? 1 : -1]; + char b[false == 0 ? 1 : -1]; + char c[__bool_true_false_are_defined == 1 ? 1 : -1]; + char d[(bool) 0.5 == true ? 1 : -1]; + /* See body of main program for 'e'. */ + char f[(_Bool) 0.0 == false ? 1 : -1]; + char g[true]; + char h[sizeof (_Bool)]; + char i[sizeof s.t]; + enum { j = false, k = true, l = false * true, m = true * 256 }; + /* The following fails for + HP aC++/ANSI C B3910B A.05.55 [Dec 04 2003]. */ + _Bool n[m]; + char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; + /* Catch a bug in an HP-UX C compiler. See + http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html + http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html + */ + _Bool q = true; + _Bool *pq = &q; int main () { - bool e = &s; - *pq |= q; - *pq |= ! q; - /* Refer to every declared value, to avoid compiler optimizations. */ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l - + !m + !n + !o + !p + !q + !pq); + bool e = &s; + *pq |= q; + *pq |= ! q; + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p + !q + !pq); ; return 0; @@ -16112,7 +16604,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdbool_h" >&5 $as_echo "$ac_cv_header_stdbool_h" >&6; } -ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" + ac_fn_c_check_type "$LINENO" "_Bool" "ac_cv_type__Bool" "$ac_includes_default" if test "x$ac_cv_type__Bool" = xyes; then : cat >>confdefs.h <<_ACEOF @@ -16122,6 +16614,7 @@ _ACEOF fi + if test $ac_cv_header_stdbool_h = yes; then $as_echo "#define HAVE_STDBOOL_H 1" >>confdefs.h @@ -16221,7 +16714,8 @@ int main () { static int test_array [1 - 2 * !(sizeof (void *) <= sizeof ($ac_type))]; -test_array [0] = 0 +test_array [0] = 0; +return test_array [0]; ; return 0; @@ -16277,7 +16771,7 @@ _ACEOF # The command line tool can copy high resolution timestamps if such -# information is availabe in struct stat. Otherwise one second accuracy +# information is available in struct stat. Otherwise one second accuracy # is used. ac_fn_c_check_member "$LINENO" "struct stat" "st_atim.tv_nsec" "ac_cv_member_struct_stat_st_atim_tv_nsec" "$ac_includes_default" if test "x$ac_cv_member_struct_stat_st_atim_tv_nsec" = xyes; then : @@ -16522,6 +17016,8 @@ _ACEOF esac rm -rf conftest* fi + + fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 @@ -17461,7 +17957,37 @@ fi CFLAG_VISIBILITY= HAVE_VISIBILITY=0 if test -n "$GCC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the -Werror option is usable" >&5 +$as_echo_n "checking whether the -Werror option is usable... " >&6; } + if ${gl_cv_cc_vis_werror+:} false; then : + $as_echo_n "(cached) " >&6 +else + + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF +if ac_fn_c_try_compile "$LINENO"; then : + gl_cv_cc_vis_werror=yes +else + gl_cv_cc_vis_werror=no +fi +rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + CFLAGS="$gl_save_CFLAGS" +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gl_cv_cc_vis_werror" >&5 +$as_echo "$gl_cv_cc_vis_werror" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for simple visibility declarations" >&5 $as_echo_n "checking for simple visibility declarations... " >&6; } if ${gl_cv_cc_visibility+:} false; then : $as_echo_n "(cached) " >&6 @@ -17469,12 +17995,16 @@ else gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {} int main () { @@ -17527,6 +18057,7 @@ if test "$GCC" = yes ; then for NEW_FLAG in \ -Wall \ -Wextra \ + -Wvla \ -Wformat=2 \ -Winit-self \ -Wmissing-include-dirs \ @@ -17607,7 +18138,15 @@ fi xz=`echo xz | sed "$program_transform_name"` -ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in lib/Makefile src/Makefile src/liblzma/liblzma.pc src/liblzma/Makefile src/liblzma/api/Makefile src/xz/Makefile src/xzdec/Makefile src/lzmainfo/Makefile src/scripts/Makefile src/scripts/xzdiff src/scripts/xzgrep src/scripts/xzmore src/scripts/xzless tests/Makefile debug/Makefile" +ac_config_files="$ac_config_files Doxyfile Makefile po/Makefile.in lib/Makefile src/Makefile src/liblzma/liblzma.pc src/liblzma/Makefile src/liblzma/api/Makefile src/xz/Makefile src/xzdec/Makefile src/lzmainfo/Makefile src/scripts/Makefile tests/Makefile debug/Makefile" + +ac_config_files="$ac_config_files src/scripts/xzdiff" + +ac_config_files="$ac_config_files src/scripts/xzgrep" + +ac_config_files="$ac_config_files src/scripts/xzmore" + +ac_config_files="$ac_config_files src/scripts/xzless" cat >confcache <<\_ACEOF @@ -17911,6 +18450,14 @@ if test -z "${COND_SCRIPTS_TRUE}" && test -z "${COND_SCRIPTS_FALSE}"; then as_fn_error $? "conditional \"COND_SCRIPTS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking that generated files are newer than configure" >&5 +$as_echo_n "checking that generated files are newer than configure... " >&6; } + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 +$as_echo "done" >&6; } if test -n "$EXEEXT"; then am__EXEEXT_TRUE= am__EXEEXT_FALSE='#' @@ -18238,16 +18785,16 @@ if (echo >conf$$.file) 2>/dev/null; then # ... but there are two gotchas: # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. + # In both cases, we have to default to `cp -pR'. ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' + as_ln_s='cp -pR' elif ln conf$$.file conf$$ 2>/dev/null; then as_ln_s=ln else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi else - as_ln_s='cp -p' + as_ln_s='cp -pR' fi rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file rmdir conf$$.dir 2>/dev/null @@ -18307,28 +18854,16 @@ else as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x + +# as_fn_executable_p FILE +# ----------------------- +# Test if FILE is an executable regular file. +as_fn_executable_p () +{ + test -f "$1" && test -x "$1" +} # as_fn_executable_p +as_test_x='test -x' +as_executable_p=as_fn_executable_p # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -18349,8 +18884,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by XZ Utils $as_me 5.0.3, which was -generated by GNU Autoconf 2.68. Invocation command line was +This file was extended by XZ Utils $as_me 5.0.5, which was +generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -18416,11 +18951,11 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -XZ Utils config.status 5.0.3 -configured by $0, generated by GNU Autoconf 2.68, +XZ Utils config.status 5.0.5 +configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2012 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." @@ -18511,7 +19046,7 @@ fi _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion + set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion shift \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 CONFIG_SHELL='$SHELL' @@ -18556,6 +19091,7 @@ pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`' enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`' SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`' ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`' +PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`' host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`' host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`' host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`' @@ -18636,7 +19172,6 @@ with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`' allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`' no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld='`$ECHO "$hardcode_libdir_flag_spec_ld" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`' hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`' @@ -18702,7 +19237,6 @@ with_gnu_ld_RC='`$ECHO "$with_gnu_ld_RC" | $SED "$delay_single_quote_subst"`' allow_undefined_flag_RC='`$ECHO "$allow_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' no_undefined_flag_RC='`$ECHO "$no_undefined_flag_RC" | $SED "$delay_single_quote_subst"`' hardcode_libdir_flag_spec_RC='`$ECHO "$hardcode_libdir_flag_spec_RC" | $SED "$delay_single_quote_subst"`' -hardcode_libdir_flag_spec_ld_RC='`$ECHO "$hardcode_libdir_flag_spec_ld_RC" | $SED "$delay_single_quote_subst"`' hardcode_libdir_separator_RC='`$ECHO "$hardcode_libdir_separator_RC" | $SED "$delay_single_quote_subst"`' hardcode_direct_RC='`$ECHO "$hardcode_direct_RC" | $SED "$delay_single_quote_subst"`' hardcode_direct_absolute_RC='`$ECHO "$hardcode_direct_absolute_RC" | $SED "$delay_single_quote_subst"`' @@ -18738,6 +19272,7 @@ DLLTOOL \ OBJDUMP \ SHELL \ ECHO \ +PATH_SEPARATOR \ SED \ GREP \ EGREP \ @@ -18786,7 +19321,6 @@ with_gnu_ld \ allow_undefined_flag \ no_undefined_flag \ hardcode_libdir_flag_spec \ -hardcode_libdir_flag_spec_ld \ hardcode_libdir_separator \ exclude_expsyms \ include_expsyms \ @@ -18814,7 +19348,6 @@ with_gnu_ld_RC \ allow_undefined_flag_RC \ no_undefined_flag_RC \ hardcode_libdir_flag_spec_RC \ -hardcode_libdir_flag_spec_ld_RC \ hardcode_libdir_separator_RC \ exclude_expsyms_RC \ include_expsyms_RC \ @@ -18923,12 +19456,12 @@ do "src/xzdec/Makefile") CONFIG_FILES="$CONFIG_FILES src/xzdec/Makefile" ;; "src/lzmainfo/Makefile") CONFIG_FILES="$CONFIG_FILES src/lzmainfo/Makefile" ;; "src/scripts/Makefile") CONFIG_FILES="$CONFIG_FILES src/scripts/Makefile" ;; + "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; + "debug/Makefile") CONFIG_FILES="$CONFIG_FILES debug/Makefile" ;; "src/scripts/xzdiff") CONFIG_FILES="$CONFIG_FILES src/scripts/xzdiff" ;; "src/scripts/xzgrep") CONFIG_FILES="$CONFIG_FILES src/scripts/xzgrep" ;; "src/scripts/xzmore") CONFIG_FILES="$CONFIG_FILES src/scripts/xzmore" ;; "src/scripts/xzless") CONFIG_FILES="$CONFIG_FILES src/scripts/xzless" ;; - "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; - "debug/Makefile") CONFIG_FILES="$CONFIG_FILES debug/Makefile" ;; *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;; esac @@ -19525,7 +20058,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} case $ac_file$ac_mode in "depfiles":C) test x"$AMDEP_TRUE" != x"" || { - # Autoconf 2.62 quotes --file arguments for eval, but not when files + # Older Autoconf quotes --file arguments for eval, but not when files # are listed without --file. Let's play safe and only enable the eval # if we detect the quoting. case $CONFIG_FILES in @@ -19538,7 +20071,7 @@ $as_echo "$as_me: executing $ac_file commands" >&6;} # Strip MF so we end up with the name of the file. mf=`echo "$mf" | sed -e 's/:.*$//'` # Check whether this is an Automake generated Makefile or not. - # We used to match only the files named `Makefile.in', but + # We used to match only the files named 'Makefile.in', but # some people rename them; so instead we look at the file content. # Grep'ing the first line is not enough: some people post-process # each Makefile.in and add a new line on top of each file to say so. @@ -19572,21 +20105,19 @@ $as_echo X"$mf" | continue fi # Extract the definition of DEPDIR, am__include, and am__quote - # from the Makefile without running `make'. + # from the Makefile without running 'make'. DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` test -z "$DEPDIR" && continue am__include=`sed -n 's/^am__include = //p' < "$mf"` - test -z "am__include" && continue + test -z "$am__include" && continue am__quote=`sed -n 's/^am__quote = //p' < "$mf"` - # When using ansi2knr, U may be empty or an underscore; expand it - U=`sed -n 's/^U = //p' < "$mf"` # Find all dependency output files, they are included files with # $(DEPDIR) in their names. We invoke sed twice because it is the # simplest approach to changing $(DEPDIR) to its actual value in the # expansion. for file in `sed -n " s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ - sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do # Make sure the directory exists. test -f "$dirpart/$file" && continue fdir=`$as_dirname -- "$file" || @@ -19640,8 +20171,8 @@ $as_echo X"$file" | # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -19704,6 +20235,9 @@ SHELL=$lt_SHELL # An echo program that protects backslashes. ECHO=$lt_ECHO +# The PATH separator for the build system. +PATH_SEPARATOR=$lt_PATH_SEPARATOR + # The host system. host_alias=$host_alias host=$host @@ -19999,10 +20533,6 @@ no_undefined_flag=$lt_no_undefined_flag # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator @@ -20331,10 +20861,6 @@ no_undefined_flag=$lt_no_undefined_flag_RC # This must work even if \$libdir does not exist hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC -# If ld is used when linking, flag to hardcode \$libdir into a binary -# during linking. This must work even if \$libdir does not exist. -hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC - # Whether we need a single "-rpath" flag with a separated argument. hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC @@ -20509,6 +21035,10 @@ _LT_EOF ;; esac done ;; + "src/scripts/xzdiff":F) chmod +x src/scripts/xzdiff ;; + "src/scripts/xzgrep":F) chmod +x src/scripts/xzgrep ;; + "src/scripts/xzmore":F) chmod +x src/scripts/xzmore ;; + "src/scripts/xzless":F) chmod +x src/scripts/xzless ;; esac done # for ac_tag @@ -20563,4 +21093,3 @@ fi # echo "WARNING:" # echo "No supported method to detect the number of CPU cores." #fi - diff --git a/Build/source/extra/xz/configure.ac b/Build/source/extra/xz/configure.ac index 39fd0ef4cf7..305c858dd6d 100644 --- a/Build/source/extra/xz/configure.ac +++ b/Build/source/extra/xz/configure.ac @@ -416,7 +416,9 @@ fi echo echo "Initializing Automake:" -AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99]) +# Automake 1.10 should still be enough but you need to omit serial-tests. +dnl AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99]) +AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests]) AC_PROG_LN_S AC_PROG_CC_C99 @@ -431,10 +433,14 @@ AC_USE_SYSTEM_EXTENSIONS if test "x$enable_threads" = xyes; then echo echo "Threading support:" - ACX_PTHREAD + AX_PTHREAD LIBS="$LIBS $PTHREAD_LIBS" AM_CFLAGS="$AM_CFLAGS $PTHREAD_CFLAGS" - CC="$PTHREAD_CC" + + dnl NOTE: PTHREAD_CC is ignored. It would be useful on AIX, but + dnl it's tricky to get it right together with AC_PROG_CC_C99. + dnl Thus, this is handled by telling the user in INSTALL to set + dnl the correct CC manually. fi echo @@ -456,7 +462,7 @@ AM_CONDITIONAL([COND_SHARED], [test "x$enable_shared" != xno]) echo echo "Initializing gettext:" -AM_GNU_GETTEXT_VERSION([0.16.1]) +AM_GNU_GETTEXT_VERSION([0.18]) AM_GNU_GETTEXT([external]) ############################################################################### @@ -494,7 +500,7 @@ AC_TYPE_UINTPTR_T AC_CHECK_SIZEOF([size_t]) # The command line tool can copy high resolution timestamps if such -# information is availabe in struct stat. Otherwise one second accuracy +# information is available in struct stat. Otherwise one second accuracy # is used. AC_CHECK_MEMBERS([ struct stat.st_atim.tv_nsec, @@ -556,6 +562,7 @@ if test "$GCC" = yes ; then for NEW_FLAG in \ -Wall \ -Wextra \ + -Wvla \ -Wformat=2 \ -Winit-self \ -Wmissing-include-dirs \ @@ -627,13 +634,13 @@ AC_CONFIG_FILES([ src/xzdec/Makefile src/lzmainfo/Makefile src/scripts/Makefile - src/scripts/xzdiff - src/scripts/xzgrep - src/scripts/xzmore - src/scripts/xzless tests/Makefile debug/Makefile ]) +AC_CONFIG_FILES([src/scripts/xzdiff], [chmod +x src/scripts/xzdiff]) +AC_CONFIG_FILES([src/scripts/xzgrep], [chmod +x src/scripts/xzgrep]) +AC_CONFIG_FILES([src/scripts/xzmore], [chmod +x src/scripts/xzmore]) +AC_CONFIG_FILES([src/scripts/xzless], [chmod +x src/scripts/xzless]) AC_OUTPUT diff --git a/Build/source/extra/xz/debug/Makefile.am b/Build/source/extra/xz/debug/Makefile.am index 45b4b7fd780..9026fd93574 100644 --- a/Build/source/extra/xz/debug/Makefile.am +++ b/Build/source/extra/xz/debug/Makefile.am @@ -5,6 +5,9 @@ ## You can do whatever you want with this file. ## +EXTRA_DIST = \ + translation.bash + noinst_PROGRAMS = \ repeat \ sync_flush \ diff --git a/Build/source/extra/xz/debug/Makefile.in b/Build/source/extra/xz/debug/Makefile.in index 56d35ba9bfe..0bd16704591 100644 --- a/Build/source/extra/xz/debug/Makefile.in +++ b/Build/source/extra/xz/debug/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,17 +83,19 @@ noinst_PROGRAMS = repeat$(EXEEXT) sync_flush$(EXEEXT) \ known_sizes$(EXEEXT) hex2bin$(EXEEXT) @COND_GNULIB_TRUE@am__append_1 = $(top_builddir)/lib/libgnu.a subdir = debug -DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp README ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -69,6 +115,10 @@ crc32_LDADD = $(LDADD) am__DEPENDENCIES_1 = crc32_DEPENDENCIES = $(top_builddir)/src/liblzma/liblzma.la \ $(am__append_1) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = full_flush_SOURCES = full_flush.c full_flush_OBJECTS = full_flush.$(OBJEXT) full_flush_LDADD = $(LDADD) @@ -99,29 +149,73 @@ sync_flush_OBJECTS = sync_flush.$(OBJEXT) sync_flush_LDADD = $(LDADD) sync_flush_DEPENDENCIES = $(top_builddir)/src/liblzma/liblzma.la \ $(am__append_1) $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = crc32.c full_flush.c hex2bin.c known_sizes.c memusage.c \ repeat.c sync_flush.c DIST_SOURCES = crc32.c full_flush.c hex2bin.c known_sizes.c memusage.c \ repeat.c sync_flush.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -150,6 +244,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -210,6 +305,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -217,12 +313,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -264,6 +360,9 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ xz = @xz@ +EXTRA_DIST = \ + translation.bash + AM_CPPFLAGS = \ -I$(top_srcdir)/src/common \ -I$(top_srcdir)/src/liblzma/api @@ -313,27 +412,34 @@ clean-noinstPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -crc32$(EXEEXT): $(crc32_OBJECTS) $(crc32_DEPENDENCIES) + +crc32$(EXEEXT): $(crc32_OBJECTS) $(crc32_DEPENDENCIES) $(EXTRA_crc32_DEPENDENCIES) @rm -f crc32$(EXEEXT) - $(LINK) $(crc32_OBJECTS) $(crc32_LDADD) $(LIBS) -full_flush$(EXEEXT): $(full_flush_OBJECTS) $(full_flush_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(crc32_OBJECTS) $(crc32_LDADD) $(LIBS) + +full_flush$(EXEEXT): $(full_flush_OBJECTS) $(full_flush_DEPENDENCIES) $(EXTRA_full_flush_DEPENDENCIES) @rm -f full_flush$(EXEEXT) - $(LINK) $(full_flush_OBJECTS) $(full_flush_LDADD) $(LIBS) -hex2bin$(EXEEXT): $(hex2bin_OBJECTS) $(hex2bin_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(full_flush_OBJECTS) $(full_flush_LDADD) $(LIBS) + +hex2bin$(EXEEXT): $(hex2bin_OBJECTS) $(hex2bin_DEPENDENCIES) $(EXTRA_hex2bin_DEPENDENCIES) @rm -f hex2bin$(EXEEXT) - $(LINK) $(hex2bin_OBJECTS) $(hex2bin_LDADD) $(LIBS) -known_sizes$(EXEEXT): $(known_sizes_OBJECTS) $(known_sizes_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(hex2bin_OBJECTS) $(hex2bin_LDADD) $(LIBS) + +known_sizes$(EXEEXT): $(known_sizes_OBJECTS) $(known_sizes_DEPENDENCIES) $(EXTRA_known_sizes_DEPENDENCIES) @rm -f known_sizes$(EXEEXT) - $(LINK) $(known_sizes_OBJECTS) $(known_sizes_LDADD) $(LIBS) -memusage$(EXEEXT): $(memusage_OBJECTS) $(memusage_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(known_sizes_OBJECTS) $(known_sizes_LDADD) $(LIBS) + +memusage$(EXEEXT): $(memusage_OBJECTS) $(memusage_DEPENDENCIES) $(EXTRA_memusage_DEPENDENCIES) @rm -f memusage$(EXEEXT) - $(LINK) $(memusage_OBJECTS) $(memusage_LDADD) $(LIBS) -repeat$(EXEEXT): $(repeat_OBJECTS) $(repeat_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(memusage_OBJECTS) $(memusage_LDADD) $(LIBS) + +repeat$(EXEEXT): $(repeat_OBJECTS) $(repeat_DEPENDENCIES) $(EXTRA_repeat_DEPENDENCIES) @rm -f repeat$(EXEEXT) - $(LINK) $(repeat_OBJECTS) $(repeat_LDADD) $(LIBS) -sync_flush$(EXEEXT): $(sync_flush_OBJECTS) $(sync_flush_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(repeat_OBJECTS) $(repeat_LDADD) $(LIBS) + +sync_flush$(EXEEXT): $(sync_flush_OBJECTS) $(sync_flush_DEPENDENCIES) $(EXTRA_sync_flush_DEPENDENCIES) @rm -f sync_flush$(EXEEXT) - $(LINK) $(sync_flush_OBJECTS) $(sync_flush_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(sync_flush_OBJECTS) $(sync_flush_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -350,25 +456,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sync_flush.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -376,26 +482,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -407,15 +502,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -424,6 +515,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -472,10 +578,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -560,21 +671,21 @@ uninstall-am: .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool clean-noinstPROGRAMS cscopelist-am ctags \ + ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-data \ + install-data-am 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags tags-am uninstall uninstall-am # 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: - diff --git a/Build/source/extra/xz/debug/README b/Build/source/extra/xz/debug/README index 749610d77c0..d42b27289f6 100644 --- a/Build/source/extra/xz/debug/README +++ b/Build/source/extra/xz/debug/README @@ -3,7 +3,7 @@ Debug tools ----------- This directory contains a few tiny programs that may be helpful when - debugging LZMA Utils. + debugging XZ Utils. These tools are not meant to be installed. Often one needs to edit the source code a little to make the programs do the wanted things. diff --git a/Build/source/extra/xz/debug/translation.bash b/Build/source/extra/xz/debug/translation.bash new file mode 100644 index 00000000000..df4210dd7ca --- /dev/null +++ b/Build/source/extra/xz/debug/translation.bash @@ -0,0 +1,100 @@ +#!/bin/bash + +############################################################################### +# +# Script to check output of some translated messages +# +# This should be useful for translators to check that the translated strings +# look good. This doesn't make xz print all possible strings, but it should +# cover most of the cases where mistakes can easily happen. +# +# Give the path and filename of the xz executable as an argument. If no +# arguments are given, this script uses ../src/xz/xz (relative to the +# location of this script). +# +# You may want to pipe the output of this script to less -S to view the +# tables printed by xz --list on a 80-column terminal. On the other hand, +# viewing the other messages may be better without -S. +# +############################################################################### +# +# Author: Lasse Collin +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# +############################################################################### + +set -e + +# If an argument was given, use it to set the location of the xz executable. +unset XZ +if [ -n "$1" ]; then + XZ=$1 + [ "x${XZ:0:1}" != "x/" ] && XZ="$PWD/$XZ" +fi + +# Locate top_srcdir and go there. +top_srcdir="$(cd -- "$(dirname -- "$0")" && cd .. && pwd)" +cd -- "$top_srcdir" + +# If XZ wasn't already set, use the default location. +XZ=${XZ-"$PWD/src/xz/xz"} +if [ "$(type -t "$XZ" || true)" != "file" ]; then + echo "Give the location of the xz executable as an argument" \ + "to this script." + exit 1 +fi +XZ=$(type -p -- "$XZ") + +# Print the xz version and locale information. +echo "$XZ --version" +"$XZ" --version +echo +if [ -d .git ] && type git > /dev/null 2>&1; then + echo "Source code version in $PWD:" + git describe --abbrev=4 +fi +echo +locale +echo + +# Make the test files directory the current directory. +cd tests/files + +# Put xz in PATH so that argv[0] stays short. +PATH=${XZ%/*}:$PATH + +# Some of the test commands are error messages and thus don't +# return successfully. +set +e + +for CMD in \ + "xz --foobarbaz" \ + "xz --memlimit=123abcd" \ + "xz --memlimit=40MiB -6 /dev/null" \ + "xz --memlimit=0 --info-memory" \ + "xz --memlimit-compress=1234MiB --memlimit-decompress=50MiB --info-memory" \ + "xz --verbose --verbose /dev/null | cat" \ + "xz --lzma2=foobarbaz" \ + "xz --lzma2=foobarbaz=abcd" \ + "xz --lzma2=mf=abcd" \ + "xz --lzma2=preset=foobarbaz" \ + "xz --lzma2=mf=bt4,nice=2" \ + "xz --lzma2=nice=50000" \ + "xz --help" \ + "xz --long-help" \ + "xz --list good-*lzma2*" \ + "xz --list good-1-check*" \ + "xz --list --verbose good-*lzma2*" \ + "xz --list --verbose good-1-check*" \ + "xz --list --verbose --verbose good-*lzma2*" \ + "xz --list --verbose --verbose good-1-check*" \ + "xz --list --verbose --verbose unsupported-check.xz" +do + echo "-----------------------------------------------------------" + echo + echo "\$ $CMD" + eval "$CMD" + echo +done 2>&1 diff --git a/Build/source/extra/xz/doc/examples/00_README.txt b/Build/source/extra/xz/doc/examples/00_README.txt new file mode 100644 index 00000000000..a3b9eaa1c97 --- /dev/null +++ b/Build/source/extra/xz/doc/examples/00_README.txt @@ -0,0 +1,27 @@ + +liblzma example programs +======================== + +Introduction + + The examples are written so that the same comments aren't + repeated (much) in later files. + + On POSIX systems, the examples should build by just typing "make". + + The examples that use stdin or stdout don't set stdin and stdout + to binary mode. On systems where it matters (e.g. Windows) it is + possible that the examples won't work without modification. + + +List of examples + + 01_compress_easy.c Multi-call compression using + a compression preset + + 02_decompress.c Multi-call decompression + + 03_compress_custom.c Like 01_compress_easy.c but using + a custom filter chain + (x86 BCJ + LZMA2) + diff --git a/Build/source/extra/xz/doc/examples/01_compress_easy.c b/Build/source/extra/xz/doc/examples/01_compress_easy.c new file mode 100644 index 00000000000..e6dd2b0cda3 --- /dev/null +++ b/Build/source/extra/xz/doc/examples/01_compress_easy.c @@ -0,0 +1,297 @@ +/////////////////////////////////////////////////////////////////////////////// +// +/// \file 01_compress_easy.c +/// \brief Compress from stdin to stdout in multi-call mode +/// +/// Usage: ./01_compress_easy PRESET < INFILE > OUTFILE +/// +/// Example: ./01_compress_easy 6 < foo > foo.xz +// +// Author: Lasse Collin +// +// This file has been put into the public domain. +// You can do whatever you want with this file. +// +/////////////////////////////////////////////////////////////////////////////// + +#include <stdbool.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <lzma.h> + + +static void +show_usage_and_exit(const char *argv0) +{ + fprintf(stderr, "Usage: %s PRESET < INFILE > OUTFILE\n" + "PRESET is a number 0-9 and can optionally be " + "followed by `e' to indicate extreme preset\n", + argv0); + exit(EXIT_FAILURE); +} + + +static uint32_t +get_preset(int argc, char **argv) +{ + // One argument whose first char must be 0-9. + if (argc != 2 || argv[1][0] < '0' || argv[1][0] > '9') + show_usage_and_exit(argv[0]); + + // Calculate the preste level 0-9. + uint32_t preset = argv[1][0] - '0'; + + // If there is a second char, it must be 'e'. It will set + // the LZMA_PRESET_EXTREME flag. + if (argv[1][1] != '\0') { + if (argv[1][1] != 'e' || argv[1][2] != '\0') + show_usage_and_exit(argv[0]); + + preset |= LZMA_PRESET_EXTREME; + } + + return preset; +} + + +static bool +init_encoder(lzma_stream *strm, uint32_t preset) +{ + // Initialize the encoder using a preset. Set the integrity to check + // to CRC64, which is the default in the xz command line tool. If + // the .xz file needs to be decompressed with XZ Embedded, use + // LZMA_CHECK_CRC32 instead. + lzma_ret ret = lzma_easy_encoder(strm, preset, LZMA_CHECK_CRC64); + + // Return successfully if the initialization went fine. + if (ret == LZMA_OK) + return true; + + // Something went wrong. The possible errors are documented in + // lzma/container.h (src/liblzma/api/lzma/container.h in the source + // package or e.g. /usr/include/lzma/container.h depending on the + // install prefix). + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = "Memory allocation failed"; + break; + + case LZMA_OPTIONS_ERROR: + msg = "Specified preset is not supported"; + break; + + case LZMA_UNSUPPORTED_CHECK: + msg = "Specified integrity check is not supported"; + break; + + default: + // This is most likely LZMA_PROG_ERROR indicating a bug in + // this program or in liblzma. It is inconvenient to have a + // separate error message for errors that should be impossible + // to occur, but knowing the error code is important for + // debugging. That's why it is good to print the error code + // at least when there is no good error message to show. + msg = "Unknown error, possibly a bug"; + break; + } + + fprintf(stderr, "Error initializing the encoder: %s (error code %u)\n", + msg, ret); + return false; +} + + +static bool +compress(lzma_stream *strm, FILE *infile, FILE *outfile) +{ + // This will be LZMA_RUN until the end of the input file is reached. + // This tells lzma_code() when there will be no more input. + lzma_action action = LZMA_RUN; + + // Buffers to temporarily hold uncompressed input + // and compressed output. + uint8_t inbuf[BUFSIZ]; + uint8_t outbuf[BUFSIZ]; + + // Initialize the input and output pointers. Initializing next_in + // and avail_in isn't really necessary when we are going to encode + // just one file since LZMA_STREAM_INIT takes care of initializing + // those already. But it doesn't hurt much and it will be needed + // if encoding more than one file like we will in 02_decompress.c. + // + // While we don't care about strm->total_in or strm->total_out in this + // example, it is worth noting that initializing the encoder will + // always reset total_in and total_out to zero. But the encoder + // initialization doesn't touch next_in, avail_in, next_out, or + // avail_out. + strm->next_in = NULL; + strm->avail_in = 0; + strm->next_out = outbuf; + strm->avail_out = sizeof(outbuf); + + // Loop until the file has been successfully compressed or until + // an error occurs. + while (true) { + // Fill the input buffer if it is empty. + if (strm->avail_in == 0 && !feof(infile)) { + strm->next_in = inbuf; + strm->avail_in = fread(inbuf, 1, sizeof(inbuf), + infile); + + if (ferror(infile)) { + fprintf(stderr, "Read error: %s\n", + strerror(errno)); + return false; + } + + // Once the end of the input file has been reached, + // we need to tell lzma_code() that no more input + // will be coming and that it should finish the + // encoding. + if (feof(infile)) + action = LZMA_FINISH; + } + + // Tell liblzma do the actual encoding. + // + // This reads up to strm->avail_in bytes of input starting + // from strm->next_in. avail_in will be decremented and + // next_in incremented by an equal amount to match the + // number of input bytes consumed. + // + // Up to strm->avail_out bytes of compressed output will be + // written starting from strm->next_out. avail_out and next_out + // will be incremented by an equal amount to match the number + // of output bytes written. + // + // The encoder has to do internal buffering, which means that + // it may take quite a bit of input before the same data is + // available in compressed form in the output buffer. + lzma_ret ret = lzma_code(strm, action); + + // If the output buffer is full or if the compression finished + // successfully, write the data from the output bufffer to + // the output file. + if (strm->avail_out == 0 || ret == LZMA_STREAM_END) { + // When lzma_code() has returned LZMA_STREAM_END, + // the output buffer is likely to be only partially + // full. Calculate how much new data there is to + // be written to the output file. + size_t write_size = sizeof(outbuf) - strm->avail_out; + + if (fwrite(outbuf, 1, write_size, outfile) + != write_size) { + fprintf(stderr, "Write error: %s\n", + strerror(errno)); + return false; + } + + // Reset next_out and avail_out. + strm->next_out = outbuf; + strm->avail_out = sizeof(outbuf); + } + + // Normally the return value of lzma_code() will be LZMA_OK + // until everything has been encoded. + if (ret != LZMA_OK) { + // Once everything has been encoded successfully, the + // return value of lzma_code() will be LZMA_STREAM_END. + // + // It is important to check for LZMA_STREAM_END. Do not + // assume that getting ret != LZMA_OK would mean that + // everything has gone well. + if (ret == LZMA_STREAM_END) + return true; + + // It's not LZMA_OK nor LZMA_STREAM_END, + // so it must be an error code. See lzma/base.h + // (src/liblzma/api/lzma/base.h in the source package + // or e.g. /usr/include/lzma/base.h depending on the + // install prefix) for the list and documentation of + // possible values. Most values listen in lzma_ret + // enumeration aren't possible in this example. + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = "Memory allocation failed"; + break; + + case LZMA_DATA_ERROR: + // This error is returned if the compressed + // or uncompressed size get near 8 EiB + // (2^63 bytes) because that's where the .xz + // file format size limits currently are. + // That is, the possibility of this error + // is mostly theoretical unless you are doing + // something very unusual. + // + // Note that strm->total_in and strm->total_out + // have nothing to do with this error. Changing + // those variables won't increase or decrease + // the chance of getting this error. + msg = "File size limits exceeded"; + break; + + default: + // This is most likely LZMA_PROG_ERROR, but + // if this program is buggy (or liblzma has + // a bug), it may be e.g. LZMA_BUF_ERROR or + // LZMA_OPTIONS_ERROR too. + // + // It is inconvenient to have a separate + // error message for errors that should be + // impossible to occur, but knowing the error + // code is important for debugging. That's why + // it is good to print the error code at least + // when there is no good error message to show. + msg = "Unknown error, possibly a bug"; + break; + } + + fprintf(stderr, "Encoder error: %s (error code %u)\n", + msg, ret); + return false; + } + } +} + + +extern int +main(int argc, char **argv) +{ + // Get the preset number from the command line. + uint32_t preset = get_preset(argc, argv); + + // Initialize a lzma_stream structure. When it is allocated on stack, + // it is simplest to use LZMA_STREAM_INIT macro like below. When it + // is allocated on heap, using memset(strmptr, 0, sizeof(*strmptr)) + // works (as long as NULL pointers are represented with zero bits + // as they are on practically all computers today). + lzma_stream strm = LZMA_STREAM_INIT; + + // Initialize the encoder. If it succeeds, compress from + // stdin to stdout. + bool success = init_encoder(&strm, preset); + if (success) + success = compress(&strm, stdin, stdout); + + // Free the memory allocated for the encoder. If we were encoding + // multiple files, this would only need to be done after the last + // file. See 02_decompress.c for handling of multiple files. + // + // It is OK to call lzma_end() multiple times or when it hasn't been + // actually used except initialized with LZMA_STREAM_INIT. + lzma_end(&strm); + + // Close stdout to catch possible write errors that can occur + // when pending data is flushed from the stdio buffers. + if (fclose(stdout)) { + fprintf(stderr, "Write error: %s\n", strerror(errno)); + success = false; + } + + return success ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/Build/source/extra/xz/doc/examples/02_decompress.c b/Build/source/extra/xz/doc/examples/02_decompress.c new file mode 100644 index 00000000000..4c0f37cbc57 --- /dev/null +++ b/Build/source/extra/xz/doc/examples/02_decompress.c @@ -0,0 +1,287 @@ +/////////////////////////////////////////////////////////////////////////////// +// +/// \file 02_decompress.c +/// \brief Decompress .xz files to stdout +/// +/// Usage: ./02_decompress INPUT_FILES... > OUTFILE +/// +/// Example: ./02_decompress foo.xz bar.xz > foobar +// +// Author: Lasse Collin +// +// This file has been put into the public domain. +// You can do whatever you want with this file. +// +/////////////////////////////////////////////////////////////////////////////// + +#include <stdbool.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <lzma.h> + + +static bool +init_decoder(lzma_stream *strm) +{ + // Initialize a .xz decoder. The decoder supports a memory usage limit + // and a set of flags. + // + // The memory usage of the decompressor depends on the settings used + // to compress a .xz file. It can vary from less than a megabyte to + // a few gigabytes, but in practice (at least for now) it rarely + // exceeds 65 MiB because that's how much memory is required to + // decompress files created with "xz -9". Settings requiring more + // memory take extra effort to use and don't (at least for now) + // provide significantly better compression in most cases. + // + // Memory usage limit is useful if it is important that the + // decompressor won't consume gigabytes of memory. The need + // for limiting depends on the application. In this example, + // no memory usage limiting is used. This is done by setting + // the limit to UINT64_MAX. + // + // The .xz format allows concatenating compressed files as is: + // + // echo foo | xz > foobar.xz + // echo bar | xz >> foobar.xz + // + // When decompressing normal standalone .xz files, LZMA_CONCATENATED + // should always be used to support decompression of concatenated + // .xz files. If LZMA_CONCATENATED isn't used, the decoder will stop + // after the first .xz stream. This can be useful when .xz data has + // been embedded inside another file format. + // + // Flags other than LZMA_CONCATENATED are supported too, and can + // be combined with bitwise-or. See lzma/container.h + // (src/liblzma/api/lzma/container.h in the source package or e.g. + // /usr/include/lzma/container.h depending on the install prefix) + // for details. + lzma_ret ret = lzma_stream_decoder( + strm, UINT64_MAX, LZMA_CONCATENATED); + + // Return successfully if the initialization went fine. + if (ret == LZMA_OK) + return true; + + // Something went wrong. The possible errors are documented in + // lzma/container.h (src/liblzma/api/lzma/container.h in the source + // package or e.g. /usr/include/lzma/container.h depending on the + // install prefix). + // + // Note that LZMA_MEMLIMIT_ERROR is never possible here. If you + // specify a very tiny limit, the error will be delayed until + // the first headers have been parsed by a call to lzma_code(). + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = "Memory allocation failed"; + break; + + case LZMA_OPTIONS_ERROR: + msg = "Unsupported decompressor flags"; + break; + + default: + // This is most likely LZMA_PROG_ERROR indicating a bug in + // this program or in liblzma. It is inconvenient to have a + // separate error message for errors that should be impossible + // to occur, but knowing the error code is important for + // debugging. That's why it is good to print the error code + // at least when there is no good error message to show. + msg = "Unknown error, possibly a bug"; + break; + } + + fprintf(stderr, "Error initializing the decoder: %s (error code %u)\n", + msg, ret); + return false; +} + + +static bool +decompress(lzma_stream *strm, const char *inname, FILE *infile, FILE *outfile) +{ + // When LZMA_CONCATENATED flag was used when initializing the decoder, + // we need to tell lzma_code() when there will be no more input. + // This is done by setting action to LZMA_FINISH instead of LZMA_RUN + // in the same way as it is done when encoding. + // + // When LZMA_CONCATENATED isn't used, there is no need to use + // LZMA_FINISH to tell when all the input has been read, but it + // is still OK to use it if you want. When LZMA_CONCATENATED isn't + // used, the decoder will stop after the first .xz stream. In that + // case some unused data may be left in strm->next_in. + lzma_action action = LZMA_RUN; + + uint8_t inbuf[BUFSIZ]; + uint8_t outbuf[BUFSIZ]; + + strm->next_in = NULL; + strm->avail_in = 0; + strm->next_out = outbuf; + strm->avail_out = sizeof(outbuf); + + while (true) { + if (strm->avail_in == 0 && !feof(infile)) { + strm->next_in = inbuf; + strm->avail_in = fread(inbuf, 1, sizeof(inbuf), + infile); + + if (ferror(infile)) { + fprintf(stderr, "%s: Read error: %s\n", + inname, strerror(errno)); + return false; + } + + // Once the end of the input file has been reached, + // we need to tell lzma_code() that no more input + // will be coming. As said before, this isn't required + // if the LZMA_CONATENATED flag isn't used when + // initializing the decoder. + if (feof(infile)) + action = LZMA_FINISH; + } + + lzma_ret ret = lzma_code(strm, action); + + if (strm->avail_out == 0 || ret == LZMA_STREAM_END) { + size_t write_size = sizeof(outbuf) - strm->avail_out; + + if (fwrite(outbuf, 1, write_size, outfile) + != write_size) { + fprintf(stderr, "Write error: %s\n", + strerror(errno)); + return false; + } + + strm->next_out = outbuf; + strm->avail_out = sizeof(outbuf); + } + + if (ret != LZMA_OK) { + // Once everything has been decoded successfully, the + // return value of lzma_code() will be LZMA_STREAM_END. + // + // It is important to check for LZMA_STREAM_END. Do not + // assume that getting ret != LZMA_OK would mean that + // everything has gone well or that when you aren't + // getting more output it must have successfully + // decoded everything. + if (ret == LZMA_STREAM_END) + return true; + + // It's not LZMA_OK nor LZMA_STREAM_END, + // so it must be an error code. See lzma/base.h + // (src/liblzma/api/lzma/base.h in the source package + // or e.g. /usr/include/lzma/base.h depending on the + // install prefix) for the list and documentation of + // possible values. Many values listen in lzma_ret + // enumeration aren't possible in this example, but + // can be made possible by enabling memory usage limit + // or adding flags to the decoder initialization. + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = "Memory allocation failed"; + break; + + case LZMA_FORMAT_ERROR: + // .xz magic bytes weren't found. + msg = "The input is not in the .xz format"; + break; + + case LZMA_OPTIONS_ERROR: + // For example, the headers specify a filter + // that isn't supported by this liblzma + // version (or it hasn't been enabled when + // building liblzma, but no-one sane does + // that unless building liblzma for an + // embedded system). Upgrading to a newer + // liblzma might help. + // + // Note that it is unlikely that the file has + // accidentally became corrupt if you get this + // error. The integrity of the .xz headers is + // always verified with a CRC32, so + // unintentionally corrupt files can be + // distinguished from unsupported files. + msg = "Unsupported compression options"; + break; + + case LZMA_DATA_ERROR: + msg = "Compressed file is corrupt"; + break; + + case LZMA_BUF_ERROR: + // Typically this error means that a valid + // file has got truncated, but it might also + // be a damaged part in the file that makes + // the decoder think the file is truncated. + // If you prefer, you can use the same error + // message for this as for LZMA_DATA_ERROR. + msg = "Compressed file is truncated or " + "otherwise corrupt"; + break; + + default: + // This is most likely LZMA_PROG_ERROR. + msg = "Unknown error, possibly a bug"; + break; + } + + fprintf(stderr, "%s: Decoder error: " + "%s (error code %u)\n", + inname, msg, ret); + return false; + } + } +} + + +extern int +main(int argc, char **argv) +{ + if (argc <= 1) { + fprintf(stderr, "Usage: %s FILES...\n", argv[0]); + return EXIT_FAILURE; + } + + lzma_stream strm = LZMA_STREAM_INIT; + + bool success = true; + + // Try to decompress all files. + for (int i = 1; i < argc; ++i) { + if (!init_decoder(&strm)) { + // Decoder initialization failed. There's no point + // to retry it so we need to exit. + success = false; + break; + } + + FILE *infile = fopen(argv[i], "rb"); + + if (infile == NULL) { + fprintf(stderr, "%s: Error opening the " + "input file: %s\n", + argv[i], strerror(errno)); + success = false; + } else { + success &= decompress(&strm, argv[i], infile, stdout); + fclose(infile); + } + } + + // Free the memory allocated for the decoder. This only needs to be + // done after the last file. + lzma_end(&strm); + + if (fclose(stdout)) { + fprintf(stderr, "Write error: %s\n", strerror(errno)); + success = false; + } + + return success ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/Build/source/extra/xz/doc/examples/03_compress_custom.c b/Build/source/extra/xz/doc/examples/03_compress_custom.c new file mode 100644 index 00000000000..51abbb171ef --- /dev/null +++ b/Build/source/extra/xz/doc/examples/03_compress_custom.c @@ -0,0 +1,193 @@ +/////////////////////////////////////////////////////////////////////////////// +// +/// \file 03_compress_custom.c +/// \brief Compress in multi-call mode using x86 BCJ and LZMA2 +/// +/// Usage: ./03_compress_custom < INFILE > OUTFILE +/// +/// Example: ./03_compress_custom < foo > foo.xz +// +// Author: Lasse Collin +// +// This file has been put into the public domain. +// You can do whatever you want with this file. +// +/////////////////////////////////////////////////////////////////////////////// + +#include <stdbool.h> +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <lzma.h> + + +static bool +init_encoder(lzma_stream *strm) +{ + // Use the default preset (6) for LZMA2. + // + // The lzma_options_lzma structure and the lzma_lzma_preset() function + // are declared in lzma/lzma.h (src/liblzma/api/lzma/lzma.h in the + // source package or e.g. /usr/include/lzma/lzma.h depending on + // the install prefix). + lzma_options_lzma opt_lzma2; + if (lzma_lzma_preset(&opt_lzma2, LZMA_PRESET_DEFAULT)) { + // It should never fail because the default preset + // (and presets 0-9 optionally with LZMA_PRESET_EXTREME) + // are supported by all stable liblzma versions. + // + // (The encoder initialization later in this function may + // still fail due to unsupported preset *if* the features + // required by the preset have been disabled at build time, + // but no-one does such things except on embedded systems.) + fprintf(stderr, "Unsupported preset, possibly a bug\n"); + return false; + } + + // Now we could customize the LZMA2 options if we wanted. For example, + // we could set the the dictionary size (opt_lzma2.dict_size) to + // something else than the default (8 MiB) of the default preset. + // See lzma/lzma.h for details of all LZMA2 options. + // + // The x86 BCJ filter will try to modify the x86 instruction stream so + // that LZMA2 can compress it better. The x86 BCJ filter doesn't need + // any options so it will be set to NULL below. + // + // Construct the filter chain. The uncompressed data goes first to + // the first filter in the array, in this case the x86 BCJ filter. + // The array is always terminated by setting .id = LZMA_VLI_UNKNOWN. + // + // See lzma/filter.h for more information about the lzma_filter + // structure. + lzma_filter filters[] = { + { .id = LZMA_FILTER_X86, .options = NULL }, + { .id = LZMA_FILTER_LZMA2, .options = &opt_lzma2 }, + { .id = LZMA_VLI_UNKNOWN, .options = NULL }, + }; + + // Initialize the encoder using the custom filter chain. + lzma_ret ret = lzma_stream_encoder(strm, filters, LZMA_CHECK_CRC64); + + if (ret == LZMA_OK) + return true; + + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = "Memory allocation failed"; + break; + + case LZMA_OPTIONS_ERROR: + // We are no longer using a plain preset so this error + // message has been edited accordingly compared to + // 01_compress_easy.c. + msg = "Specified filter chain is not supported"; + break; + + case LZMA_UNSUPPORTED_CHECK: + msg = "Specified integrity check is not supported"; + break; + + default: + msg = "Unknown error, possibly a bug"; + break; + } + + fprintf(stderr, "Error initializing the encoder: %s (error code %u)\n", + msg, ret); + return false; +} + + +// This function is identical to the one in 01_compress_easy.c. +static bool +compress(lzma_stream *strm, FILE *infile, FILE *outfile) +{ + lzma_action action = LZMA_RUN; + + uint8_t inbuf[BUFSIZ]; + uint8_t outbuf[BUFSIZ]; + + strm->next_in = NULL; + strm->avail_in = 0; + strm->next_out = outbuf; + strm->avail_out = sizeof(outbuf); + + while (true) { + if (strm->avail_in == 0 && !feof(infile)) { + strm->next_in = inbuf; + strm->avail_in = fread(inbuf, 1, sizeof(inbuf), + infile); + + if (ferror(infile)) { + fprintf(stderr, "Read error: %s\n", + strerror(errno)); + return false; + } + + if (feof(infile)) + action = LZMA_FINISH; + } + + lzma_ret ret = lzma_code(strm, action); + + if (strm->avail_out == 0 || ret == LZMA_STREAM_END) { + size_t write_size = sizeof(outbuf) - strm->avail_out; + + if (fwrite(outbuf, 1, write_size, outfile) + != write_size) { + fprintf(stderr, "Write error: %s\n", + strerror(errno)); + return false; + } + + strm->next_out = outbuf; + strm->avail_out = sizeof(outbuf); + } + + if (ret != LZMA_OK) { + if (ret == LZMA_STREAM_END) + return true; + + const char *msg; + switch (ret) { + case LZMA_MEM_ERROR: + msg = "Memory allocation failed"; + break; + + case LZMA_DATA_ERROR: + msg = "File size limits exceeded"; + break; + + default: + msg = "Unknown error, possibly a bug"; + break; + } + + fprintf(stderr, "Encoder error: %s (error code %u)\n", + msg, ret); + return false; + } + } +} + + +extern int +main(void) +{ + lzma_stream strm = LZMA_STREAM_INIT; + + bool success = init_encoder(&strm); + if (success) + success = compress(&strm, stdin, stdout); + + lzma_end(&strm); + + if (fclose(stdout)) { + fprintf(stderr, "Write error: %s\n", strerror(errno)); + success = false; + } + + return success ? EXIT_SUCCESS : EXIT_FAILURE; +} diff --git a/Build/source/extra/xz/doc/examples/Makefile b/Build/source/extra/xz/doc/examples/Makefile new file mode 100644 index 00000000000..644dc32ee7b --- /dev/null +++ b/Build/source/extra/xz/doc/examples/Makefile @@ -0,0 +1,23 @@ +# +# Author: Lasse Collin +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# + +CC = c99 +CFLAGS = -g +LDFLAGS = -llzma + +PROGS = \ + 01_compress_easy \ + 02_decompress \ + 03_compress_custom + +all: $(PROGS) + +.c: + $(CC) $(CFLAGS) -o $@ $< $(LDFLAGS) + +clean: + -rm -f $(PROGS) diff --git a/Build/source/extra/xz/doc/examples/xz_pipe_comp.c b/Build/source/extra/xz/doc/examples_old/xz_pipe_comp.c index 9f9224bcad9..9f9224bcad9 100644 --- a/Build/source/extra/xz/doc/examples/xz_pipe_comp.c +++ b/Build/source/extra/xz/doc/examples_old/xz_pipe_comp.c diff --git a/Build/source/extra/xz/doc/examples/xz_pipe_decomp.c b/Build/source/extra/xz/doc/examples_old/xz_pipe_decomp.c index d4b204d7d5b..fb5ad89515d 100644 --- a/Build/source/extra/xz/doc/examples/xz_pipe_decomp.c +++ b/Build/source/extra/xz/doc/examples_old/xz_pipe_decomp.c @@ -1,7 +1,7 @@ /* * xz_pipe_decomp.c * A simple example of pipe-only xz decompressor implementation. - * version: 2010-07-12 - by Daniel Mealha Cabrita + * version: 2012-06-14 - by Daniel Mealha Cabrita * Not copyrighted -- provided to the public domain. * * Compiling: @@ -101,6 +101,14 @@ int xz_decompress (FILE *in_file, FILE *out_file) } while (strm.avail_out == 0); } + /* Bug fix (2012-06-14): If no errors were detected, check + that the last lzma_code() call returned LZMA_STREAM_END. + If not, the file is probably truncated. */ + if ((ret == RET_OK) && (ret_xz != LZMA_STREAM_END)) { + fprintf (stderr, "Input truncated or corrupt\n"); + ret = RET_ERROR_DECOMPRESSION; + } + lzma_end (&strm); return ret; } diff --git a/Build/source/extra/xz/doc/faq.txt b/Build/source/extra/xz/doc/faq.txt index 36182c2c3b2..333bee09c1c 100644 --- a/Build/source/extra/xz/doc/faq.txt +++ b/Build/source/extra/xz/doc/faq.txt @@ -26,7 +26,7 @@ Q: There are many LZMA related projects. How does XZ Utils relate to them? A: 7-Zip and LZMA SDK are the original projects. LZMA SDK is roughly a subset of the 7-Zip source tree. - p7zip is 7-Zip's command line tools ported to POSIX-like systems. + p7zip is 7-Zip's command-line tools ported to POSIX-like systems. LZMA Utils provide a gzip-like lzma tool for POSIX-like systems. LZMA Utils are based on LZMA SDK. XZ Utils are the successor to @@ -42,7 +42,7 @@ Q: Why is liblzma named liblzma if its primary file format is .xz? A: When the designing of the .xz format began, the idea was to replace the .lzma format and use the same .lzma suffix. It would have been quite OK to reuse the suffix when there were very few .lzma files - around. However, the old .lzma format become popular before the + around. However, the old .lzma format became popular before the new format was finished. The new format was renamed to .xz but the name of liblzma wasn't changed. @@ -73,7 +73,7 @@ A: For now, no. Since XZ Utils supports the .lzma format, it's usually Technically, there is a way to make the conversion relatively fast (roughly twice the time that normal decompression takes). Writing - such a tool would take quite a bit time though, and would probably + such a tool would take quite a bit of time though, and would probably be useful to only a few people. If you really want such a conversion tool, contact Lasse Collin and offer some money. @@ -84,7 +84,7 @@ Q: I have installed xz, but my tar doesn't recognize .tar.xz files. A: xz -dc foo.tar.xz | tar xf - -Q: Can I recover parts of a broken .xz file (e.g. corrupted CD-R)? +Q: Can I recover parts of a broken .xz file (e.g. a corrupted CD-R)? A: It may be possible if the file consists of multiple blocks, which typically is not the case if the file was created in single-threaded @@ -94,7 +94,7 @@ A: It may be possible if the file consists of multiple blocks, which Q: Is (some part of) XZ Utils patented? A: Lasse Collin is not aware of any patents that could affect XZ Utils. - However, due to nature of software patents, it's not possible to + However, due to the nature of software patents, it's not possible to guarantee that XZ Utils isn't affected by any third party patent(s). @@ -105,8 +105,8 @@ A: The .xz format is documented in xz-file-format.txt. It is a container filters. Documenting LZMA and LZMA2 is planned, but for now, there is no other - documentation that the source code. Before you begin, you should know - the basics of LZ77 and range coding algorithms. LZMA is based on LZ77, + documentation than the source code. Before you begin, you should know + the basics of LZ77 and range-coding algorithms. LZMA is based on LZ77, but LZMA is a lot more complex. Range coding is used to compress the final bitstream like Huffman coding is used in Deflate. @@ -148,7 +148,7 @@ A: See the documentation in XZ Embedded. In short, something like xz --check=crc32 --powerpc --lzma2=preset=6e,dict=64KiB - Adjust dictionary size to get a good compromise between + Adjust the dictionary size to get a good compromise between compression ratio and decompressor memory usage. Note that in single-call decompression mode of XZ Embedded, a big dictionary doesn't increase memory usage. @@ -184,10 +184,10 @@ A: It is planned and has been taken into account when designing The third method is pigz-style threading (I use that name, because pigz <http://www.zlib.net/pigz/> uses that method). It doesn't affect compression ratio significantly and scales to many cores. - The memory usage scales linearly when threads are added. It isn't - significant with pigz, because Deflate uses only 32 KiB dictionary, + The memory usage scales linearly when threads are added. This isn't + significant with pigz, because Deflate uses only a 32 KiB dictionary, but with LZMA2 the memory usage will increase dramatically just like - with the independent blocks method. There is also a constant + with the independent-blocks method. There is also a constant computational overhead, which may make pigz-method a bit dull on dual-core compared to the parallel match finder method, but with more cores the overhead is not a big deal anymore. @@ -197,7 +197,7 @@ A: It is planned and has been taken into account when designing can cut the memory usage by 50 %. It is possible that the single-threaded method will be modified to - create files indentical to the pigz-style method. We'll see once + create files identical to the pigz-style method. We'll see once pigz-style threading has been implemented in liblzma. diff --git a/Build/source/extra/xz/doc/history.txt b/Build/source/extra/xz/doc/history.txt index c97492e81a0..8545e232254 100644 --- a/Build/source/extra/xz/doc/history.txt +++ b/Build/source/extra/xz/doc/history.txt @@ -4,12 +4,12 @@ History of LZMA Utils and XZ Utils Tukaani distribution - In 2005, there was a small group working on Tukaani distribution, which - was a Slackware fork. One of the project goals was to fit the distro on - a single 700 MiB ISO-9660 image. Using LZMA instead of gzip helped a - lot. Roughly speaking, one could fit data that took 1000 MiB in gzipped - form into 700 MiB with LZMA. Naturally compression ratio varied across - packages, but this was what we got on average. + In 2005, there was a small group working on the Tukaani distribution, + which was a Slackware fork. One of the project's goals was to fit the + distro on a single 700 MiB ISO-9660 image. Using LZMA instead of gzip + helped a lot. Roughly speaking, one could fit data that took 1000 MiB + in gzipped form into 700 MiB with LZMA. Naturally, the compression + ratio varied across packages, but this was what we got on average. Slackware packages have traditionally had .tgz as the filename suffix, which is an abbreviation of .tar.gz. A logical naming for LZMA @@ -30,13 +30,13 @@ Tukaani distribution First steps of LZMA Utils The first version of LZMA Utils (4.22.0) included a shell script called - lzmash. It was wrapper that had gzip-like command line interface. It + lzmash. It was a wrapper that had a gzip-like command-line interface. It used the LZMA_Alone tool from LZMA SDK to do all the real work. zgrep, - zdiff, and related scripts from gzip were adapted work with LZMA and + zdiff, and related scripts from gzip were adapted to work with LZMA and were part of the first LZMA Utils release too. LZMA Utils 4.22.0 included also lzmadec, which was a small (less than - 10 KiB) decoder-only command line tool. It was written on top of the + 10 KiB) decoder-only command-line tool. It was written on top of the decoder-only C code found from the LZMA SDK. lzmadec was convenient in situations where LZMA_Alone (a few hundred KiB) would be too big. @@ -48,33 +48,34 @@ Second generation The lzmash script was an ugly and not very secure hack. The last version of LZMA Utils to use lzmash was 4.27.1. - LZMA Utils 4.32.0beta1 introduced a new lzma command line tool written + LZMA Utils 4.32.0beta1 introduced a new lzma command-line tool written by Ville Koskinen. It was written in C++, and used the encoder and - decoder from C++ LZMA SDK with little modifications. This tool replaced - both the lzmash script and the LZMA_Alone command line tool in LZMA - Utils. + decoder from C++ LZMA SDK with some little modifications. This tool + replaced both the lzmash script and the LZMA_Alone command-line tool + in LZMA Utils. Introducing this new tool caused some temporary incompatibilities, - because LZMA_Alone executable was simply named lzma like the new - command line tool, but they had completely different command line + because the LZMA_Alone executable was simply named lzma like the new + command-line tool, but they had a completely different command-line interface. The file format was still the same. Lasse wrote liblzmadec, which was a small decoder-only library based - on the C code found from LZMA SDK. liblzmadec had API similar to zlib, - although there were some significant differences, which made it + on the C code found from LZMA SDK. liblzmadec had an API similar to + zlib, although there were some significant differences, which made it non-trivial to use it in some applications designed for zlib and libbzip2. - The lzmadec command line tool was converted to use liblzmadec. + The lzmadec command-line tool was converted to use liblzmadec. - Alexandre Sauvé helped converting build system to use GNU Autotools. - This made is easier to test for certain less portable features needed - by the new command line tool. + Alexandre Sauvé helped converting the build system to use GNU + Autotools. This made it easier to test for certain less portable + features needed by the new command-line tool. - Since the new command line tool never got completely finished (for - example, it didn't support LZMA_OPT environment variable), the intent - was to not call 4.32.x stable. Similarly, liblzmadec wasn't polished, - but appeared to work well enough, so some people started using it too. + Since the new command-line tool never got completely finished (for + example, it didn't support the LZMA_OPT environment variable), the + intent was to not call 4.32.x stable. Similarly, liblzmadec wasn't + polished, but appeared to work well enough, so some people started + using it too. Because the development of the third generation of LZMA Utils was delayed considerably (3-4 years), the 4.32.x branch had to be kept @@ -85,16 +86,16 @@ Second generation File format problems - The file format used by LZMA_Alone was primitive. It was designed for - embedded systems in mind, and thus provided only minimal set of - features. The two biggest problems for non-embedded use were lack of - magic bytes and integrity check. + The file format used by LZMA_Alone was primitive. It was designed with + embedded systems in mind, and thus provided only a minimal set of + features. The two biggest problems for non-embedded use were the lack + of magic bytes and an integrity check. Igor and Lasse started developing a new file format with some help from Ville Koskinen. Also Mark Adler, Mikko Pouru, H. Peter Anvin, and Lars Wirzenius helped with some minor things at some point of the development. Designing the new format took quite a long time (actually, - too long time would be more appropriate expression). It was mostly + too long a time would be a more appropriate expression). It was mostly because Lasse was quite slow at getting things done due to personal reasons. @@ -102,7 +103,7 @@ File format problems that was already used by the old file format. Switching to the new format wouldn't have caused much trouble when the old format wasn't used by many people. But since the development of the new format took - so long time, the old format got quite popular, and it was decided + such a long time, the old format got quite popular, and it was decided that the new file format must use a different suffix. It was decided to use .xz as the suffix of the new file format. The @@ -125,13 +126,13 @@ Transition to XZ Utils The early versions of XZ Utils were called LZMA Utils. The first releases were 4.42.0alphas. They dropped the rest of the C++ LZMA SDK. The code was still directly based on LZMA SDK but ported to C and - converted from callback API to stateful API. Later, Igor Pavlov made - C version of the LZMA encoder too; these ports from C++ to C were - independent in LZMA SDK and LZMA Utils. + converted from a callback API to a stateful API. Later, Igor Pavlov + made a C version of the LZMA encoder too; these ports from C++ to C + were independent in LZMA SDK and LZMA Utils. The core of the new LZMA Utils was liblzma, a compression library with - zlib-like API. liblzma supported both the old and new file format. The - gzip-like lzma command line tool was rewritten to use liblzma. + a zlib-like API. liblzma supported both the old and new file format. + The gzip-like lzma command-line tool was rewritten to use liblzma. The new LZMA Utils code base was renamed to XZ Utils when the name of the new file format had been decided. The liblzma compression @@ -139,7 +140,7 @@ Transition to XZ Utils caused unnecessary breakage in applications already using the early liblzma snapshots. - The xz command line tool can emulate the gzip-like lzma tool by + The xz command-line tool can emulate the gzip-like lzma tool by creating appropriate symlinks (e.g. lzma -> xz). Thus, practically all scripts using the lzma tool from LZMA Utils will work as is with XZ Utils (and will keep using the old .lzma format). Still, the .lzma diff --git a/Build/source/extra/xz/doc/man/pdf-a4/lzmainfo-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/lzmainfo-a4.pdf Binary files differindex f45bf74e3f8..d84ddedb6de 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/lzmainfo-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/lzmainfo-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-a4/xz-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/xz-a4.pdf Binary files differindex 7b5f468d32b..5bb20742b2c 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/xz-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/xz-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-a4/xzdec-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/xzdec-a4.pdf Binary files differindex 1798c1e2707..8bc124b6fb8 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/xzdec-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/xzdec-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-a4/xzdiff-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/xzdiff-a4.pdf Binary files differindex a295a47c528..1a392cc9595 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/xzdiff-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/xzdiff-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-a4/xzgrep-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/xzgrep-a4.pdf Binary files differindex 8bff7e901cc..48969812363 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/xzgrep-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/xzgrep-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-a4/xzless-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/xzless-a4.pdf Binary files differindex e2754dd9d58..9073d5f17f1 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/xzless-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/xzless-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-a4/xzmore-a4.pdf b/Build/source/extra/xz/doc/man/pdf-a4/xzmore-a4.pdf Binary files differindex f2983858763..90dd4d642a3 100644 --- a/Build/source/extra/xz/doc/man/pdf-a4/xzmore-a4.pdf +++ b/Build/source/extra/xz/doc/man/pdf-a4/xzmore-a4.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/lzmainfo-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/lzmainfo-letter.pdf Binary files differindex bbfd3f57629..053594325ff 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/lzmainfo-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/lzmainfo-letter.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/xz-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/xz-letter.pdf Binary files differindex 6dc6df6f9ed..9bba861effa 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/xz-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/xz-letter.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/xzdec-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/xzdec-letter.pdf Binary files differindex 860e03942eb..cc5ed1117eb 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/xzdec-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/xzdec-letter.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/xzdiff-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/xzdiff-letter.pdf Binary files differindex b4d95e8d967..3aeb20aab52 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/xzdiff-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/xzdiff-letter.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/xzgrep-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/xzgrep-letter.pdf Binary files differindex cb39bce16a1..5b44f5bd873 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/xzgrep-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/xzgrep-letter.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/xzless-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/xzless-letter.pdf Binary files differindex 1fde528f774..be64177b44b 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/xzless-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/xzless-letter.pdf diff --git a/Build/source/extra/xz/doc/man/pdf-letter/xzmore-letter.pdf b/Build/source/extra/xz/doc/man/pdf-letter/xzmore-letter.pdf Binary files differindex 04a78175388..be375355cde 100644 --- a/Build/source/extra/xz/doc/man/pdf-letter/xzmore-letter.pdf +++ b/Build/source/extra/xz/doc/man/pdf-letter/xzmore-letter.pdf diff --git a/Build/source/extra/xz/doc/man/txt/lzmainfo.txt b/Build/source/extra/xz/doc/man/txt/lzmainfo.txt index 2af7801ad21..a47a68abd3b 100644 --- a/Build/source/extra/xz/doc/man/txt/lzmainfo.txt +++ b/Build/source/extra/xz/doc/man/txt/lzmainfo.txt @@ -6,7 +6,7 @@ NAME lzmainfo - show information stored in the .lzma file header SYNOPSIS - lzmainfo [--help] [--version] [file]... + lzmainfo [--help] [--version] [file...] DESCRIPTION lzmainfo shows information stored in the .lzma file header. It reads @@ -37,4 +37,4 @@ SEE ALSO -Tukaani 2010-09-27 LZMAINFO(1) +Tukaani 2013-06-30 LZMAINFO(1) diff --git a/Build/source/extra/xz/doc/man/txt/xz.txt b/Build/source/extra/xz/doc/man/txt/xz.txt index e1518496dff..90486f90311 100644 --- a/Build/source/extra/xz/doc/man/txt/xz.txt +++ b/Build/source/extra/xz/doc/man/txt/xz.txt @@ -7,8 +7,9 @@ NAME .lzma files SYNOPSIS - xz [option]... [file]... + xz [option...] [file...] +COMMAND ALIASES unxz is equivalent to xz --decompress. xzcat is equivalent to xz --decompress --stdout. lzma is equivalent to xz --format=lzma. @@ -383,8 +384,8 @@ OPTIONS o DecMem contains the decompressor memory requirements. That is, the compression settings determine the memory require- ments of the decompressor. The exact decompressor memory - usage is slighly more than the LZMA2 dictionary size, but the - values in the table have been rounded up to the next full + usage is slightly more than the LZMA2 dictionary size, but + the values in the table have been rounded up to the next full MiB. -e, --extreme @@ -491,56 +492,62 @@ OPTIONS Custom compressor filter chains A custom filter chain allows specifying the compression settings in - detail instead of relying on the settings associated to the preset lev- - els. When a custom filter chain is specified, the compression preset - level options (-0 ... -9 and --extreme) are silently ignored. - - A filter chain is comparable to piping on the command line. When com- + detail instead of relying on the settings associated to the presets. + When a custom filter chain is specified, preset options (-0 ... -9 and + --extreme) earlier on the command line are forgotten. If a preset + option is specified after one or more custom filter chain options, the + new preset takes effect and the custom filter chain options specified + earlier are forgotten. + + A filter chain is comparable to piping on the command line. When com- pressing, the uncompressed input goes to the first filter, whose output - goes to the next filter (if any). The output of the last filter gets - written to the compressed file. The maximum number of filters in the - chain is four, but typically a filter chain has only one or two fil- + goes to the next filter (if any). The output of the last filter gets + written to the compressed file. The maximum number of filters in the + chain is four, but typically a filter chain has only one or two fil- ters. Many filters have limitations on where they can be in the filter chain: - some filters can work only as the last filter in the chain, some only - as a non-last filter, and some work in any position in the chain. + some filters can work only as the last filter in the chain, some only + as a non-last filter, and some work in any position in the chain. Depending on the filter, this limitation is either inherent to the fil- ter design or exists to prevent security issues. - A custom filter chain is specified by using one or more filter options - in the order they are wanted in the filter chain. That is, the order - of filter options is significant! When decoding raw streams (--for- - mat=raw), the filter chain is specified in the same order as it was + A custom filter chain is specified by using one or more filter options + in the order they are wanted in the filter chain. That is, the order + of filter options is significant! When decoding raw streams (--for- + mat=raw), the filter chain is specified in the same order as it was specified when compressing. - Filters take filter-specific options as a comma-separated list. Extra - commas in options are ignored. Every option has a default value, so + Filters take filter-specific options as a comma-separated list. Extra + commas in options are ignored. Every option has a default value, so you need to specify only those you want to change. + To see the whole filter chain and options, use xz -vv (that is, use + --verbose twice). This works also for viewing the filter chain options + used by presets. + --lzma1[=options] --lzma2[=options] - Add LZMA1 or LZMA2 filter to the filter chain. These filters + Add LZMA1 or LZMA2 filter to the filter chain. These filters can be used only as the last filter in the chain. - LZMA1 is a legacy filter, which is supported almost solely due - to the legacy .lzma file format, which supports only LZMA1. - LZMA2 is an updated version of LZMA1 to fix some practical - issues of LZMA1. The .xz format uses LZMA2 and doesn't support - LZMA1 at all. Compression speed and ratios of LZMA1 and LZMA2 + LZMA1 is a legacy filter, which is supported almost solely due + to the legacy .lzma file format, which supports only LZMA1. + LZMA2 is an updated version of LZMA1 to fix some practical + issues of LZMA1. The .xz format uses LZMA2 and doesn't support + LZMA1 at all. Compression speed and ratios of LZMA1 and LZMA2 are practically the same. LZMA1 and LZMA2 share the same set of options: preset=preset - Reset all LZMA1 or LZMA2 options to preset. Preset con- - sist of an integer, which may be followed by single-let- - ter preset modifiers. The integer can be from 0 to 9, - matching the command line options -0 ... -9. The only - supported modifier is currently e, which matches - --extreme. The default preset is 6, from which the - default values for the rest of the LZMA1 or LZMA2 options - are taken. + Reset all LZMA1 or LZMA2 options to preset. Preset con- + sist of an integer, which may be followed by single-let- + ter preset modifiers. The integer can be from 0 to 9, + matching the command line options -0 ... -9. The only + supported modifier is currently e, which matches + --extreme. If no preset is specified, the default values + of LZMA1 or LZMA2 options are taken from the preset 6. dict=size Dictionary (history buffer) size indicates how many bytes @@ -878,8 +885,7 @@ ROBOT MODE The robot mode is activated with the --robot option. It makes the out- put of xz easier to parse by other programs. Currently --robot is sup- ported only together with --version, --info-memory, and --list. It - will be supported for normal compression and decompression in the - future. + will be supported for compression and decompression in the future. Version xz --robot --version will print the version number of xz and liblzma in @@ -890,10 +896,10 @@ ROBOT MODE X Major version. - YYY Minor version. Even numbers are stable. Odd numbers are alpha + YYY Minor version. Even numbers are stable. Odd numbers are alpha or beta versions. - ZZZ Patch level for stable releases or just a counter for develop- + ZZZ Patch level for stable releases or just a counter for develop- ment releases. S Stability. 0 is alpha, 1 is beta, and 2 is stable. S should be @@ -905,25 +911,25 @@ ROBOT MODE Examples: 4.999.9beta is 49990091 and 5.0.0 is 50000002. Memory limit information - xz --robot --info-memory prints a single line with three tab-separated + xz --robot --info-memory prints a single line with three tab-separated columns: 1. Total amount of physical memory (RAM) in bytes - 2. Memory usage limit for compression in bytes. A special value of - zero indicates the default setting, which for single-threaded mode + 2. Memory usage limit for compression in bytes. A special value of + zero indicates the default setting, which for single-threaded mode is the same as no limit. - 3. Memory usage limit for decompression in bytes. A special value of - zero indicates the default setting, which for single-threaded mode + 3. Memory usage limit for decompression in bytes. A special value of + zero indicates the default setting, which for single-threaded mode is the same as no limit. - In the future, the output of xz --robot --info-memory may have more + In the future, the output of xz --robot --info-memory may have more columns, but never more than a single line. List mode xz --robot --list uses tab-separated output. The first column of every - line has a string that indicates the type of the information found on + line has a string that indicates the type of the information found on that line: name This is always the first line when starting to list a file. The @@ -936,17 +942,17 @@ ROBOT MODE are as many stream lines as there are streams in the .xz file. block This line type is used only when --verbose was specified. There - are as many block lines as there are blocks in the .xz file. - The block lines are shown after all the stream lines; different + are as many block lines as there are blocks in the .xz file. + The block lines are shown after all the stream lines; different line types are not interleaved. summary - This line type is used only when --verbose was specified twice. + This line type is used only when --verbose was specified twice. This line is printed after all block lines. Like the file line, - the summary line contains overall information about the .xz + the summary line contains overall information about the .xz file. - totals This line is always the very last line of the list output. It + totals This line is always the very last line of the list output. It shows the total counts and sizes. The columns of the file lines: @@ -954,13 +960,13 @@ ROBOT MODE 3. Total number of blocks in the stream(s) 4. Compressed size of the file 5. Uncompressed size of the file - 6. Compression ratio, for example 0.123. If ratio is over - 9.999, three dashes (---) are displayed instead of the + 6. Compression ratio, for example 0.123. If ratio is over + 9.999, three dashes (---) are displayed instead of the ratio. - 7. Comma-separated list of integrity check names. The follow- + 7. Comma-separated list of integrity check names. The follow- ing strings are used for the known check types: None, CRC32, - CRC64, and SHA-256. For unknown check types, Unknown-N is - used, where N is the Check ID as a decimal number (one or + CRC64, and SHA-256. For unknown check types, Unknown-N is + used, where N is the Check ID as a decimal number (one or two digits). 8. Total size of stream padding in the file @@ -977,57 +983,63 @@ ROBOT MODE The columns of the block lines: 2. Number of the stream containing this block - 3. Block number relative to the beginning of the stream (the + 3. Block number relative to the beginning of the stream (the first block is 1) 4. Block number relative to the beginning of the file - 5. Compressed start offset relative to the beginning of the + 5. Compressed start offset relative to the beginning of the file - 6. Uncompressed start offset relative to the beginning of the + 6. Uncompressed start offset relative to the beginning of the file 7. Total compressed size of the block (includes headers) 8. Uncompressed size 9. Compression ratio 10. Name of the integrity check - If --verbose was specified twice, additional columns are included on - the block lines. These are not displayed with a single --verbose, - because getting this information requires many seeks and can thus be + If --verbose was specified twice, additional columns are included on + the block lines. These are not displayed with a single --verbose, + because getting this information requires many seeks and can thus be slow: 11. Value of the integrity check in hexadecimal 12. Block header size - 13. Block flags: c indicates that compressed size is present, - and u indicates that uncompressed size is present. If the - flag is not set, a dash (-) is shown instead to keep the - string length fixed. New flags may be added to the end of + 13. Block flags: c indicates that compressed size is present, + and u indicates that uncompressed size is present. If the + flag is not set, a dash (-) is shown instead to keep the + string length fixed. New flags may be added to the end of the string in the future. - 14. Size of the actual compressed data in the block (this + 14. Size of the actual compressed data in the block (this excludes the block header, block padding, and check fields) - 15. Amount of memory (in bytes) required to decompress this + 15. Amount of memory (in bytes) required to decompress this block with this xz version - 16. Filter chain. Note that most of the options used at com- + 16. Filter chain. Note that most of the options used at com- pression time cannot be known, because only the options that are needed for decompression are stored in the .xz headers. + The columns of the summary lines: + 2. Amount of memory (in bytes) required to decompress this file + with this xz version + 3. yes or no indicating if all block headers have both com- + pressed size and uncompressed size stored in them + The columns of the totals line: 2. Number of streams 3. Number of blocks 4. Compressed size 5. Uncompressed size 6. Average compression ratio - 7. Comma-separated list of integrity check names that were + 7. Comma-separated list of integrity check names that were present in the files 8. Stream padding size 9. Number of files. This is here to keep the order of the ear- lier columns the same as on file lines. - If --verbose was specified twice, additional columns are included on + If --verbose was specified twice, additional columns are included on the totals line: - 10. Maximum amount of memory (in bytes) required to decompress + 10. Maximum amount of memory (in bytes) required to decompress the files with this xz version - 11. yes or no indicating if all block headers have both com- + 11. yes or no indicating if all block headers have both com- pressed size and uncompressed size stored in them - Future versions may add new line types and new columns can be added to + Future versions may add new line types and new columns can be added to the existing line types, but the existing columns won't be changed. EXIT STATUS @@ -1042,28 +1054,28 @@ EXIT STATUS the exit status. ENVIRONMENT - xz parses space-separated lists of options from the environment vari- + xz parses space-separated lists of options from the environment vari- ables XZ_DEFAULTS and XZ_OPT, in this order, before parsing the options - from the command line. Note that only options are parsed from the - environment variables; all non-options are silently ignored. Parsing - is done with getopt_long(3) which is used also for the command line + from the command line. Note that only options are parsed from the + environment variables; all non-options are silently ignored. Parsing + is done with getopt_long(3) which is used also for the command line arguments. XZ_DEFAULTS User-specific or system-wide default options. Typically this is set in a shell initialization script to enable xz's memory usage - limiter by default. Excluding shell initialization scripts and - similar special cases, scripts must never set or unset + limiter by default. Excluding shell initialization scripts and + similar special cases, scripts must never set or unset XZ_DEFAULTS. XZ_OPT This is for passing options to xz when it is not possible to set - the options directly on the xz command line. This is the case + the options directly on the xz command line. This is the case e.g. when xz is run by a script or tool, e.g. GNU tar(1): XZ_OPT=-2v tar caf foo.tar.xz foo - Scripts may use XZ_OPT e.g. to set script-specific default com- - pression options. It is still recommended to allow users to + Scripts may use XZ_OPT e.g. to set script-specific default com- + pression options. It is still recommended to allow users to override XZ_OPT if that is reasonable, e.g. in sh(1) scripts one may use something like this: @@ -1071,16 +1083,16 @@ ENVIRONMENT export XZ_OPT LZMA UTILS COMPATIBILITY - The command line syntax of xz is practically a superset of lzma, - unlzma, and lzcat as found from LZMA Utils 4.32.x. In most cases, it + The command line syntax of xz is practically a superset of lzma, + unlzma, and lzcat as found from LZMA Utils 4.32.x. In most cases, it is possible to replace LZMA Utils with XZ Utils without breaking exist- - ing scripts. There are some incompatibilities though, which may some- + ing scripts. There are some incompatibilities though, which may some- times cause problems. Compression preset levels - The numbering of the compression level presets is not identical in xz - and LZMA Utils. The most important difference is how dictionary sizes - are mapped to different presets. Dictionary size is roughly equal to + The numbering of the compression level presets is not identical in xz + and LZMA Utils. The most important difference is how dictionary sizes + are mapped to different presets. Dictionary size is roughly equal to the decompressor memory usage. Level xz LZMA Utils @@ -1089,7 +1101,6 @@ LZMA UTILS COMPATIBILITY -2 2 MiB 1 MiB -3 4 MiB 512 KiB -4 4 MiB 1 MiB - -5 8 MiB 2 MiB -6 8 MiB 4 MiB -7 16 MiB 8 MiB @@ -1097,7 +1108,7 @@ LZMA UTILS COMPATIBILITY -9 64 MiB 32 MiB The dictionary size differences affect the compressor memory usage too, - but there are some other differences between LZMA Utils and XZ Utils, + but there are some other differences between LZMA Utils and XZ Utils, which make the difference even bigger: Level xz LZMA Utils 4.32.x @@ -1106,102 +1117,105 @@ LZMA UTILS COMPATIBILITY -2 17 MiB 12 MiB -3 32 MiB 12 MiB -4 48 MiB 16 MiB + -5 94 MiB 26 MiB -6 94 MiB 45 MiB -7 186 MiB 83 MiB -8 370 MiB 159 MiB -9 674 MiB 311 MiB - The default preset level in LZMA Utils is -7 while in XZ Utils it is + The default preset level in LZMA Utils is -7 while in XZ Utils it is -6, so both use an 8 MiB dictionary by default. Streamed vs. non-streamed .lzma files - The uncompressed size of the file can be stored in the .lzma header. - LZMA Utils does that when compressing regular files. The alternative - is to mark that uncompressed size is unknown and use end-of-payload + The uncompressed size of the file can be stored in the .lzma header. + LZMA Utils does that when compressing regular files. The alternative + is to mark that uncompressed size is unknown and use end-of-payload marker to indicate where the decompressor should stop. LZMA Utils uses - this method when uncompressed size isn't known, which is the case for + this method when uncompressed size isn't known, which is the case for example in pipes. - xz supports decompressing .lzma files with or without end-of-payload - marker, but all .lzma files created by xz will use end-of-payload - marker and have uncompressed size marked as unknown in the .lzma - header. This may be a problem in some uncommon situations. For exam- - ple, a .lzma decompressor in an embedded device might work only with - files that have known uncompressed size. If you hit this problem, you - need to use LZMA Utils or LZMA SDK to create .lzma files with known + xz supports decompressing .lzma files with or without end-of-payload + marker, but all .lzma files created by xz will use end-of-payload + marker and have uncompressed size marked as unknown in the .lzma + header. This may be a problem in some uncommon situations. For exam- + ple, a .lzma decompressor in an embedded device might work only with + files that have known uncompressed size. If you hit this problem, you + need to use LZMA Utils or LZMA SDK to create .lzma files with known uncompressed size. Unsupported .lzma files The .lzma format allows lc values up to 8, and lp values up to 4. LZMA Utils can decompress files with any lc and lp, but always creates files - with lc=3 and lp=0. Creating files with other lc and lp is possible + with lc=3 and lp=0. Creating files with other lc and lp is possible with xz and with LZMA SDK. The implementation of the LZMA1 filter in liblzma requires that the sum - of lc and lp must not exceed 4. Thus, .lzma files, which exceed this + of lc and lp must not exceed 4. Thus, .lzma files, which exceed this limitation, cannot be decompressed with xz. LZMA Utils creates only .lzma files which have a dictionary size of 2^n - (a power of 2) but accepts files with any dictionary size. liblzma - accepts only .lzma files which have a dictionary size of 2^n or 2^n + - 2^(n-1). This is to decrease false positives when detecting .lzma + (a power of 2) but accepts files with any dictionary size. liblzma + accepts only .lzma files which have a dictionary size of 2^n or 2^n + + 2^(n-1). This is to decrease false positives when detecting .lzma files. These limitations shouldn't be a problem in practice, since practically - all .lzma files have been compressed with settings that liblzma will + all .lzma files have been compressed with settings that liblzma will accept. Trailing garbage - When decompressing, LZMA Utils silently ignore everything after the - first .lzma stream. In most situations, this is a bug. This also - means that LZMA Utils don't support decompressing concatenated .lzma + When decompressing, LZMA Utils silently ignore everything after the + first .lzma stream. In most situations, this is a bug. This also + means that LZMA Utils don't support decompressing concatenated .lzma files. - If there is data left after the first .lzma stream, xz considers the - file to be corrupt. This may break obscure scripts which have assumed + If there is data left after the first .lzma stream, xz considers the + file to be corrupt. This may break obscure scripts which have assumed that trailing garbage is ignored. NOTES Compressed output may vary - The exact compressed output produced from the same uncompressed input + The exact compressed output produced from the same uncompressed input file may vary between XZ Utils versions even if compression options are identical. This is because the encoder can be improved (faster or bet- - ter compression) without affecting the file format. The output can - vary even between different builds of the same XZ Utils version, if + ter compression) without affecting the file format. The output can + vary even between different builds of the same XZ Utils version, if different build options are used. - The above means that implementing --rsyncable to create rsyncable .xz - files is not going to happen without freezing a part of the encoder - implementation, which can then be used with --rsyncable. + The above means that once --rsyncable has been implemented, the result- + ing files won't necessarily be rsyncable unless both old and new files + have been compressed with the same xz version. This problem can be + fixed if a part of the encoder implementation is frozen to keep rsynca- + ble output stable across xz versions. Embedded .xz decompressors Embedded .xz decompressor implementations like XZ Embedded don't neces- sarily support files created with integrity check types other than none - and crc32. Since the default is --check=crc64, you must use + and crc32. Since the default is --check=crc64, you must use --check=none or --check=crc32 when creating files for embedded systems. - Outside embedded systems, all .xz format decompressors support all the - check types, or at least are able to decompress the file without veri- + Outside embedded systems, all .xz format decompressors support all the + check types, or at least are able to decompress the file without veri- fying the integrity check if the particular check is not supported. - XZ Embedded supports BCJ filters, but only with the default start off- + XZ Embedded supports BCJ filters, but only with the default start off- set. EXAMPLES Basics - Compress the file foo into foo.xz using the default compression level + Compress the file foo into foo.xz using the default compression level (-6), and remove foo if compression is successful: xz foo - Decompress bar.xz into bar and don't remove bar.xz even if decompres- + Decompress bar.xz into bar and don't remove bar.xz even if decompres- sion is successful: xz -dk bar.xz - Create baz.tar.xz with the preset -4e (-4 --extreme), which is slower - than e.g. the default -6, but needs less memory for compression and + Create baz.tar.xz with the preset -4e (-4 --extreme), which is slower + than e.g. the default -6, but needs less memory for compression and decompression (48 MiB and 5 MiB, respectively): tar cf - baz | xz -4e > baz.tar.xz @@ -1212,31 +1226,31 @@ EXAMPLES xz -dcf a.txt b.txt.xz c.txt d.txt.lzma > abcd.txt Parallel compression of many files - On GNU and *BSD, find(1) and xargs(1) can be used to parallelize com- + On GNU and *BSD, find(1) and xargs(1) can be used to parallelize com- pression of many files: find . -type f \! -name '*.xz' -print0 \ | xargs -0r -P4 -n16 xz -T1 - The -P option to xargs(1) sets the number of parallel xz processes. + The -P option to xargs(1) sets the number of parallel xz processes. The best value for the -n option depends on how many files there are to - be compressed. If there are only a couple of files, the value should + be compressed. If there are only a couple of files, the value should probably be 1; with tens of thousands of files, 100 or even more may be - appropriate to reduce the number of xz processes that xargs(1) will + appropriate to reduce the number of xz processes that xargs(1) will eventually create. - The option -T1 for xz is there to force it to single-threaded mode, + The option -T1 for xz is there to force it to single-threaded mode, because xargs(1) is used to control the amount of parallelization. Robot mode - Calculate how many bytes have been saved in total after compressing + Calculate how many bytes have been saved in total after compressing multiple files: xz --robot --list *.xz | awk '/^totals/{print $5-$4}' - A script may want to know that it is using new enough xz. The follow- - ing sh(1) script checks that the version number of the xz tool is at - least 5.0.0. This method is compatible with old beta versions, which + A script may want to know that it is using new enough xz. The follow- + ing sh(1) script checks that the version number of the xz tool is at + least 5.0.0. This method is compatible with old beta versions, which didn't support the --robot option: if ! eval "$(xz --robot --version 2> /dev/null)" || @@ -1256,12 +1270,12 @@ EXAMPLES fi Custom compressor filter chains - The simplest use for custom filter chains is customizing a LZMA2 pre- - set. This can be useful, because the presets cover only a subset of + The simplest use for custom filter chains is customizing a LZMA2 pre- + set. This can be useful, because the presets cover only a subset of the potentially useful combinations of compression settings. - The CompCPU columns of the tables from the descriptions of the options - -0 ... -9 and --extreme are useful when customizing LZMA2 presets. + The CompCPU columns of the tables from the descriptions of the options + -0 ... -9 and --extreme are useful when customizing LZMA2 presets. Here are the relevant parts collected from those two tables: Preset CompCPU @@ -1275,83 +1289,83 @@ EXAMPLES -5e 7 -6e 8 - If you know that a file requires somewhat big dictionary (e.g. 32 MiB) - to compress well, but you want to compress it quicker than xz -8 would + If you know that a file requires somewhat big dictionary (e.g. 32 MiB) + to compress well, but you want to compress it quicker than xz -8 would do, a preset with a low CompCPU value (e.g. 1) can be modified to use a bigger dictionary: xz --lzma2=preset=1,dict=32MiB foo.tar - With certain files, the above command may be faster than xz -6 while - compressing significantly better. However, it must be emphasized that + With certain files, the above command may be faster than xz -6 while + compressing significantly better. However, it must be emphasized that only some files benefit from a big dictionary while keeping the CompCPU value low. The most obvious situation, where a big dictionary can help - a lot, is an archive containing very similar files of at least a few - megabytes each. The dictionary size has to be significantly bigger - than any individual file to allow LZMA2 to take full advantage of the + a lot, is an archive containing very similar files of at least a few + megabytes each. The dictionary size has to be significantly bigger + than any individual file to allow LZMA2 to take full advantage of the similarities between consecutive files. - If very high compressor and decompressor memory usage is fine, and the - file being compressed is at least several hundred megabytes, it may be - useful to use an even bigger dictionary than the 64 MiB that xz -9 + If very high compressor and decompressor memory usage is fine, and the + file being compressed is at least several hundred megabytes, it may be + useful to use an even bigger dictionary than the 64 MiB that xz -9 would use: xz -vv --lzma2=dict=192MiB big_foo.tar Using -vv (--verbose --verbose) like in the above example can be useful - to see the memory requirements of the compressor and decompressor. - Remember that using a dictionary bigger than the size of the uncom- - pressed file is waste of memory, so the above command isn't useful for + to see the memory requirements of the compressor and decompressor. + Remember that using a dictionary bigger than the size of the uncom- + pressed file is waste of memory, so the above command isn't useful for small files. - Sometimes the compression time doesn't matter, but the decompressor - memory usage has to be kept low e.g. to make it possible to decompress - the file on an embedded system. The following command uses -6e (-6 - --extreme) as a base and sets the dictionary to only 64 KiB. The - resulting file can be decompressed with XZ Embedded (that's why there + Sometimes the compression time doesn't matter, but the decompressor + memory usage has to be kept low e.g. to make it possible to decompress + the file on an embedded system. The following command uses -6e (-6 + --extreme) as a base and sets the dictionary to only 64 KiB. The + resulting file can be decompressed with XZ Embedded (that's why there is --check=crc32) using about 100 KiB of memory. xz --check=crc32 --lzma2=preset=6e,dict=64KiB foo - If you want to squeeze out as many bytes as possible, adjusting the - number of literal context bits (lc) and number of position bits (pb) + If you want to squeeze out as many bytes as possible, adjusting the + number of literal context bits (lc) and number of position bits (pb) can sometimes help. Adjusting the number of literal position bits (lp) - might help too, but usually lc and pb are more important. E.g. a - source code archive contains mostly US-ASCII text, so something like + might help too, but usually lc and pb are more important. E.g. a + source code archive contains mostly US-ASCII text, so something like the following might give slightly (like 0.1 %) smaller file than xz -6e (try also without lc=4): xz --lzma2=preset=6e,pb=0,lc=4 source_code.tar - Using another filter together with LZMA2 can improve compression with + Using another filter together with LZMA2 can improve compression with certain file types. E.g. to compress a x86-32 or x86-64 shared library using the x86 BCJ filter: xz --x86 --lzma2 libfoo.so - Note that the order of the filter options is significant. If --x86 is + Note that the order of the filter options is significant. If --x86 is specified after --lzma2, xz will give an error, because there cannot be - any filter after LZMA2, and also because the x86 BCJ filter cannot be + any filter after LZMA2, and also because the x86 BCJ filter cannot be used as the last filter in the chain. - The Delta filter together with LZMA2 can give good results with bitmap + The Delta filter together with LZMA2 can give good results with bitmap images. It should usually beat PNG, which has a few more advanced fil- ters than simple delta but uses Deflate for the actual compression. - The image has to be saved in uncompressed format, e.g. as uncompressed - TIFF. The distance parameter of the Delta filter is set to match the - number of bytes per pixel in the image. E.g. 24-bit RGB bitmap needs - dist=3, and it is also good to pass pb=0 to LZMA2 to accommodate the + The image has to be saved in uncompressed format, e.g. as uncompressed + TIFF. The distance parameter of the Delta filter is set to match the + number of bytes per pixel in the image. E.g. 24-bit RGB bitmap needs + dist=3, and it is also good to pass pb=0 to LZMA2 to accommodate the three-byte alignment: xz --delta=dist=3 --lzma2=pb=0 foo.tiff If multiple images have been put into a single archive (e.g. .tar), the - Delta filter will work on that too as long as all images have the same + Delta filter will work on that too as long as all images have the same number of bytes per pixel. SEE ALSO - xzdec(1), xzdiff(1), xzgrep(1), xzless(1), xzmore(1), gzip(1), + xzdec(1), xzdiff(1), xzgrep(1), xzless(1), xzmore(1), gzip(1), bzip2(1), 7z(1) XZ Utils: <http://tukaani.org/xz/> @@ -1360,4 +1374,4 @@ SEE ALSO -Tukaani 2010-10-04 XZ(1) +Tukaani 2013-06-21 XZ(1) diff --git a/Build/source/extra/xz/doc/man/txt/xzdec.txt b/Build/source/extra/xz/doc/man/txt/xzdec.txt index 7801afa7c93..3d69ff3f366 100644 --- a/Build/source/extra/xz/doc/man/txt/xzdec.txt +++ b/Build/source/extra/xz/doc/man/txt/xzdec.txt @@ -6,8 +6,8 @@ NAME xzdec, lzmadec - Small .xz and .lzma decompressors SYNOPSIS - xzdec [option]... [file]... - lzmadec [option]... [file]... + xzdec [option...] [file...] + lzmadec [option...] [file...] DESCRIPTION xzdec is a liblzma-based decompression-only tool for .xz (and only .xz) @@ -77,4 +77,4 @@ SEE ALSO -Tukaani 2010-09-27 XZDEC(1) +Tukaani 2013-06-30 XZDEC(1) diff --git a/Build/source/extra/xz/doc/man/txt/xzmore.txt b/Build/source/extra/xz/doc/man/txt/xzmore.txt index a32f44077e9..5a9d86c7853 100644 --- a/Build/source/extra/xz/doc/man/txt/xzmore.txt +++ b/Build/source/extra/xz/doc/man/txt/xzmore.txt @@ -6,8 +6,8 @@ NAME xzmore, lzmore - view xz or lzma compressed (text) files SYNOPSIS - xzmore [filename ...] - lzmore [filename ...] + xzmore [file...] + lzmore [file...] DESCRIPTION xzmore is a filter which allows examination of xz(1) or lzma(1) com- @@ -31,4 +31,4 @@ SEE ALSO -Tukaani 2010-09-27 XZMORE(1) +Tukaani 2013-06-30 XZMORE(1) diff --git a/Build/source/extra/xz/dos/Makefile b/Build/source/extra/xz/dos/Makefile index d67451a0e90..3a028993edf 100644 --- a/Build/source/extra/xz/dos/Makefile +++ b/Build/source/extra/xz/dos/Makefile @@ -16,7 +16,7 @@ CC = gcc STRIP = strip CPPFLAGS = CFLAGS = -g -Wall -Wextra -Wfatal-errors -march=i386 -mtune=i686 -O2 -LDFLAGS = +LDFLAGS = -lemu # NOTE: -fgnu89-inline is needed on DJGPP 2.04 beta and GCC >= 4.3.0 # because time.h uses GNU-style "extern inline". diff --git a/Build/source/extra/xz/lib/Makefile.in b/Build/source/extra/xz/lib/Makefile.in index 1189b13fe9b..1c4f38c5b71 100644 --- a/Build/source/extra/xz/lib/Makefile.in +++ b/Build/source/extra/xz/lib/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,18 +79,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = lib -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in getopt.c \ - getopt1.c +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am getopt.c \ + getopt1.c $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -61,30 +106,64 @@ CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = LIBRARIES = $(noinst_LIBRARIES) ARFLAGS = cru +AM_V_AR = $(am__v_AR_@AM_V@) +am__v_AR_ = $(am__v_AR_@AM_DEFAULT_V@) +am__v_AR_0 = @echo " AR " $@; +am__v_AR_1 = libgnu_a_AR = $(AR) $(ARFLAGS) am_libgnu_a_OBJECTS = libgnu_a_OBJECTS = $(am_libgnu_a_OBJECTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(libgnu_a_SOURCES) DIST_SOURCES = $(libgnu_a_SOURCES) -ETAGS = etags -CTAGS = ctags +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -113,6 +192,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -173,6 +253,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -180,12 +261,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -272,10 +353,11 @@ $(am__aclocal_m4_deps): clean-noinstLIBRARIES: -test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES) -libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) - -rm -f libgnu.a - $(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) - $(RANLIB) libgnu.a + +libgnu.a: $(libgnu_a_OBJECTS) $(libgnu_a_DEPENDENCIES) $(EXTRA_libgnu_a_DEPENDENCIES) + $(AM_V_at)-rm -f libgnu.a + $(AM_V_AR)$(libgnu_a_AR) libgnu.a $(libgnu_a_OBJECTS) $(libgnu_a_LIBADD) + $(AM_V_at)$(RANLIB) libgnu.a mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -287,83 +369,37 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/getopt1.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo clean-libtool: -rm -rf .libs _libs +tags TAGS: + +ctags CTAGS: + +cscope cscopelist: -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -411,10 +447,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: -test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES) @@ -436,8 +477,7 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \ distclean: distclean-am -rm -rf $(DEPDIR) -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags +distclean-am: clean-am distclean-compile distclean-generic dvi: dvi-am @@ -501,18 +541,18 @@ uninstall-am: .MAKE: all check install install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-noinstLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am 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 \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am +.PHONY: all all-am check check-am clean clean-generic clean-libtool \ + clean-noinstLIBRARIES cscopelist-am ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool distdir \ + dvi dvi-am html html-am info info-am install install-am \ + install-data install-data-am 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 maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-compile \ + mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ + tags-am uninstall uninstall-am getopt.h: getopt.in.h @@ -524,4 +564,3 @@ getopt.h: getopt.in.h # 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: - diff --git a/Build/source/extra/xz/m4/acx_pthread.m4 b/Build/source/extra/xz/m4/ax_pthread.m4 index d2b116945f9..d90de34d14b 100644 --- a/Build/source/extra/xz/m4/acx_pthread.m4 +++ b/Build/source/extra/xz/m4/ax_pthread.m4 @@ -1,93 +1,94 @@ -##### http://autoconf-archive.cryp.to/acx_pthread.html +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_pthread.html +# =========================================================================== # # SYNOPSIS # -# ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) +# AX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) # # DESCRIPTION # -# This macro figures out how to build C programs using POSIX threads. -# It sets the PTHREAD_LIBS output variable to the threads library and -# linker flags, and the PTHREAD_CFLAGS output variable to any special -# C compiler flags that are needed. (The user can also force certain -# compiler flags/libs to be tested by setting these environment -# variables.) +# This macro figures out how to build C programs using POSIX threads. It +# sets the PTHREAD_LIBS output variable to the threads library and linker +# flags, and the PTHREAD_CFLAGS output variable to any special C compiler +# flags that are needed. (The user can also force certain compiler +# flags/libs to be tested by setting these environment variables.) # # Also sets PTHREAD_CC to any special C compiler that is needed for -# multi-threaded programs (defaults to the value of CC otherwise). -# (This is necessary on AIX to use the special cc_r compiler alias.) +# multi-threaded programs (defaults to the value of CC otherwise). (This +# is necessary on AIX to use the special cc_r compiler alias.) # -# NOTE: You are assumed to not only compile your program with these -# flags, but also link it with them as well. e.g. you should link -# with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS -# $LIBS +# NOTE: You are assumed to not only compile your program with these flags, +# but also link it with them as well. e.g. you should link with +# $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS $LIBS # -# If you are only building threads programs, you may wish to use -# these variables in your default LIBS, CFLAGS, and CC: +# If you are only building threads programs, you may wish to use these +# variables in your default LIBS, CFLAGS, and CC: # -# LIBS="$PTHREAD_LIBS $LIBS" -# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -# CC="$PTHREAD_CC" +# LIBS="$PTHREAD_LIBS $LIBS" +# CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +# CC="$PTHREAD_CC" # -# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute -# constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to -# that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX). +# In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute constant +# has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to that name +# (e.g. PTHREAD_CREATE_UNDETACHED on AIX). # -# ACTION-IF-FOUND is a list of shell commands to run if a threads -# library is found, and ACTION-IF-NOT-FOUND is a list of commands to -# run it if it is not found. If ACTION-IF-FOUND is not specified, the -# default action will define HAVE_PTHREAD. +# Also HAVE_PTHREAD_PRIO_INHERIT is defined if pthread is found and the +# PTHREAD_PRIO_INHERIT symbol is defined when compiling with +# PTHREAD_CFLAGS. # -# Please let the authors know if this macro fails on any platform, or -# if you have any other suggestions or comments. This macro was based -# on work by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) -# (with help from M. Frigo), as well as ac_pthread and hb_pthread -# macros posted by Alejandro Forero Cuervo to the autoconf macro -# repository. We are also grateful for the helpful feedback of -# numerous users. +# ACTION-IF-FOUND is a list of shell commands to run if a threads library +# is found, and ACTION-IF-NOT-FOUND is a list of commands to run it if it +# is not found. If ACTION-IF-FOUND is not specified, the default action +# will define HAVE_PTHREAD. # -# LAST MODIFICATION +# Please let the authors know if this macro fails on any platform, or if +# you have any other suggestions or comments. This macro was based on work +# by SGJ on autoconf scripts for FFTW (http://www.fftw.org/) (with help +# from M. Frigo), as well as ac_pthread and hb_pthread macros posted by +# Alejandro Forero Cuervo to the autoconf macro repository. We are also +# grateful for the helpful feedback of numerous users. # -# 2007-07-29 +# Updated for Autoconf 2.68 by Daniel Richard G. # -# COPYLEFT +# LICENSE # -# Copyright (c) 2007 Steven G. Johnson <stevenj@alum.mit.edu> +# Copyright (c) 2008 Steven G. Johnson <stevenj@alum.mit.edu> +# Copyright (c) 2011 Daniel Richard G. <skunk@iSKUNK.ORG> # -# This program is free software: you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. +# This program is free software: you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation, either version 3 of the License, or (at your +# option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program. If not, see -# <http://www.gnu.org/licenses/>. +# You should have received a copy of the GNU General Public License along +# with this program. If not, see <http://www.gnu.org/licenses/>. # -# As a special exception, the respective Autoconf Macro's copyright -# owner gives unlimited permission to copy, distribute and modify the -# configure scripts that are the output of Autoconf when processing -# the Macro. You need not follow the terms of the GNU General Public -# License when using or distributing such scripts, even though -# portions of the text of the Macro appear in them. The GNU General -# Public License (GPL) does govern all other use of the material that -# constitutes the Autoconf Macro. +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. # -# This special exception to the GPL applies to versions of the -# Autoconf Macro released by the Autoconf Macro Archive. When you -# make and distribute a modified version of the Autoconf Macro, you -# may extend this special exception to the GPL to apply to your -# modified version as well. +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. -AC_DEFUN([ACX_PTHREAD], [ +#serial 18 + +AU_ALIAS([ACX_PTHREAD], [AX_PTHREAD]) +AC_DEFUN([AX_PTHREAD], [ AC_REQUIRE([AC_CANONICAL_HOST]) -AC_LANG_SAVE -AC_LANG_C -acx_pthread_ok=no +AC_LANG_PUSH([C]) +ax_pthread_ok=no # We used to check for pthread.h first, but this fails if pthread.h # requires special compiler flags (e.g. on True64 or Sequent). @@ -102,9 +103,9 @@ if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) - AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) - AC_MSG_RESULT($acx_pthread_ok) - if test x"$acx_pthread_ok" = xno; then + AC_TRY_LINK_FUNC(pthread_join, ax_pthread_ok=yes) + AC_MSG_RESULT($ax_pthread_ok) + if test x"$ax_pthread_ok" = xno; then PTHREAD_LIBS="" PTHREAD_CFLAGS="" fi @@ -122,7 +123,7 @@ fi # which indicates that we try without any flags at all, and "pthread-config" # which is a program returning the flags for the Pth emulation library. -acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" +ax_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config" # The ordering *is* (sometimes) important. Some notes on the # individual items follow: @@ -144,8 +145,8 @@ acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -m # --thread-safe: KAI C++ # pthread-config: use pthread-config program (for GNU Pth library) -case "${host_cpu}-${host_os}" in - *solaris*) +case ${host_os} in + solaris*) # On Solaris (at least, for some versions), libc contains stubbed # (non-functional) versions of the pthreads routines, so link-based @@ -155,12 +156,16 @@ case "${host_cpu}-${host_os}" in # who knows whether they'll stub that too in a future libc.) So, # we'll just look for -pthreads and -lpthread first: - acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags" + ax_pthread_flags="-pthreads pthread -mt -pthread $ax_pthread_flags" + ;; + + darwin*) + ax_pthread_flags="-pthread $ax_pthread_flags" ;; esac -if test x"$acx_pthread_ok" = xno; then -for flag in $acx_pthread_flags; do +if test x"$ax_pthread_ok" = xno; then +for flag in $ax_pthread_flags; do case $flag in none) @@ -172,12 +177,12 @@ for flag in $acx_pthread_flags; do PTHREAD_CFLAGS="$flag" ;; - pthread-config) - AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no) - if test x"$acx_pthread_config" = xno; then continue; fi - PTHREAD_CFLAGS="`pthread-config --cflags`" - PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" - ;; + pthread-config) + AC_CHECK_PROG(ax_pthread_config, pthread-config, yes, no) + if test x"$ax_pthread_config" = xno; then continue; fi + PTHREAD_CFLAGS="`pthread-config --cflags`" + PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`" + ;; *) AC_MSG_CHECKING([for the pthreads library -l$flag]) @@ -199,17 +204,23 @@ for flag in $acx_pthread_flags; do # pthread_cleanup_push because it is one of the few pthread # functions on Solaris that doesn't have a non-functional libc stub. # We try pthread_create on general principles. - AC_TRY_LINK([#include <pthread.h>], - [pthread_t th; pthread_join(th, 0); - pthread_attr_init(0); pthread_cleanup_push(0, 0); - pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], - [acx_pthread_ok=yes]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h> + static void routine(void *a) { a = 0; } + static void *start_routine(void *a) { return a; }], + [pthread_t th; pthread_attr_t attr; + pthread_create(&th, 0, start_routine, 0); + pthread_join(th, 0); + pthread_attr_init(&attr); + pthread_cleanup_push(routine, 0); + pthread_cleanup_pop(0) /* ; */])], + [ax_pthread_ok=yes], + []) LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" - AC_MSG_RESULT($acx_pthread_ok) - if test "x$acx_pthread_ok" = xyes; then + AC_MSG_RESULT($ax_pthread_ok) + if test "x$ax_pthread_ok" = xyes; then break; fi @@ -219,19 +230,21 @@ done fi # Various other checks: -if test "x$acx_pthread_ok" = xyes; then +if test "x$ax_pthread_ok" = xyes; then save_LIBS="$LIBS" LIBS="$PTHREAD_LIBS $LIBS" save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $PTHREAD_CFLAGS" # Detect AIX lossage: JOINABLE attribute is called UNDETACHED. - AC_MSG_CHECKING([for joinable pthread attribute]) - attr_name=unknown - for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do - AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;], - [attr_name=$attr; break]) - done + AC_MSG_CHECKING([for joinable pthread attribute]) + attr_name=unknown + for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do + AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <pthread.h>], + [int attr = $attr; return attr /* ; */])], + [attr_name=$attr; break], + []) + done AC_MSG_RESULT($attr_name) if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name, @@ -241,24 +254,41 @@ if test "x$acx_pthread_ok" = xyes; then AC_MSG_CHECKING([if more special flags are required for pthreads]) flag=no - case "${host_cpu}-${host_os}" in - *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";; - *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; + case ${host_os} in + aix* | freebsd* | darwin*) flag="-D_THREAD_SAFE";; + osf* | hpux*) flag="-D_REENTRANT";; + solaris*) + if test "$GCC" = "yes"; then + flag="-D_REENTRANT" + else + flag="-mt -D_REENTRANT" + fi + ;; esac AC_MSG_RESULT(${flag}) if test "x$flag" != xno; then PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" fi + AC_CACHE_CHECK([for PTHREAD_PRIO_INHERIT], + ax_cv_PTHREAD_PRIO_INHERIT, [ + AC_LINK_IFELSE([ + AC_LANG_PROGRAM([[#include <pthread.h>]], [[int i = PTHREAD_PRIO_INHERIT;]])], + [ax_cv_PTHREAD_PRIO_INHERIT=yes], + [ax_cv_PTHREAD_PRIO_INHERIT=no]) + ]) + AS_IF([test "x$ax_cv_PTHREAD_PRIO_INHERIT" = "xyes"], + AC_DEFINE([HAVE_PTHREAD_PRIO_INHERIT], 1, [Have PTHREAD_PRIO_INHERIT.])) + LIBS="$save_LIBS" CFLAGS="$save_CFLAGS" # More AIX lossage: must compile with xlc_r or cc_r - if test x"$GCC" != xyes; then + if test x"$GCC" != xyes; then AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC}) else PTHREAD_CC=$CC - fi + fi else PTHREAD_CC="$CC" fi @@ -268,12 +298,12 @@ AC_SUBST(PTHREAD_CFLAGS) AC_SUBST(PTHREAD_CC) # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -if test x"$acx_pthread_ok" = xyes; then +if test x"$ax_pthread_ok" = xyes; then ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) : else - acx_pthread_ok=no + ax_pthread_ok=no $2 fi -AC_LANG_RESTORE -])dnl ACX_PTHREAD +AC_LANG_POP +])dnl AX_PTHREAD diff --git a/Build/source/extra/xz/m4/gettext.m4 b/Build/source/extra/xz/m4/gettext.m4 index 91c345e992f..f84e6a5d753 100644 --- a/Build/source/extra/xz/m4/gettext.m4 +++ b/Build/source/extra/xz/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 59 (gettext-0.16.1) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# gettext.m4 serial 63 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -15,7 +15,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. -dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2006, 2008-2010. dnl Macro to add for using GNU gettext. @@ -60,6 +60,8 @@ AC_DEFUN([AM_GNU_GETTEXT], ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT ])])])])]) + ifelse(ifelse([$1], [], [old])[]ifelse([$1], [no-libtool], [old]), [old], + [AC_DIAGNOSE([obsolete], [Use of AM_GNU_GETTEXT without [external] argument is deprecated.])]) ifelse([$2], [], , [ifelse([$2], [need-ngettext], , [ifelse([$2], [need-formatstring-macros], , [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT ])])])]) @@ -123,11 +125,11 @@ AC_DEFUN([AM_GNU_GETTEXT], gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + AC_MSG_RESULT([$nls_cv_force_use_gnu_gettext]) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then @@ -267,7 +269,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -301,9 +303,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi @@ -319,9 +321,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) - AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATOBJEXT) + AC_SUBST([BUILD_INCLUDED_LIBINTL]) + AC_SUBST([USE_INCLUDED_LIBINTL]) + AC_SUBST([CATOBJEXT]) dnl For backward compatibility. Some configure.ins may be using this. nls_cv_header_intl= @@ -329,74 +331,36 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a dnl For backward compatibility. Some Makefiles may be using this. DATADIRNAME=share - AC_SUBST(DATADIRNAME) + AC_SUBST([DATADIRNAME]) dnl For backward compatibility. Some Makefiles may be using this. INSTOBJEXT=.mo - AC_SUBST(INSTOBJEXT) + AC_SUBST([INSTOBJEXT]) dnl For backward compatibility. Some Makefiles may be using this. GENCAT=gencat - AC_SUBST(GENCAT) + AC_SUBST([GENCAT]) dnl For backward compatibility. Some Makefiles may be using this. INTLOBJS= if test "$USE_INCLUDED_LIBINTL" = yes; then INTLOBJS="\$(GETTOBJS)" fi - AC_SUBST(INTLOBJS) + AC_SUBST([INTLOBJS]) dnl Enable libtool support if the surrounding package wishes it. INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) + AC_SUBST([INTL_LIBTOOL_SUFFIX_PREFIX]) ]) dnl For backward compatibility. Some Makefiles may be using this. INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) + AC_SUBST([INTLLIBS]) dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl Checks for special options needed on MacOS X. -dnl Defines INTL_MACOSX_LIBS. -AC_DEFUN([gt_INTL_MACOSX], -[ - dnl Check for API introduced in MacOS X 10.2. - AC_CACHE_CHECK([for CFPreferencesCopyAppValue], - gt_cv_func_CFPreferencesCopyAppValue, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], - [CFPreferencesCopyAppValue(NULL, NULL)], - [gt_cv_func_CFPreferencesCopyAppValue=yes], - [gt_cv_func_CFPreferencesCopyAppValue=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, - [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) - fi - dnl Check for API introduced in MacOS X 10.3. - AC_CACHE_CHECK([for CFLocaleCopyCurrent], gt_cv_func_CFLocaleCopyCurrent, - [gt_save_LIBS="$LIBS" - LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" - AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], - [gt_cv_func_CFLocaleCopyCurrent=yes], - [gt_cv_func_CFLocaleCopyCurrent=no]) - LIBS="$gt_save_LIBS"]) - if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, - [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) - fi - INTL_MACOSX_LIBS= - if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then - INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" - fi - AC_SUBST([INTL_MACOSX_LIBS]) + AC_SUBST([LIBINTL]) + AC_SUBST([LTLIBINTL]) + AC_SUBST([POSUB]) ]) diff --git a/Build/source/extra/xz/m4/iconv.m4 b/Build/source/extra/xz/m4/iconv.m4 index 654c4158943..f46ff142154 100644 --- a/Build/source/extra/xz/m4/iconv.m4 +++ b/Build/source/extra/xz/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM4 (gettext-0.11.3) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +# iconv.m4 serial 9 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2007-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -21,6 +21,7 @@ AC_DEFUN([AM_ICONV_LINK], [ dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and dnl those with the standalone portable GNU libiconv installed). + AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV dnl accordingly. @@ -33,7 +34,7 @@ AC_DEFUN([AM_ICONV_LINK], am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + AC_CACHE_CHECK([for iconv], [am_cv_func_iconv], [ am_cv_func_iconv="no, consider installing GNU libiconv" am_cv_lib_iconv=no AC_TRY_LINK([#include <stdlib.h> @@ -41,7 +42,7 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_func_iconv=yes) + [am_cv_func_iconv=yes]) if test "$am_cv_func_iconv" != yes; then am_save_LIBS="$LIBS" LIBS="$LIBS $LIBICONV" @@ -50,13 +51,110 @@ AC_DEFUN([AM_ICONV_LINK], [iconv_t cd = iconv_open("",""); iconv(cd,NULL,NULL,NULL,NULL); iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) + [am_cv_lib_iconv=yes] + [am_cv_func_iconv=yes]) LIBS="$am_save_LIBS" fi ]) if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + AC_CACHE_CHECK([for working iconv], [am_cv_func_iconv_works], [ + dnl This tests against bugs in AIX 5.1, HP-UX 11.11, Solaris 10. + am_save_LIBS="$LIBS" + if test $am_cv_lib_iconv = yes; then + LIBS="$LIBS $LIBICONV" + fi + AC_TRY_RUN([ +#include <iconv.h> +#include <string.h> +int main () +{ + /* Test against AIX 5.1 bug: Failures are not distinguishable from successful + returns. */ + { + iconv_t cd_utf8_to_88591 = iconv_open ("ISO8859-1", "UTF-8"); + if (cd_utf8_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\342\202\254"; /* EURO SIGN */ + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_utf8_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } + /* Test against Solaris 10 bug: Failures are not distinguishable from + successful returns. */ + { + iconv_t cd_ascii_to_88591 = iconv_open ("ISO8859-1", "646"); + if (cd_ascii_to_88591 != (iconv_t)(-1)) + { + static const char input[] = "\263"; + char buf[10]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_ascii_to_88591, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if (res == 0) + return 1; + } + } +#if 0 /* This bug could be worked around by the caller. */ + /* Test against HP-UX 11.11 bug: Positive return value instead of 0. */ + { + iconv_t cd_88591_to_utf8 = iconv_open ("utf8", "iso88591"); + if (cd_88591_to_utf8 != (iconv_t)(-1)) + { + static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337"; + char buf[50]; + const char *inptr = input; + size_t inbytesleft = strlen (input); + char *outptr = buf; + size_t outbytesleft = sizeof (buf); + size_t res = iconv (cd_88591_to_utf8, + (char **) &inptr, &inbytesleft, + &outptr, &outbytesleft); + if ((int)res > 0) + return 1; + } + } +#endif + /* Test against HP-UX 11.11 bug: No converter from EUC-JP to UTF-8 is + provided. */ + if (/* Try standardized names. */ + iconv_open ("UTF-8", "EUC-JP") == (iconv_t)(-1) + /* Try IRIX, OSF/1 names. */ + && iconv_open ("UTF-8", "eucJP") == (iconv_t)(-1) + /* Try AIX names. */ + && iconv_open ("UTF-8", "IBM-eucJP") == (iconv_t)(-1) + /* Try HP-UX names. */ + && iconv_open ("utf8", "eucJP") == (iconv_t)(-1)) + return 1; + return 0; +}], [am_cv_func_iconv_works=yes], [am_cv_func_iconv_works=no], + [case "$host_os" in + aix* | hpux*) am_cv_func_iconv_works="guessing no" ;; + *) am_cv_func_iconv_works="guessing yes" ;; + esac]) + LIBS="$am_save_LIBS" + ]) + case "$am_cv_func_iconv_works" in + *no) am_func_iconv=no am_cv_lib_iconv=no ;; + *) am_func_iconv=yes ;; + esac + else + am_func_iconv=no am_cv_lib_iconv=no + fi + if test "$am_func_iconv" = yes; then + AC_DEFINE([HAVE_ICONV], [1], + [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then AC_MSG_CHECKING([how to link with libiconv]) @@ -68,8 +166,8 @@ AC_DEFUN([AM_ICONV_LINK], LIBICONV= LTLIBICONV= fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) + AC_SUBST([LIBICONV]) + AC_SUBST([LTLIBICONV]) ]) AC_DEFUN([AM_ICONV], @@ -77,7 +175,7 @@ AC_DEFUN([AM_ICONV], AM_ICONV_LINK if test "$am_cv_func_iconv" = yes; then AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_CACHE_VAL([am_cv_proto_iconv], [ AC_TRY_COMPILE([ #include <stdlib.h> #include <iconv.h> @@ -90,12 +188,12 @@ size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, si #else size_t iconv(); #endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") +], [], [am_cv_proto_iconv_arg1=""], [am_cv_proto_iconv_arg1="const"]) am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + AC_MSG_RESULT([ + $am_cv_proto_iconv]) + AC_DEFINE_UNQUOTED([ICONV_CONST], [$am_cv_proto_iconv_arg1], [Define as const if the declaration of iconv() needs const.]) fi ]) diff --git a/Build/source/extra/xz/m4/intlmacosx.m4 b/Build/source/extra/xz/m4/intlmacosx.m4 new file mode 100644 index 00000000000..dd910259627 --- /dev/null +++ b/Build/source/extra/xz/m4/intlmacosx.m4 @@ -0,0 +1,51 @@ +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2010 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Checks for special options needed on MacOS X. +dnl Defines INTL_MACOSX_LIBS. +AC_DEFUN([gt_INTL_MACOSX], +[ + dnl Check for API introduced in MacOS X 10.2. + AC_CACHE_CHECK([for CFPreferencesCopyAppValue], + [gt_cv_func_CFPreferencesCopyAppValue], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include <CoreFoundation/CFPreferences.h>], + [CFPreferencesCopyAppValue(NULL, NULL)], + [gt_cv_func_CFPreferencesCopyAppValue=yes], + [gt_cv_func_CFPreferencesCopyAppValue=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], + [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) + fi + dnl Check for API introduced in MacOS X 10.3. + AC_CACHE_CHECK([for CFLocaleCopyCurrent], [gt_cv_func_CFLocaleCopyCurrent], + [gt_save_LIBS="$LIBS" + LIBS="$LIBS -Wl,-framework -Wl,CoreFoundation" + AC_TRY_LINK([#include <CoreFoundation/CFLocale.h>], [CFLocaleCopyCurrent();], + [gt_cv_func_CFLocaleCopyCurrent=yes], + [gt_cv_func_CFLocaleCopyCurrent=no]) + LIBS="$gt_save_LIBS"]) + if test $gt_cv_func_CFLocaleCopyCurrent = yes; then + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], + [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) + fi + INTL_MACOSX_LIBS= + if test $gt_cv_func_CFPreferencesCopyAppValue = yes || test $gt_cv_func_CFLocaleCopyCurrent = yes; then + INTL_MACOSX_LIBS="-Wl,-framework -Wl,CoreFoundation" + fi + AC_SUBST([INTL_MACOSX_LIBS]) +]) diff --git a/Build/source/extra/xz/m4/lib-ld.m4 b/Build/source/extra/xz/m4/lib-ld.m4 index 96c4e2c3396..ebb30528bd5 100644 --- a/Build/source/extra/xz/m4/lib-ld.m4 +++ b/Build/source/extra/xz/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2009-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -10,7 +10,7 @@ dnl with libtool.m4. dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld dnl From libtool-1.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, +[AC_ARG_WITH([gnu-ld], [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl @@ -59,7 +59,7 @@ if test "$GCC" = yes; then # Canonicalize the path of ld ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` done test -z "$LD" && LD="$ac_prog" ;; @@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do @@ -89,9 +89,9 @@ AC_CACHE_VAL(acl_cv_path_LD, # Break only if it was the GNU/non-GNU ld that we prefer. case `"$acl_cv_path_LD" -v 2>&1 < /dev/null` in *GNU* | *'with BFD'*) - test "$with_gnu_ld" != no && break ;; + test "$with_gnu_ld" != no && break ;; *) - test "$with_gnu_ld" != yes && break ;; + test "$with_gnu_ld" != yes && break ;; esac fi done @@ -101,9 +101,9 @@ else fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then - AC_MSG_RESULT($LD) + AC_MSG_RESULT([$LD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU diff --git a/Build/source/extra/xz/m4/lib-link.m4 b/Build/source/extra/xz/m4/lib-link.m4 index f95b7ba88d5..c73bd8e3a47 100644 --- a/Build/source/extra/xz/m4/lib-link.m4 +++ b/Build/source/extra/xz/m4/lib-link.m4 @@ -1,58 +1,66 @@ -# lib-link.m4 serial 9 (gettext-0.16) -dnl Copyright (C) 2001-2006 Free Software Foundation, Inc. +# lib-link.m4 serial 21 (gettext-0.18) +dnl Copyright (C) 2001-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. dnl From Bruno Haible. -AC_PREREQ(2.50) +AC_PREREQ([2.54]) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and dnl augments the CPPFLAGS variable. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ AC_LIB_LINKFLAGS_BODY([$1], [$2]) ac_cv_lib[]Name[]_libs="$LIB[]NAME" ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX" ]) LIB[]NAME="$ac_cv_lib[]Name[]_libs" LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) + AC_SUBST([LIB]NAME[_PREFIX]) dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the dnl results of this search when this library appears as a dependency. HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) + popdef([NAME]) + popdef([Name]) ]) -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode, [missing-message]) dnl searches for libname and the libraries corresponding to explicit and dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl the ability to compile and link the specified testcode. The missing-message +dnl defaults to 'no' and may contain additional hints for the user. +dnl If found, it sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} +dnl and LTLIB${NAME} variables and augments the CPPFLAGS variable, and dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], [ AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([Name],[translit([$1],[./-], [___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME dnl accordingly. @@ -66,13 +74,25 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + dnl If $LIB[]NAME contains some -l options, add it to the end of LIBS, + dnl because these -l options might require -L options that are present in + dnl LIBS. -l options benefit only from the -L options listed before it. + dnl Otherwise, add it to the front of LIBS, because it may be a static + dnl library that depends on another static library that is present in LIBS. + dnl Static libraries benefit only from the static libraries listed after + dnl it. + case " $LIB[]NAME" in + *" -l"*) LIBS="$LIBS $LIB[]NAME" ;; + *) LIBS="$LIB[]NAME $LIBS" ;; + esac + AC_TRY_LINK([$3], [$4], + [ac_cv_lib[]Name=yes], + [ac_cv_lib[]Name='m4_if([$5], [], [no], [[$5]])']) LIBS="$ac_save_LIBS" ]) if test "$ac_cv_lib[]Name" = yes; then HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the lib][$1 library.]) AC_MSG_CHECKING([how to link with lib[]$1]) AC_MSG_RESULT([$LIB[]NAME]) else @@ -82,17 +102,23 @@ AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], CPPFLAGS="$ac_save_CPPFLAGS" LIB[]NAME= LTLIB[]NAME= + LIB[]NAME[]_PREFIX= fi AC_SUBST([HAVE_LIB]NAME) AC_SUBST([LIB]NAME) AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) + AC_SUBST([LIB]NAME[_PREFIX]) + popdef([NAME]) + popdef([Name]) ]) dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L. +dnl acl_libext, +dnl acl_shlibext, +dnl acl_hardcode_libdir_flag_spec, +dnl acl_hardcode_libdir_separator, +dnl acl_hardcode_direct, +dnl acl_hardcode_minus_L. AC_DEFUN([AC_LIB_RPATH], [ dnl Tell automake >= 1.10 to complain if config.rpath is missing. @@ -101,7 +127,7 @@ AC_DEFUN([AC_LIB_RPATH], AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh @@ -109,35 +135,66 @@ AC_DEFUN([AC_LIB_RPATH], acl_cv_rpath=done ]) wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" + acl_libext="$acl_cv_libext" + acl_shlibext="$acl_cv_shlibext" + acl_libname_spec="$acl_cv_libname_spec" + acl_library_names_spec="$acl_cv_library_names_spec" + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + acl_hardcode_direct="$acl_cv_hardcode_direct" + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) +dnl AC_LIB_FROMPACKAGE(name, package) +dnl declares that libname comes from the given package. The configure file +dnl will then not have a --with-libname-prefix option but a +dnl --with-package-prefix option. Several libraries can come from the same +dnl package. This declaration must occur before an AC_LIB_LINKFLAGS or similar +dnl macro call that searches for libname. +AC_DEFUN([AC_LIB_FROMPACKAGE], +[ + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_frompackage_]NAME, [$2]) + popdef([NAME]) + pushdef([PACK],[$2]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + define([acl_libsinpackage_]PACKUP, + m4_ifdef([acl_libsinpackage_]PACKUP, [acl_libsinpackage_]PACKUP[[, ]],)[lib$1]) + popdef([PACKUP]) + popdef([PACK]) +]) + dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem. AC_DEFUN([AC_LIB_LINKFLAGS_BODY], [ AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACK],[m4_ifdef([acl_frompackage_]NAME, [acl_frompackage_]NAME, lib[$1])]) + pushdef([PACKUP],[translit(PACK,[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + pushdef([PACKLIBS],[m4_ifdef([acl_frompackage_]NAME, [acl_libsinpackage_]PACKUP, lib[$1])]) + dnl Autoconf >= 2.61 supports dots in --with options. + pushdef([P_A_C_K],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit(PACK,[.],[_])],PACK)]) dnl By default, look in $includedir and $libdir. use_additional=yes AC_LIB_WITH_FINAL_PREFIX([ eval additional_includedir=\"$includedir\" eval additional_libdir=\"$libdir\" ]) - AC_LIB_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], + AC_ARG_WITH(P_A_C_K[-prefix], +[[ --with-]]P_A_C_K[[-prefix[=DIR] search for ]PACKLIBS[ in DIR/include and DIR/lib + --without-]]P_A_C_K[[-prefix don't search for ]PACKLIBS[ in includedir and libdir]], [ if test "X$withval" = "Xno"; then use_additional=no @@ -150,6 +207,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], else additional_includedir="$withval/include" additional_libdir="$withval/$acl_libdirstem" + if test "$acl_libdirstem2" != "$acl_libdirstem" \ + && ! test -d "$withval/$acl_libdirstem"; then + additional_libdir="$withval/$acl_libdirstem2" + fi fi fi ]) @@ -158,6 +219,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LIB[]NAME= LTLIB[]NAME= INC[]NAME= + LIB[]NAME[]_PREFIX= + dnl HAVE_LIB${NAME} is an indicator that LIB${NAME}, LTLIB${NAME} have been + dnl computed. So it has to be reset here. + HAVE_LIB[]NAME= rpathdirs= ltrpathdirs= names_already_handled= @@ -197,27 +262,53 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], found_la= found_so= found_a= + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name + if test -n "$acl_shlibext"; then + shrext=".$acl_shlibext" # typically: shrext=.so + else + shrext= + fi if test $use_additional = yes; then - if test -n "$shlibext" \ - && { test -f "$additional_libdir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$additional_libdir/lib$name.dll.a"; }; }; then - found_dir="$additional_libdir" - if test -f "$additional_libdir/lib$name.$shlibext"; then - found_so="$additional_libdir/lib$name.$shlibext" + dir="$additional_libdir" + dnl The same code as in the loop below: + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$additional_libdir/lib$name.dll.a" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then + found_dir="$dir" + found_a="$dir/$libname.$acl_libext" fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi fi @@ -227,26 +318,44 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$x" in -L*) dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" \ - && { test -f "$dir/lib$name.$shlibext" \ - || { test "$shlibext" = dll \ - && test -f "$dir/lib$name.dll.a"; }; }; then - found_dir="$dir" - if test -f "$dir/lib$name.$shlibext"; then - found_so="$dir/lib$name.$shlibext" + dnl First look for a shared library. + if test -n "$acl_shlibext"; then + if test -f "$dir/$libname$shrext"; then + found_dir="$dir" + found_so="$dir/$libname$shrext" else - found_so="$dir/lib$name.dll.a" - fi - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then + ver=`(cd "$dir" && \ + for f in "$libname$shrext".*; do echo "$f"; done \ + | sed -e "s,^$libname$shrext\\\\.,," \ + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \ + | sed 1q ) 2>/dev/null` + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then + found_dir="$dir" + found_so="$dir/$libname$shrext.$ver" + fi + else + eval library_names=\"$acl_library_names_spec\" + for f in $library_names; do + if test -f "$dir/$f"; then + found_dir="$dir" + found_so="$dir/$f" + break + fi + done + fi fi - else - if test -f "$dir/lib$name.$libext"; then + fi + dnl Then look for a static library. + if test "X$found_dir" = "X"; then + if test -f "$dir/$libname.$acl_libext"; then found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi + found_a="$dir/$libname.$acl_libext" + fi + fi + if test "X$found_dir" != "X"; then + if test -f "$dir/$libname.la"; then + found_la="$dir/$libname.la" fi fi ;; @@ -263,7 +372,9 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl Linking with a shared library. We attempt to hardcode its dnl directory into the executable's runpath, unless it's the dnl standard /usr/lib. - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then + if test "$enable_rpath" = no \ + || test "X$found_dir" = "X/usr/$acl_libdirstem" \ + || test "X$found_dir" = "X/usr/$acl_libdirstem2"; then dnl No hardcoding is needed. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else @@ -282,12 +393,12 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], ltrpathdirs="$ltrpathdirs $found_dir" fi dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then + if test "$acl_hardcode_direct" = yes; then dnl Using DIR/libNAME.so during linking hardcodes DIR into the dnl resulting binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode DIR into the resulting dnl binary. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" @@ -318,13 +429,13 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], if test -z "$haveit"; then LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" fi - if test "$hardcode_minus_L" != no; then + if test "$acl_hardcode_minus_L" != no; then dnl FIXME: Not sure whether we should use dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" dnl here. LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH dnl here, because this doesn't fit in flags passed to the dnl compiler. So give up. No hardcoding. This affects only dnl very old systems. @@ -351,6 +462,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], case "$found_dir" in */$acl_libdirstem | */$acl_libdirstem/) basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi + additional_includedir="$basedir/include" + ;; + */$acl_libdirstem2 | */$acl_libdirstem2/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem2/"'*$,,'` + if test "$name" = '$1'; then + LIB[]NAME[]_PREFIX="$basedir" + fi additional_includedir="$basedir/include" ;; esac @@ -411,9 +532,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], dnl 3. if it's already present in $LDFLAGS or the already dnl constructed $LIBNAME, dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then + if test "X$additional_libdir" != "X/usr/$acl_libdirstem" \ + && test "X$additional_libdir" != "X/usr/$acl_libdirstem2"; then haveit= - if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem" \ + || test "X$additional_libdir" = "X/usr/local/$acl_libdirstem2"; then if test -n "$GCC"; then case $host_os in linux* | gnu* | k*bsd*-gnu) haveit=yes;; @@ -512,18 +635,18 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], done done if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user must dnl pass all path elements in one option. We can arrange that for a dnl single library, but not when more than one $LIBNAMEs are used. alldirs= for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir" done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl. acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" else @@ -531,7 +654,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], for found_dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" done @@ -544,6 +667,11 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY], LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" done fi + popdef([P_A_C_K]) + popdef([PACKLIBS]) + popdef([PACKUP]) + popdef([PACK]) + popdef([NAME]) ]) dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, @@ -580,7 +708,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], AC_REQUIRE([AC_LIB_PREPARE_MULTILIB]) $1= if test "$enable_rpath" != no; then - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then dnl Use an explicit option to hardcode directories into the resulting dnl binary. rpathdirs= @@ -589,7 +717,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], if test -n "$next"; then dir="$next" dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= @@ -598,7 +727,8 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], -L) next=yes ;; -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'` dnl No need to hardcode the standard /usr/lib. - if test "X$dir" != "X/usr/$acl_libdirstem"; then + if test "X$dir" != "X/usr/$acl_libdirstem" \ + && test "X$dir" != "X/usr/$acl_libdirstem2"; then rpathdirs="$rpathdirs $dir" fi next= ;; @@ -614,16 +744,16 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], done else dnl The linker is used for linking directly. - if test -n "$hardcode_libdir_separator"; then + if test -n "$acl_hardcode_libdir_separator"; then dnl Weird platform: only the last -rpath option counts, the user dnl must pass all path elements in one option. alldirs= for dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$dir" + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir" done acl_save_libdir="$libdir" libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="$flag" else @@ -631,7 +761,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS], for dir in $rpathdirs; do acl_save_libdir="$libdir" libdir="$dir" - eval flag=\"$hardcode_libdir_flag_spec\" + eval flag=\"$acl_hardcode_libdir_flag_spec\" libdir="$acl_save_libdir" $1="${$1}${$1:+ }$flag" done diff --git a/Build/source/extra/xz/m4/lib-prefix.m4 b/Build/source/extra/xz/m4/lib-prefix.m4 index a8684e17e3a..1601ceaefd3 100644 --- a/Build/source/extra/xz/m4/lib-prefix.m4 +++ b/Build/source/extra/xz/m4/lib-prefix.m4 @@ -1,5 +1,5 @@ -# lib-prefix.m4 serial 5 (gettext-0.15) -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc. +# lib-prefix.m4 serial 7 (gettext-0.18) +dnl Copyright (C) 2001-2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -153,33 +153,72 @@ AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], prefix="$acl_save_prefix" ]) -dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing -dnl the basename of the libdir, either "lib" or "lib64". +dnl AC_LIB_PREPARE_MULTILIB creates +dnl - a variable acl_libdirstem, containing the basename of the libdir, either +dnl "lib" or "lib64" or "lib/64", +dnl - a variable acl_libdirstem2, as a secondary possible value for +dnl acl_libdirstem, either the same as acl_libdirstem or "lib/sparcv9" or +dnl "lib/amd64". AC_DEFUN([AC_LIB_PREPARE_MULTILIB], [ - dnl There is no formal standard regarding lib and lib64. The current - dnl practice is that on a system supporting 32-bit and 64-bit instruction - dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit - dnl libraries go under $prefix/lib. We determine the compiler's default - dnl mode by looking at the compiler's library search path. If at least - dnl of its elements ends in /lib64 or points to a directory whose absolute - dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the - dnl default, namely "lib". + dnl There is no formal standard regarding lib and lib64. + dnl On glibc systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib64 and 32-bit libraries go under $prefix/lib. We determine + dnl the compiler's default mode by looking at the compiler's library search + dnl path. If at least one of its elements ends in /lib64 or points to a + dnl directory whose absolute pathname ends in /lib64, we assume a 64-bit ABI. + dnl Otherwise we use the default, namely "lib". + dnl On Solaris systems, the current practice is that on a system supporting + dnl 32-bit and 64-bit instruction sets or ABIs, 64-bit libraries go under + dnl $prefix/lib/64 (which is a symlink to either $prefix/lib/sparcv9 or + dnl $prefix/lib/amd64) and 32-bit libraries go under $prefix/lib. + AC_REQUIRE([AC_CANONICAL_HOST]) acl_libdirstem=lib - searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` - if test -n "$searchpath"; then - acl_save_IFS="${IFS= }"; IFS=":" - for searchdir in $searchpath; do - if test -d "$searchdir"; then - case "$searchdir" in - */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; - *) searchdir=`cd "$searchdir" && pwd` - case "$searchdir" in - */lib64 ) acl_libdirstem=lib64 ;; - esac ;; + acl_libdirstem2= + case "$host_os" in + solaris*) + dnl See Solaris 10 Software Developer Collection > Solaris 64-bit Developer's Guide > The Development Environment + dnl <http://docs.sun.com/app/docs/doc/816-5138/dev-env?l=en&a=view>. + dnl "Portable Makefiles should refer to any library directories using the 64 symbolic link." + dnl But we want to recognize the sparcv9 or amd64 subdirectory also if the + dnl symlink is missing, so we set acl_libdirstem2 too. + AC_CACHE_CHECK([for 64-bit host], [gl_cv_solaris_64bit], + [AC_EGREP_CPP([sixtyfour bits], [ +#ifdef _LP64 +sixtyfour bits +#endif + ], [gl_cv_solaris_64bit=yes], [gl_cv_solaris_64bit=no]) + ]) + if test $gl_cv_solaris_64bit = yes; then + acl_libdirstem=lib/64 + case "$host_cpu" in + sparc*) acl_libdirstem2=lib/sparcv9 ;; + i*86 | x86_64) acl_libdirstem2=lib/amd64 ;; esac fi - done - IFS="$acl_save_IFS" - fi + ;; + *) + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'` + if test -n "$searchpath"; then + acl_save_IFS="${IFS= }"; IFS=":" + for searchdir in $searchpath; do + if test -d "$searchdir"; then + case "$searchdir" in + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;; + */../ | */.. ) + # Better ignore directories of this form. They are misleading. + ;; + *) searchdir=`cd "$searchdir" && pwd` + case "$searchdir" in + */lib64 ) acl_libdirstem=lib64 ;; + esac ;; + esac + fi + done + IFS="$acl_save_IFS" + fi + ;; + esac + test -n "$acl_libdirstem2" || acl_libdirstem2="$acl_libdirstem" ]) diff --git a/Build/source/extra/xz/m4/libtool.m4 b/Build/source/extra/xz/m4/libtool.m4 index d8125842f0a..44e0ecff11e 100644 --- a/Build/source/extra/xz/m4/libtool.m4 +++ b/Build/source/extra/xz/m4/libtool.m4 @@ -1,8 +1,8 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -11,8 +11,8 @@ m4_define([_LT_COPYING], [dnl # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008, 2009, 2010 Free Software Foundation, -# Inc. +# 2006, 2007, 2008, 2009, 2010, 2011 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is part of GNU Libtool. @@ -146,6 +146,8 @@ AC_REQUIRE([AC_CANONICAL_BUILD])dnl AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl +_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl +dnl _LT_DECL([], [host_alias], [0], [The host system])dnl _LT_DECL([], [host], [0])dnl _LT_DECL([], [host_os], [0])dnl @@ -637,7 +639,7 @@ m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) configured by $[0], generated by m4_PACKAGE_STRING. -Copyright (C) 2010 Free Software Foundation, Inc. +Copyright (C) 2011 Free Software Foundation, Inc. This config.lt script is free software; the Free Software Foundation gives unlimited permision to copy, distribute and modify it." @@ -801,6 +803,7 @@ AC_DEFUN([LT_LANG], m4_case([$1], [C], [_LT_LANG(C)], [C++], [_LT_LANG(CXX)], + [Go], [_LT_LANG(GO)], [Java], [_LT_LANG(GCJ)], [Fortran 77], [_LT_LANG(F77)], [Fortran], [_LT_LANG(FC)], @@ -822,6 +825,31 @@ m4_defun([_LT_LANG], ])# _LT_LANG +m4_ifndef([AC_PROG_GO], [ +############################################################ +# NOTE: This macro has been submitted for inclusion into # +# GNU Autoconf as AC_PROG_GO. When it is available in # +# a released version of Autoconf we should remove this # +# macro and use it instead. # +############################################################ +m4_defun([AC_PROG_GO], +[AC_LANG_PUSH(Go)dnl +AC_ARG_VAR([GOC], [Go compiler command])dnl +AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl +_AC_ARG_VAR_LDFLAGS()dnl +AC_CHECK_TOOL(GOC, gccgo) +if test -z "$GOC"; then + if test -n "$ac_tool_prefix"; then + AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo]) + fi +fi +if test -z "$GOC"; then + AC_CHECK_PROG(GOC, gccgo, gccgo, false) +fi +])#m4_defun +])#m4_ifndef + + # _LT_LANG_DEFAULT_CONFIG # ----------------------- m4_defun([_LT_LANG_DEFAULT_CONFIG], @@ -852,6 +880,10 @@ AC_PROVIDE_IFELSE([AC_PROG_GCJ], m4_ifdef([LT_PROG_GCJ], [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) +AC_PROVIDE_IFELSE([AC_PROG_GO], + [LT_LANG(GO)], + [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])]) + AC_PROVIDE_IFELSE([LT_PROG_RC], [LT_LANG(RC)], [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) @@ -954,7 +986,13 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err _lt_result=$? - if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then + # If there is a non-empty error log, and "single_module" + # appears in it, assume the flag caused a linker warning + if test -s conftest.err && $GREP single_module conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + # Otherwise, if the output was created with a 0 exit code from + # the compiler, it worked. + elif test -f libconftest.dylib && test $_lt_result -eq 0; then lt_cv_apple_cc_single_mod=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -962,6 +1000,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ rm -rf libconftest.dylib* rm -f conftest.* fi]) + AC_CACHE_CHECK([for -exported_symbols_list linker flag], [lt_cv_ld_exported_symbols_list], [lt_cv_ld_exported_symbols_list=no @@ -973,6 +1012,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ [lt_cv_ld_exported_symbols_list=no]) LDFLAGS="$save_LDFLAGS" ]) + AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load], [lt_cv_ld_force_load=no cat > conftest.c << _LT_EOF @@ -990,7 +1030,9 @@ _LT_EOF echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err _lt_result=$? - if test -f conftest && test ! -s conftest.err && test $_lt_result = 0 && $GREP forced_load conftest 2>&1 >/dev/null; then + if test -s conftest.err && $GREP force_load conftest.err; then + cat conftest.err >&AS_MESSAGE_LOG_FD + elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then lt_cv_ld_force_load=yes else cat conftest.err >&AS_MESSAGE_LOG_FD @@ -1035,8 +1077,8 @@ _LT_EOF ]) -# _LT_DARWIN_LINKER_FEATURES -# -------------------------- +# _LT_DARWIN_LINKER_FEATURES([TAG]) +# --------------------------------- # Checks for linker and compiler features on darwin m4_defun([_LT_DARWIN_LINKER_FEATURES], [ @@ -1047,6 +1089,8 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES], _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported if test "$lt_cv_ld_force_load" = "yes"; then _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`' + m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes], + [FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes]) else _LT_TAGVAR(whole_archive_flag_spec, $1)='' fi @@ -1330,14 +1374,27 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*) CFLAGS="$SAVE_CFLAGS" fi ;; -sparc*-*solaris*) +*-*solaris*) # Find out which ABI we are using. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then case `/usr/bin/file conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in - yes*) LD="${LD-ld} -m elf64_sparc" ;; + yes*) + case $host in + i?86-*-solaris*) + LD="${LD-ld} -m elf_x86_64" + ;; + sparc*-*-solaris*) + LD="${LD-ld} -m elf64_sparc" + ;; + esac + # GNU ld 2.21 introduced _sol2 emulations. Use them if available. + if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then + LD="${LD-ld}_sol2" + fi + ;; *) if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then LD="${LD-ld} -64" @@ -1414,13 +1471,13 @@ old_postuninstall_cmds= if test -n "$RANLIB"; then case $host_os in openbsd*) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib" ;; *) - old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" + old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib" ;; esac - old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" + old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib" fi case $host_os in @@ -1600,6 +1657,11 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl lt_cv_sys_max_cmd_len=196608 ;; + os2*) + # The test takes a long time on OS/2. + lt_cv_sys_max_cmd_len=8192 + ;; + osf*) # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not @@ -1639,7 +1701,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. - while { test "X"`func_fallback_echo "$teststring$teststring" 2>/dev/null` \ + while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \ = "X$teststring$teststring"; } >/dev/null 2>&1 && test $i != 17 # 1/2 MB should be enough do @@ -2185,7 +2247,7 @@ need_version=unknown case $host_os in aix3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' shlibpath_var=LIBPATH @@ -2194,7 +2256,7 @@ aix3*) ;; aix[[4-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no hardcode_into_libs=yes @@ -2259,7 +2321,7 @@ beos*) ;; bsdi[[45]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' @@ -2398,7 +2460,7 @@ m4_if([$1], [],[ ;; dgux*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' @@ -2406,10 +2468,6 @@ dgux*) shlibpath_var=LD_LIBRARY_PATH ;; -freebsd1*) - dynamic_linker=no - ;; - freebsd* | dragonfly*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. @@ -2417,7 +2475,7 @@ freebsd* | dragonfly*) objformat=`/usr/bin/objformat` else case $host_os in - freebsd[[123]]*) objformat=aout ;; + freebsd[[23]].*) objformat=aout ;; *) objformat=elf ;; esac fi @@ -2435,7 +2493,7 @@ freebsd* | dragonfly*) esac shlibpath_var=LD_LIBRARY_PATH case $host_os in - freebsd2*) + freebsd2.*) shlibpath_overrides_runpath=yes ;; freebsd3.[[01]]* | freebsdelf3.[[01]]*) @@ -2455,17 +2513,18 @@ freebsd* | dragonfly*) ;; gnu*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH + shlibpath_overrides_runpath=no hardcode_into_libs=yes ;; haiku*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no dynamic_linker="$host_os runtime_loader" @@ -2526,7 +2585,7 @@ hpux9* | hpux10* | hpux11*) ;; interix[[3-9]]*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' @@ -2542,7 +2601,7 @@ irix5* | irix6* | nonstopux*) nonstopux*) version_type=nonstopux ;; *) if test "$lt_cv_prog_gnu_ld" = yes; then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor else version_type=irix fi ;; @@ -2579,9 +2638,9 @@ linux*oldld* | linux*aout* | linux*coff*) dynamic_linker=no ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2644,7 +2703,7 @@ netbsd*) ;; newsos6) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' shlibpath_var=LD_LIBRARY_PATH shlibpath_overrides_runpath=yes @@ -2713,7 +2772,7 @@ rdos*) ;; solaris*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2738,7 +2797,7 @@ sunos4*) ;; sysv4 | sysv4.3*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -2762,7 +2821,7 @@ sysv4 | sysv4.3*) sysv4*MP*) if test -d /usr/nec ;then - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' soname_spec='$libname${shared_ext}.$major' shlibpath_var=LD_LIBRARY_PATH @@ -2793,7 +2852,7 @@ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) tpf*) # TPF is a cross-target only. Preferred cross-host = GNU/Linux. - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor need_lib_prefix=no need_version=no library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' @@ -2803,7 +2862,7 @@ tpf*) ;; uts4*) - version_type=linux + version_type=linux # correct to gnu/linux during the next big refactor library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LD_LIBRARY_PATH @@ -3225,7 +3284,7 @@ irix5* | irix6* | nonstopux*) lt_cv_deplibs_check_method=pass_all ;; -# This must be Linux ELF. +# This must be glibc/ELF. linux* | k*bsd*-gnu | kopensolaris*-gnu) lt_cv_deplibs_check_method=pass_all ;; @@ -3645,6 +3704,7 @@ for ac_symprfx in "" "_"; do # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ +" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\ " /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ " \$ 0!~/External *\|/{next};"\ " / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ @@ -4229,7 +4289,9 @@ m4_if([$1], [CXX], [ case $cc_basename in nvcc*) # Cuda Compiler Driver 2.2 _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker ' - _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Xcompiler -fPIC' + if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then + _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)" + fi ;; esac else @@ -4321,18 +4383,33 @@ m4_if([$1], [CXX], [ ;; *) case `$CC -V 2>&1 | sed 5q` in - *Sun\ F* | *Sun*Fortran*) + *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ;; + *Sun\ F* | *Sun*Fortran*) + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' + ;; *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ;; + *Intel*\ [[CF]]*Compiler*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' + ;; + *Portland\ Group*) + _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' + _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' + _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' + ;; esac ;; esac @@ -4492,7 +4569,9 @@ m4_if([$1], [CXX], [ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) ;; + cl*) + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' + ;; *) _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'] @@ -4517,7 +4596,6 @@ m4_if([$1], [CXX], [ _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -4768,8 +4846,7 @@ _LT_EOF xlf* | bgf* | bgxlf* | mpixlf*) # IBM XL Fortran 10.1 on PPC cannot create shared libs itself _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' - _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' + _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test "x$supports_anon_versioning" = xyes; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ @@ -5064,6 +5141,7 @@ _LT_EOF # The linker will not automatically build a static lib if we build a DLL. # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' # Don't use ranlib _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib' @@ -5110,10 +5188,6 @@ _LT_EOF _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ;; - freebsd1*) - _LT_TAGVAR(ld_shlibs, $1)=no - ;; - # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor # support. Future versions do this automatically, but an explicit c++rt0.o # does not break anything, and helps significantly (at the cost of a little @@ -5126,7 +5200,7 @@ _LT_EOF ;; # Unfortunately, older versions of FreeBSD 2 do not have this feature. - freebsd2*) + freebsd2.*) _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_minus_L, $1)=yes @@ -5165,7 +5239,6 @@ _LT_EOF fi if test "$with_gnu_ld" = no; then _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' - _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' _LT_TAGVAR(hardcode_libdir_separator, $1)=: _LT_TAGVAR(hardcode_direct, $1)=yes _LT_TAGVAR(hardcode_direct_absolute, $1)=yes @@ -5607,9 +5680,6 @@ _LT_TAGDECL([], [no_undefined_flag], [1], _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], [Flag to hardcode $libdir into a binary during linking. This must work even if $libdir does not exist]) -_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], - [[If ld is used when linking, flag to hardcode $libdir into a binary - during linking. This must work even if $libdir does not exist]]) _LT_TAGDECL([], [hardcode_libdir_separator], [1], [Whether we need a single "-rpath" flag with a separated argument]) _LT_TAGDECL([], [hardcode_direct], [0], @@ -5767,7 +5837,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported @@ -6137,7 +6206,7 @@ if test "$_lt_caught_CXX_error" != yes; then esac ;; - freebsd[[12]]*) + freebsd2.*) # C++ shared libraries reported to be fairly broken before # switch to ELF _LT_TAGVAR(ld_shlibs, $1)=no @@ -6898,12 +6967,18 @@ public class foo { } }; _LT_EOF +], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF +package foo +func foo() { +} +_LT_EOF ]) _lt_libdeps_save_CFLAGS=$CFLAGS case "$CC $CFLAGS " in #( *\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;; *\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;; +*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;; esac dnl Parse the compiler output and extract the necessary @@ -7100,7 +7175,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7233,7 +7307,6 @@ _LT_TAGVAR(export_dynamic_flag_spec, $1)= _LT_TAGVAR(hardcode_direct, $1)=no _LT_TAGVAR(hardcode_direct_absolute, $1)=no _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= _LT_TAGVAR(hardcode_libdir_separator, $1)= _LT_TAGVAR(hardcode_minus_L, $1)=no _LT_TAGVAR(hardcode_automatic, $1)=no @@ -7420,6 +7493,77 @@ CFLAGS=$lt_save_CFLAGS ])# _LT_LANG_GCJ_CONFIG +# _LT_LANG_GO_CONFIG([TAG]) +# -------------------------- +# Ensure that the configuration variables for the GNU Go compiler +# are suitably defined. These variables are subsequently used by _LT_CONFIG +# to write the compiler configuration to `libtool'. +m4_defun([_LT_LANG_GO_CONFIG], +[AC_REQUIRE([LT_PROG_GO])dnl +AC_LANG_SAVE + +# Source file extension for Go test sources. +ac_ext=go + +# Object file extension for compiled Go test sources. +objext=o +_LT_TAGVAR(objext, $1)=$objext + +# Code to be used in simple compile tests +lt_simple_compile_test_code="package main; func main() { }" + +# Code to be used in simple link tests +lt_simple_link_test_code='package main; func main() { }' + +# ltmain only uses $CC for tagged configurations so make sure $CC is set. +_LT_TAG_COMPILER + +# save warnings/boilerplate of simple test code +_LT_COMPILER_BOILERPLATE +_LT_LINKER_BOILERPLATE + +# Allow CC to be a program name with arguments. +lt_save_CC=$CC +lt_save_CFLAGS=$CFLAGS +lt_save_GCC=$GCC +GCC=yes +CC=${GOC-"gccgo"} +CFLAGS=$GOFLAGS +compiler=$CC +_LT_TAGVAR(compiler, $1)=$CC +_LT_TAGVAR(LD, $1)="$LD" +_LT_CC_BASENAME([$compiler]) + +# Go did not exist at the time GCC didn't implicitly link libc in. +_LT_TAGVAR(archive_cmds_need_lc, $1)=no + +_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds +_LT_TAGVAR(reload_flag, $1)=$reload_flag +_LT_TAGVAR(reload_cmds, $1)=$reload_cmds + +## CAVEAT EMPTOR: +## There is no encapsulation within the following macros, do not change +## the running order or otherwise move them around unless you know exactly +## what you are doing... +if test -n "$compiler"; then + _LT_COMPILER_NO_RTTI($1) + _LT_COMPILER_PIC($1) + _LT_COMPILER_C_O($1) + _LT_COMPILER_FILE_LOCKS($1) + _LT_LINKER_SHLIBS($1) + _LT_LINKER_HARDCODE_LIBPATH($1) + + _LT_CONFIG($1) +fi + +AC_LANG_RESTORE + +GCC=$lt_save_GCC +CC=$lt_save_CC +CFLAGS=$lt_save_CFLAGS +])# _LT_LANG_GO_CONFIG + + # _LT_LANG_RC_CONFIG([TAG]) # ------------------------- # Ensure that the configuration variables for the Windows resource compiler @@ -7489,6 +7633,13 @@ dnl aclocal-1.4 backwards compatibility: dnl AC_DEFUN([LT_AC_PROG_GCJ], []) +# LT_PROG_GO +# ---------- +AC_DEFUN([LT_PROG_GO], +[AC_CHECK_TOOL(GOC, gccgo,) +]) + + # LT_PROG_RC # ---------- AC_DEFUN([LT_PROG_RC], diff --git a/Build/source/extra/xz/m4/ltoptions.m4 b/Build/source/extra/xz/m4/ltoptions.m4 index 17cfd51c0b3..5d9acd8e23b 100644 --- a/Build/source/extra/xz/m4/ltoptions.m4 +++ b/Build/source/extra/xz/m4/ltoptions.m4 @@ -326,9 +326,24 @@ dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) diff --git a/Build/source/extra/xz/m4/ltversion.m4 b/Build/source/extra/xz/m4/ltversion.m4 index 9c7b5d41185..07a8602d48d 100644 --- a/Build/source/extra/xz/m4/ltversion.m4 +++ b/Build/source/extra/xz/m4/ltversion.m4 @@ -9,15 +9,15 @@ # @configure_input@ -# serial 3293 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4]) -m4_define([LT_PACKAGE_REVISION], [1.3293]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4' -macro_revision='1.3293' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff --git a/Build/source/extra/xz/m4/nls.m4 b/Build/source/extra/xz/m4/nls.m4 index 7967cc2f9ac..003704c4b93 100644 --- a/Build/source/extra/xz/m4/nls.m4 +++ b/Build/source/extra/xz/m4/nls.m4 @@ -1,5 +1,6 @@ -# nls.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2010 Free Software Foundation, +dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,15 +18,15 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) + AC_MSG_RESULT([$USE_NLS]) + AC_SUBST([USE_NLS]) ]) diff --git a/Build/source/extra/xz/m4/po.m4 b/Build/source/extra/xz/m4/po.m4 index 00133ef36f8..47f36a41a07 100644 --- a/Build/source/extra/xz/m4/po.m4 +++ b/Build/source/extra/xz/m4/po.m4 @@ -1,5 +1,5 @@ -# po.m4 serial 13 (gettext-0.15) -dnl Copyright (C) 1995-2006 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -17,7 +17,7 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], @@ -27,6 +27,10 @@ AC_DEFUN([AM_PO_SUBDIRS], AC_REQUIRE([AM_PROG_MKDIR_P])dnl defined by automake AC_REQUIRE([AM_NLS])dnl + dnl Release version of the gettext macros. This is used to ensure that + dnl the gettext macros and po/Makefile.in.in are in sync. + AC_SUBST([GETTEXT_MACRO_VERSION], [0.18]) + dnl Perform the following tests also if --disable-nls has been given, dnl because they are needed for "make dist" to work. @@ -37,7 +41,7 @@ AC_DEFUN([AM_PO_SUBDIRS], [$ac_dir/$ac_word --statistics /dev/null >&]AS_MESSAGE_LOG_FD[ 2>&1 && (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AC_PATH_PROG([GMSGFMT], [gmsgfmt], [$MSGFMT]) dnl Test whether it is GNU msgfmt >= 0.15. changequote(,)dnl @@ -84,6 +88,10 @@ changequote([,])dnl test -n "$localedir" || localedir='${datadir}/locale' AC_SUBST([localedir]) + dnl Support for AM_XGETTEXT_OPTION. + test -n "${XGETTEXT_EXTRA_OPTIONS+set}" || XGETTEXT_EXTRA_OPTIONS= + AC_SUBST([XGETTEXT_EXTRA_OPTIONS]) + AC_CONFIG_COMMANDS([po-directories], [[ for ac_file in $CONFIG_FILES; do # Support "outfile[:infile[:infile...]]" @@ -426,3 +434,16 @@ EOF fi mv "$ac_file.tmp" "$ac_file" ]) + +dnl Initializes the accumulator used by AM_XGETTEXT_OPTION. +AC_DEFUN([AM_XGETTEXT_OPTION_INIT], +[ + XGETTEXT_EXTRA_OPTIONS= +]) + +dnl Registers an option to be passed to xgettext in the po subdirectory. +AC_DEFUN([AM_XGETTEXT_OPTION], +[ + AC_REQUIRE([AM_XGETTEXT_OPTION_INIT]) + XGETTEXT_EXTRA_OPTIONS="$XGETTEXT_EXTRA_OPTIONS $1" +]) diff --git a/Build/source/extra/xz/m4/progtest.m4 b/Build/source/extra/xz/m4/progtest.m4 index a56365cd37f..2d804ac99d7 100644 --- a/Build/source/extra/xz/m4/progtest.m4 +++ b/Build/source/extra/xz/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 4 (gettext-0.14.2) -dnl Copyright (C) 1996-2003, 2005 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,7 +16,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -55,7 +55,7 @@ rm -f conf$$.file # Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) -AC_CACHE_VAL(ac_cv_path_$1, +AC_CACHE_VAL([ac_cv_path_$1], [case "[$]$1" in [[\\/]]* | ?:[[\\/]]*) ac_cv_path_$1="[$]$1" # Let the user override the test with a path. @@ -84,9 +84,9 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" esac])dnl $1="$ac_cv_path_$1" if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then - AC_MSG_RESULT([$]$1) + AC_MSG_RESULT([$][$1]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff --git a/Build/source/extra/xz/m4/visibility.m4 b/Build/source/extra/xz/m4/visibility.m4 index 2ff6330aa42..077c4765ec2 100644 --- a/Build/source/extra/xz/m4/visibility.m4 +++ b/Build/source/extra/xz/m4/visibility.m4 @@ -1,5 +1,5 @@ -# visibility.m4 serial 1 (gettext-0.15) -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# visibility.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2005, 2008-2010 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -26,18 +26,40 @@ AC_DEFUN([gl_VISIBILITY], CFLAG_VISIBILITY= HAVE_VISIBILITY=0 if test -n "$GCC"; then + dnl First, check whether -Werror can be added to the command line, or + dnl whether it leads to an error because of some other option that the + dnl user has put into $CC $CFLAGS $CPPFLAGS. + AC_MSG_CHECKING([whether the -Werror option is usable]) + AC_CACHE_VAL([gl_cv_cc_vis_werror], [ + gl_save_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -Werror" + AC_TRY_COMPILE([], [], + [gl_cv_cc_vis_werror=yes], + [gl_cv_cc_vis_werror=no]) + CFLAGS="$gl_save_CFLAGS"]) + AC_MSG_RESULT([$gl_cv_cc_vis_werror]) + dnl Now check whether visibility declarations are supported. AC_MSG_CHECKING([for simple visibility declarations]) - AC_CACHE_VAL(gl_cv_cc_visibility, [ + AC_CACHE_VAL([gl_cv_cc_visibility], [ gl_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS -fvisibility=hidden" + dnl We use the option -Werror and a function dummyfunc, because on some + dnl platforms (Cygwin 1.7) the use of -fvisibility triggers a warning + dnl "visibility attribute not supported in this configuration; ignored" + dnl at the first function definition in every compilation unit, and we + dnl don't want to use the option in this case. + if test $gl_cv_cc_vis_werror = yes; then + CFLAGS="$CFLAGS -Werror" + fi AC_TRY_COMPILE( [extern __attribute__((__visibility__("hidden"))) int hiddenvar; extern __attribute__((__visibility__("default"))) int exportedvar; extern __attribute__((__visibility__("hidden"))) int hiddenfunc (void); - extern __attribute__((__visibility__("default"))) int exportedfunc (void);], + extern __attribute__((__visibility__("default"))) int exportedfunc (void); + void dummyfunc (void) {}], [], - gl_cv_cc_visibility=yes, - gl_cv_cc_visibility=no) + [gl_cv_cc_visibility=yes], + [gl_cv_cc_visibility=no]) CFLAGS="$gl_save_CFLAGS"]) AC_MSG_RESULT([$gl_cv_cc_visibility]) if test $gl_cv_cc_visibility = yes; then diff --git a/Build/source/extra/xz/macosx/build.sh b/Build/source/extra/xz/macosx/build.sh new file mode 100755 index 00000000000..d48ee61bd16 --- /dev/null +++ b/Build/source/extra/xz/macosx/build.sh @@ -0,0 +1,92 @@ +#!/bin/sh + +############################################################################### +# Author: Anders F Björklund <afb@users.sourceforge.net> +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +############################################################################### + +mkdir -p Root +mkdir -p Resources + +# Abort immediately if something goes wrong. +set -e + +# Clean up if it was already configured. +[ -f Makefile ] && make distclean + +# Build the regular fat program + +CC="gcc-4.0" \ +CFLAGS="-O2 -g -arch ppc -arch ppc64 -arch i386 -arch x86_64 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ +../configure --disable-dependency-tracking --disable-xzdec --disable-lzmadec i686-apple-darwin8 + +make + +make check + +make DESTDIR=`pwd`/Root install + +make distclean + +# Build the size-optimized program + +CC="gcc-4.0" \ +CFLAGS="-Os -g -arch ppc -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk -mmacosx-version-min=10.4" \ +../configure --disable-dependency-tracking --disable-shared --disable-nls --disable-encoders --enable-small --disable-threads i686-apple-darwin8 + +make -C src/liblzma +make -C src/xzdec +make -C src/xzdec DESTDIR=`pwd`/Root install + +cp -a ../extra Root/usr/local/share/doc/xz + +make distclean + +# Strip debugging symbols and make relocatable + +for bin in xz lzmainfo xzdec lzmadec; do + strip -S Root/usr/local/bin/$bin + install_name_tool -change /usr/local/lib/liblzma.5.dylib @executable_path/../lib/liblzma.5.dylib Root/usr/local/bin/$bin +done + +for lib in liblzma.5.dylib; do + strip -S Root/usr/local/lib/$lib + install_name_tool -id @executable_path/../lib/liblzma.5.dylib Root/usr/local/lib/$lib +done + +strip -S Root/usr/local/lib/liblzma.a +rm -f Root/usr/local/lib/liblzma.la + +# Include pkg-config while making relocatable + +sed -e 's|prefix=/usr/local|prefix=${pcfiledir}/../..|' < Root/usr/local/lib/pkgconfig/liblzma.pc > Root/liblzma.pc +mv Root/liblzma.pc Root/usr/local/lib/pkgconfig/liblzma.pc + +# Create tarball, but without the HFS+ attrib + +rmdir debug lib po src/liblzma/api src/liblzma src/lzmainfo src/scripts src/xz src/xzdec src tests + +( cd Root/usr/local; COPY_EXTENDED_ATTRIBUTES_DISABLE=true COPYFILE_DISABLE=true tar cvjf ../../../XZ.tbz * ) + +# Include documentation files for package + +cp -p ../README Resources/ReadMe.txt +cp -p ../COPYING Resources/License.txt + +# Make an Installer.app package + +ID="org.tukaani.xz" +VERSION=`cd ..; sh build-aux/version.sh` +PACKAGEMAKER=/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker +$PACKAGEMAKER -r Root/usr/local -l /usr/local -e Resources -i $ID -n $VERSION -t XZ -o XZ.pkg -g 10.4 --verbose + +# Put the package in a disk image + +hdiutil create -fs HFS+ -format UDZO -quiet -srcfolder XZ.pkg -ov XZ.dmg +hdiutil internet-enable -yes -quiet XZ.dmg + +echo +echo "Build completed successfully." +echo diff --git a/Build/source/extra/xz/po/Makefile.in.in b/Build/source/extra/xz/po/Makefile.in.in index 5022b8b187f..83d8838ac01 100644 --- a/Build/source/extra/xz/po/Makefile.in.in +++ b/Build/source/extra/xz/po/Makefile.in.in @@ -1,5 +1,5 @@ # Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2006 by Ulrich Drepper <drepper@gnu.ai.mit.edu> +# Copyright (C) 1995-1997, 2000-2007, 2009-2010 by Ulrich Drepper <drepper@gnu.ai.mit.edu> # # This file can be copied and used freely without restrictions. It can # be used in projects which are not available under the GNU General Public @@ -8,7 +8,8 @@ # Please note that the actual code of GNU gettext is covered by the GNU # General Public License and is *not* in the public domain. # -# Origin: gettext-0.16 +# Origin: gettext-0.18 +GETTEXT_MACRO_VERSION = 0.18 PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -87,19 +88,26 @@ CATALOGS = @CATALOGS@ .po.gmo: @lang=`echo $* | sed -e 's,.*/,,'`; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ - cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics --verbose -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo .sin.sed: sed -e '/^#/d' $< > t-$@ mv t-$@ $@ -all: all-@USE_NLS@ +all: check-macro-version all-@USE_NLS@ all-yes: stamp-po all-no: +# Ensure that the gettext macros and this Makefile.in.in are in sync. +check-macro-version: + @test "$(GETTEXT_MACRO_VERSION)" = "@GETTEXT_MACRO_VERSION@" \ + || { echo "*** error: gettext infrastructure mismatch: using a Makefile.in.in from gettext version $(GETTEXT_MACRO_VERSION) but the autoconf macros are from gettext version @GETTEXT_MACRO_VERSION@" 1>&2; \ + exit 1; \ + } + # $(srcdir)/$(DOMAIN).pot is only created when needed. When xgettext finds no # internationalized messages, no $(srcdir)/$(DOMAIN).pot is created (because # we don't want to bother translators with empty POT files). We assume that @@ -130,16 +138,34 @@ stamp-po: $(srcdir)/$(DOMAIN).pot # This target rebuilds $(DOMAIN).pot; it is an expensive operation. # Note that $(DOMAIN).pot is not touched if it doesn't need to be changed. $(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed + if LC_ALL=C grep 'GNU @PACKAGE@' $(top_srcdir)/* 2>/dev/null | grep -v 'libtool:' >/dev/null; then \ + package_gnu='GNU '; \ + else \ + package_gnu=''; \ + fi; \ if test -n '$(MSGID_BUGS_ADDRESS)' || test '$(PACKAGE_BUGREPORT)' = '@'PACKAGE_BUGREPORT'@'; then \ msgid_bugs_address='$(MSGID_BUGS_ADDRESS)'; \ else \ msgid_bugs_address='$(PACKAGE_BUGREPORT)'; \ fi; \ - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ - --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' \ - --msgid-bugs-address="$$msgid_bugs_address" + case `$(XGETTEXT) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-5] | 0.1[0-5].* | 0.16 | 0.16.[0-1]*) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + *) \ + $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ + --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) @XGETTEXT_EXTRA_OPTIONS@ \ + --files-from=$(srcdir)/POTFILES.in \ + --copyright-holder='$(COPYRIGHT_HOLDER)' \ + --package-name="$${package_gnu}@PACKAGE@" \ + --package-version='@VERSION@' \ + --msgid-bugs-address="$$msgid_bugs_address" \ + ;; \ + esac test ! -f $(DOMAIN).po || { \ if test -f $(srcdir)/$(DOMAIN).pot; then \ sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ @@ -167,8 +193,15 @@ $(POFILES): $(srcdir)/$(DOMAIN).pot @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ if test -f "$(srcdir)/$${lang}.po"; then \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot; \ + echo "$${cdcmd}$(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot"; \ + cd $(srcdir) \ + && { case `$(MSGMERGE_UPDATE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) $${lang}.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE_UPDATE) $(MSGMERGE_OPTIONS) --lang=$${lang} $${lang}.po $(DOMAIN).pot;; \ + esac; \ + }; \ else \ $(MAKE) $${lang}.po-create; \ fi @@ -191,7 +224,6 @@ install-data: install-data-@USE_NLS@ fi install-data-no: all install-data-yes: all - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -243,7 +275,6 @@ installdirs-data: installdirs-data-@USE_NLS@ fi installdirs-data-no: installdirs-data-yes: - $(mkdir_p) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ @@ -369,9 +400,15 @@ update-po: Makefile tmpdir=`pwd`; \ echo "$$lang:"; \ test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ + echo "$${cdcmd}$(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ + if { case `$(MSGMERGE) --version | sed 1q | sed -e 's,^[^0-9]*,,'` in \ + '' | 0.[0-9] | 0.[0-9].* | 0.1[0-7] | 0.1[0-7].*) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + *) \ + $(MSGMERGE) $(MSGMERGE_OPTIONS) --lang=$$lang -o $$tmpdir/$$lang.new.po $$lang.po $(DOMAIN).pot;; \ + esac; \ + }; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ @@ -392,9 +429,13 @@ $(DUMMYPOFILES): update-gmo: Makefile $(GMOFILES) @: +# Recreate Makefile by invoking config.status. Explicitly invoke the shell, +# because execution permission bits may not work on the current file system. +# Use @SHELL@, which is the shell determined by autoconf for the use by its +# scripts, not $(SHELL) which is hardwired to /bin/sh and may be deficient. Makefile: Makefile.in.in Makevars $(top_builddir)/config.status @POMAKEFILEDEPS@ cd $(top_builddir) \ - && $(SHELL) ./config.status $(subdir)/$@.in po-directories + && @SHELL@ ./config.status $(subdir)/$@.in po-directories force: diff --git a/Build/source/extra/xz/po/Rules-quot b/Build/source/extra/xz/po/Rules-quot index 9c2a995e300..af5248792a7 100644 --- a/Build/source/extra/xz/po/Rules-quot +++ b/Build/source/extra/xz/po/Rules-quot @@ -20,7 +20,7 @@ en@boldquot.po-update: en@boldquot.po-update-en ll=`echo $$lang | sed -e 's/@.*//'`; \ LC_ALL=C; export LC_ALL; \ cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ + if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$lang -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ rm -f $$tmpdir/$$lang.new.po; \ else \ diff --git a/Build/source/extra/xz/po/cs.gmo b/Build/source/extra/xz/po/cs.gmo Binary files differindex e29106f4fe2..b54184a75c7 100644 --- a/Build/source/extra/xz/po/cs.gmo +++ b/Build/source/extra/xz/po/cs.gmo diff --git a/Build/source/extra/xz/po/cs.po b/Build/source/extra/xz/po/cs.po index 02dc87ee64f..c621b0c4469 100644 --- a/Build/source/extra/xz/po/cs.po +++ b/Build/source/extra/xz/po/cs.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 16:30+0300\n" +"POT-Creation-Date: 2013-06-30 16:50+0300\n" "PO-Revision-Date: 2010-12-03 11:32+0100\n" "Last-Translator: Marek Černocký <marek@manet.cz>\n" "Language-Team: Czech <diskuze@lists.l10n.cz>\n" @@ -37,40 +37,40 @@ msgstr "Spolu s přepínači „--files“ nebo „--files0“ může být zadá msgid "The environment variable %s contains too many arguments" msgstr "Proměnná prostředí %s obsahuje příliš mnoho argumentů" -#: src/xz/coder.c:95 +#: src/xz/coder.c:99 msgid "Maximum number of filters is four" msgstr "Maximální počet filtrů je čtyři" -#: src/xz/coder.c:108 +#: src/xz/coder.c:118 msgid "Memory usage limit is too low for the given filter setup." msgstr "Omezení použitelné paměti je příliš malé pro dané nastavení filtru." -#: src/xz/coder.c:129 +#: src/xz/coder.c:139 msgid "Using a preset in raw mode is discouraged." msgstr "Použití přednastavení v režimu raw je nevhodné." -#: src/xz/coder.c:131 +#: src/xz/coder.c:141 msgid "The exact options of the presets may vary between software versions." msgstr "Přesné volby u přednastavení se mohou lišit mezi různými verzemi softwaru." -#: src/xz/coder.c:157 +#: src/xz/coder.c:164 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Formát .lzma podporuje pouze filtr LZMA1" -#: src/xz/coder.c:165 +#: src/xz/coder.c:172 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 nelze použít s formátem .xz" -#: src/xz/coder.c:182 +#: src/xz/coder.c:189 msgid "Unsupported filter chain or filter options" msgstr "Nepodporovaný omezující filtr nebo volby filtru" -#: src/xz/coder.c:190 +#: src/xz/coder.c:197 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekomprimace bude vyžadovat %s MiB paměti." -#: src/xz/coder.c:247 +#: src/xz/coder.c:254 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby nebylo překročeno omezení použitelné paměti %s MiB" @@ -85,92 +85,92 @@ msgstr "Přizpůsobit velikost slovníku LZMA%c z %s MiB na %s MiB, tak aby neby #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:137 +#: src/xz/file_io.c:138 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Vypadá to, že soubor byl přesunut, proto nebude odstraněn" -#: src/xz/file_io.c:144 src/xz/file_io.c:589 +#: src/xz/file_io.c:145 src/xz/file_io.c:586 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Nelze odstranit: %s" -#: src/xz/file_io.c:169 +#: src/xz/file_io.c:170 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Nelze nastavit vlastníka souboru: %s" -#: src/xz/file_io.c:175 +#: src/xz/file_io.c:176 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Nelze nastavit skupinu souboru: %s" -#: src/xz/file_io.c:194 +#: src/xz/file_io.c:195 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Nelze nastavit oprávnění souboru: %s" -#: src/xz/file_io.c:337 src/xz/file_io.c:420 +#: src/xz/file_io.c:338 src/xz/file_io.c:417 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Jedná se o symbolický odkaz, vynechává se" -#: src/xz/file_io.c:455 +#: src/xz/file_io.c:452 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Jedná se o složku, vynechává se" -#: src/xz/file_io.c:461 +#: src/xz/file_io.c:458 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Nejedná se o běžný soubor, vynechává se" -#: src/xz/file_io.c:478 +#: src/xz/file_io.c:475 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Soubor má nastavený bit setuid nebo setgid, vynechává se" -#: src/xz/file_io.c:485 +#: src/xz/file_io.c:482 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Soubor má nastavený bit sticky, vynechává se" -#: src/xz/file_io.c:492 +#: src/xz/file_io.c:489 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Vstupní soubor má více než jeden pevný odkaz, vynechává se" -#: src/xz/file_io.c:713 +#: src/xz/file_io.c:711 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Chyba při obnovení příznaku O_APPEND na standardní výstup: %s" -#: src/xz/file_io.c:725 +#: src/xz/file_io.c:723 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Selhalo zavření souboru: %s" -#: src/xz/file_io.c:761 src/xz/file_io.c:945 +#: src/xz/file_io.c:759 src/xz/file_io.c:943 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Selhalo nastavení pozice při pokusu o vytvoření souboru řídké matice: %s" -#: src/xz/file_io.c:820 +#: src/xz/file_io.c:818 #, c-format msgid "%s: Read error: %s" msgstr "%s: Chyba čtení: %s" -#: src/xz/file_io.c:843 +#: src/xz/file_io.c:841 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Chyba při posunu v rámci souboru: %s" -#: src/xz/file_io.c:853 +#: src/xz/file_io.c:851 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Neočekávaný konec souboru" -#: src/xz/file_io.c:903 +#: src/xz/file_io.c:901 #, c-format msgid "%s: Write error: %s" msgstr "%s: Chyba zápisu: %s" @@ -267,41 +267,41 @@ msgstr "%s: Je příliš malý na to, aby to mohl být platný soubor .xz" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:629 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Proud Bloky Komprim Nekomprim Poměr Kontrl Název souboru" -#: src/xz/list.c:652 +#: src/xz/list.c:669 #, c-format msgid " Streams: %s\n" msgstr " Proudů: %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:671 #, c-format msgid " Blocks: %s\n" msgstr " Bloků: %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:673 #, c-format msgid " Compressed size: %s\n" msgstr " Komprimovaná velikost: %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:676 #, c-format msgid " Uncompressed size: %s\n" msgstr " Nekomprimovaná velikost: %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:679 #, c-format msgid " Ratio: %s\n" msgstr " Poměr komprimace: %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:681 #, c-format msgid " Check: %s\n" msgstr " Typ kontroly: %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:682 #, c-format msgid " Stream padding: %s\n" msgstr " Zarovnání proudu: %s\n" @@ -309,7 +309,7 @@ msgstr " Zarovnání proudu: %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:710 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -319,7 +319,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:765 #, c-format msgid "" " Blocks:\n" @@ -335,32 +335,32 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:777 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " KontrHod %*s Hlavič Příznaky KomprVel PoužiPam Filtry" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:855 src/xz/list.c:1024 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Potřebná paměť: %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:857 src/xz/list.c:1026 #, c-format msgid " Sizes in headers: %s\n" msgstr " Velikosti v hlavičkách: %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "Yes" msgstr "Ano" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "No" msgstr "Ne" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:1003 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -368,20 +368,20 @@ msgstr[0] "%s soubor\n" msgstr[1] "%s soubory\n" msgstr[2] "%s souborů\n" -#: src/xz/list.c:999 +#: src/xz/list.c:1016 msgid "Totals:" msgstr "Celkem:" -#: src/xz/list.c:1000 +#: src/xz/list.c:1017 #, c-format msgid " Number of files: %s\n" msgstr " Počet souborů: %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1089 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list pracuje pouze se soubory .xz (--format=xz nebo --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1095 msgid "--list does not support reading from standard input" msgstr "--list nepodporuje čtení ze standardního vstupu" @@ -453,22 +453,27 @@ msgstr "Komprimovaná data jsou poškozená" msgid "Unexpected end of input" msgstr "Neočekávaný konec vstupu" -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, fuzzy, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "Je vyžadováno %s MiB paměti. Limit je %s." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Je vyžadováno %s MiB paměti. Limit je %s." -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Omezující filtr: %s\n" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Zkuste „%s --help“ pro více informací" -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -479,15 +484,15 @@ msgstr "" "Komprimuje nebo dekomprimuje SOUBORy ve formátu xz.\n" "\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Povinné argumenty pro dlouhé přepínače jsou povinné rovněž pro krátké přepínače.\n" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr "Operační režim:\n" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -499,7 +504,7 @@ msgstr "" " -t, --test testovat integritu komprimovaného souboru\n" " -l, --list vypsat informace o souborech .xz" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -507,7 +512,7 @@ msgstr "" "\n" "Modifikátory operací:\n" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -517,7 +522,7 @@ msgstr "" " -f, --force vynutit přepis výstupního souboru a de/komprimovat odkazy\n" " -c, --stdout zapisovat na standardní výstup a nemazat vstupní soubory" -#: src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -533,7 +538,7 @@ msgstr "" " názvy souborů musí být zakončeny znakem nového řádku\n" " --files0[=SOUBOR] stejné jako --files, ale použít k zakončování nulový znak" -#: src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -541,7 +546,7 @@ msgstr "" "\n" "Základní přepínače pro formát souboru a komprimaci:\n" -#: src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -553,7 +558,7 @@ msgstr "" " -C, --check=KONTROLA typ kontroly integrity: „none“ (používejte s rozmyslem),\n" " „crc32“, „crc64“ (výchozí) nebo „sha256“" -#: src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -561,7 +566,7 @@ msgstr "" " -0 .. -9 přednastavení komprimace; výchozí je 6; než použijete\n" " hodnoty 7 – 9, vezměte do úvahy množství použité paměti" -#: src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -569,7 +574,7 @@ msgstr "" " -e, --extreme zkusit zlepšit poměr komprimace využitím více času\n" " procesoru; nemá vliv na paměťové nároky dekomprimace" -#: src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -585,7 +590,7 @@ msgstr "" " dekomprimaci nebo obojí; LIMIT je v bajtech, % z paměti\n" " RAM nebo 0 pro výchozí" -#: src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -593,7 +598,7 @@ msgstr "" " --no-adjust pokud nastavení komprimace přesáhne omezení použitelné\n" " paměti, předat chybu namísto snížení nastavení" -#: src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -601,7 +606,7 @@ msgstr "" "\n" "Vlastní omezující filtr pro komprimaci (alternativa k použití přednastavených):" -#: src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -630,7 +635,7 @@ msgstr "" " depth=POČ maximální hloubka prohledávání;\n" " 0 = automaticky (výchozí)" -#: src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -652,7 +657,7 @@ msgstr "" " Platné volby pro všechny filtry BCJ:\n" " start=POČ počáteční posun pro převody (výchozí=0)" -#: src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -664,7 +669,7 @@ msgstr "" " dist=POČ vzdálenost mezi bajty, které jsou odečítány\n" " jeden od druhého (1 – 256; 1)" -#: src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -672,7 +677,7 @@ msgstr "" "\n" " Ostatní přepínače:\n" -#: src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -681,17 +686,17 @@ msgstr "" " -v, --verbose podrobnější zprávy; zadáním dvakrát, budou ještě\n" " podrobnější" -#: src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn způsobí, že varování neovlivní stav ukončení" -#: src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot použít strojově analyzovatelné zprávy (užitečné pro\n" " skripty)" -#: src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -699,7 +704,7 @@ msgstr "" " --info-memory zobrazit celkové množství paměti RAM a současné aktivní\n" " omezení použitelné paměti a skončit" -#: src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -707,7 +712,7 @@ msgstr "" " -h, --help zobrazit krátkou nápovědu (vypíše jen základní přepínače)\n" " -H, --long-help zobrazit tuto úplnou nápovědu a skončit" -#: src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -715,11 +720,11 @@ msgstr "" " -h, --help zobrazit tuto zkrácenou nápovědu a skončit\n" " -H, --long-help zobrazit úplnou nápovědu (vypíše i pokročilé přepínače)" -#: src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version zobrazit číslo verze a skončit" -#: src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -731,12 +736,12 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "Chyby hlaste na <%s> (v angličtině nebo finštině).\n" -#: src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "Domovská stránka %s: <%s>\n" @@ -790,34 +795,34 @@ msgstr "%s: Soubor již má příponu „%s“, vynechává se" msgid "%s: Invalid filename suffix" msgstr "%s: Neplatná přípona názvu souboru" -#: src/xz/util.c:61 +#: src/xz/util.c:71 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Hodnota není nezáporné desítkové číslo" -#: src/xz/util.c:103 +#: src/xz/util.c:113 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Neplatná jednotka s předponou" -#: src/xz/util.c:105 +#: src/xz/util.c:115 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Platné jednotky s předponami jsou „KiB“ (2^10 B), „MiB“ (2^20 B) a „GiB“ (2^30 B)." -#: src/xz/util.c:122 +#: src/xz/util.c:132 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "Hodnota volby „%s“ musí být v rozsahu [%<PRIu64>, %<PRIu64>]" -#: src/xz/util.c:247 +#: src/xz/util.c:257 msgid "Empty filename, skipping" msgstr "Prázdný název souboru, vynechává se" -#: src/xz/util.c:261 +#: src/xz/util.c:271 msgid "Compressed data cannot be read from a terminal" msgstr "Z terminálu nelze číst komprimovaná data" -#: src/xz/util.c:274 +#: src/xz/util.c:284 msgid "Compressed data cannot be written to a terminal" msgstr "Do terminálu nelze zapisovat komprimovaná data" diff --git a/Build/source/extra/xz/po/de.gmo b/Build/source/extra/xz/po/de.gmo Binary files differindex 50e41afce95..d7201dea0a4 100644 --- a/Build/source/extra/xz/po/de.gmo +++ b/Build/source/extra/xz/po/de.gmo diff --git a/Build/source/extra/xz/po/de.po b/Build/source/extra/xz/po/de.po index 03612d11747..bdd38a51813 100644 --- a/Build/source/extra/xz/po/de.po +++ b/Build/source/extra/xz/po/de.po @@ -6,11 +6,11 @@ msgid "" msgstr "" "Project-Id-Version: XZ Utils 4.999.9beta\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 16:30+0300\n" +"POT-Creation-Date: 2013-06-30 16:50+0300\n" "PO-Revision-Date: 2010-09-07 20:27+0200\n" "Last-Translator: <maan@systemlinux.org>\n" "Language-Team: German\n" -"Language: \n" +"Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -35,40 +35,40 @@ msgstr "Nur ein file kann als Argument für --files oder --files0 angegeben werd msgid "The environment variable %s contains too many arguments" msgstr "Die Umgebungsvariable %s enthält zu viele Argumente" -#: src/xz/coder.c:95 +#: src/xz/coder.c:99 msgid "Maximum number of filters is four" msgstr "Maximal vier Filter möglich" -#: src/xz/coder.c:108 +#: src/xz/coder.c:118 msgid "Memory usage limit is too low for the given filter setup." msgstr "Das Speicher Limit ist zu niedrig für die gegebene Filter Konfiguration." -#: src/xz/coder.c:129 +#: src/xz/coder.c:139 msgid "Using a preset in raw mode is discouraged." msgstr "Verwendung der Voreinstellung im raw Modus wird nicht empfohlen." -#: src/xz/coder.c:131 +#: src/xz/coder.c:141 msgid "The exact options of the presets may vary between software versions." msgstr "Die genauen Optionen der Voreinstellung können zwischen Software Versionen variieren." -#: src/xz/coder.c:157 +#: src/xz/coder.c:164 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Das .lzma Format unterstützt nur den LZMA1 Filter" -#: src/xz/coder.c:165 +#: src/xz/coder.c:172 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 kann nicht mit dem .xz Format verwendet werden" -#: src/xz/coder.c:182 +#: src/xz/coder.c:189 msgid "Unsupported filter chain or filter options" msgstr "Optionen nicht unterstützt" -#: src/xz/coder.c:190 +#: src/xz/coder.c:197 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekompression wird %s MiB Speicher brauchen." -#: src/xz/coder.c:247 +#: src/xz/coder.c:254 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das Speicher Nutzungslimit von %s MiB zu übersteigen" @@ -83,92 +83,92 @@ msgstr "Passte LZMA%c Wörterbuch Größe von %s MiB to %s MiB an, um nicht das #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:137 +#: src/xz/file_io.c:138 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Datei scheint umbenannt worden zu sein, daher wird sie nicht gelöscht" -#: src/xz/file_io.c:144 src/xz/file_io.c:589 +#: src/xz/file_io.c:145 src/xz/file_io.c:586 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Kann nicht löschen: %s" -#: src/xz/file_io.c:169 +#: src/xz/file_io.c:170 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Kann Datei Eigentümer nicht setzen: %s" -#: src/xz/file_io.c:175 +#: src/xz/file_io.c:176 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Kann Datei Gruppe nicht setzen: %s" -#: src/xz/file_io.c:194 +#: src/xz/file_io.c:195 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Kann Zugriffsrechte nicht setzen: %s" -#: src/xz/file_io.c:337 src/xz/file_io.c:420 +#: src/xz/file_io.c:338 src/xz/file_io.c:417 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Überspringe symbolischen Verweis" -#: src/xz/file_io.c:455 +#: src/xz/file_io.c:452 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Überspringe Verzeichnis" -#: src/xz/file_io.c:461 +#: src/xz/file_io.c:458 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Keine reguläre Datei, überspringe" -#: src/xz/file_io.c:478 +#: src/xz/file_io.c:475 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Datei hat das setuid oder setgid Bit gesetzt, überspringe" -#: src/xz/file_io.c:485 +#: src/xz/file_io.c:482 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Datei hat sticky Bit gesetzt, überspringe" -#: src/xz/file_io.c:492 +#: src/xz/file_io.c:489 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Eingabedatei hat mehr als einen hard link, überspringe" -#: src/xz/file_io.c:713 +#: src/xz/file_io.c:711 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Fehler beim Wiederherstellen des O_APPEND flags bei Standard Output: %s" -#: src/xz/file_io.c:725 +#: src/xz/file_io.c:723 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Fehler beim Schießen der Datei: %s" -#: src/xz/file_io.c:761 src/xz/file_io.c:945 +#: src/xz/file_io.c:759 src/xz/file_io.c:943 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Positionierungsfehler beim Versuch eine sparse Datei zu erzeugen: %s" -#: src/xz/file_io.c:820 +#: src/xz/file_io.c:818 #, c-format msgid "%s: Read error: %s" msgstr "%s: Lesefehler: %s" -#: src/xz/file_io.c:843 +#: src/xz/file_io.c:841 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Fehler beim Lesen der Dateinamen: %s" -#: src/xz/file_io.c:853 +#: src/xz/file_io.c:851 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Unerwartetes Ende der Datei" -#: src/xz/file_io.c:903 +#: src/xz/file_io.c:901 #, c-format msgid "%s: Write error: %s" msgstr "%s: Schreibfehler: %s" @@ -265,41 +265,41 @@ msgstr "%s: Zu klein um ein gültiges .xz file zu sein" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:629 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Str. Blöcke Kompr. Unkompr. Verh. Check Dateiname" -#: src/xz/list.c:652 +#: src/xz/list.c:669 #, c-format msgid " Streams: %s\n" msgstr " Ströme: %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:671 #, c-format msgid " Blocks: %s\n" msgstr " Blöcke: %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:673 #, c-format msgid " Compressed size: %s\n" msgstr " Größe komprimiert: %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:676 #, c-format msgid " Uncompressed size: %s\n" msgstr " Größe unkomprimiert: %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:679 #, c-format msgid " Ratio: %s\n" msgstr " Verhältnis: %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:681 #, c-format msgid " Check: %s\n" msgstr " Check: %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:682 #, c-format msgid " Stream padding: %s\n" msgstr " Strom Auffüllung: %s\n" @@ -307,7 +307,7 @@ msgstr " Strom Auffüllung: %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:710 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -317,7 +317,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:765 #, c-format msgid "" " Blocks:\n" @@ -333,52 +333,52 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:777 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " CheckWert %*s Kopf Schalter KompGröße Speicher Filter" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:855 src/xz/list.c:1024 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Benötigter Speicher: %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:857 src/xz/list.c:1026 #, c-format msgid " Sizes in headers: %s\n" msgstr " Größe in Köpfen: %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "Yes" msgstr "Ja" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "No" msgstr "Nein" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:1003 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s Datei\n" msgstr[1] "%s Dateien\n" -#: src/xz/list.c:999 +#: src/xz/list.c:1016 msgid "Totals:" msgstr "Gesamt:" -#: src/xz/list.c:1000 +#: src/xz/list.c:1017 #, c-format msgid " Number of files: %s\n" msgstr " Anzahl Dateien: %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1089 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funktioniert nur mit .xz Dateien (--format=xz oder --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1095 msgid "--list does not support reading from standard input" msgstr "--list unterstützt kein Lesen der Standardeingabe" @@ -450,22 +450,27 @@ msgstr "Komprimierte Daten sind korrupt" msgid "Unexpected end of input" msgstr "Unerwartetes Eingabe Ende" -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "%s MiB Speicher wird benötigt. Der Begrenzer ist deaktiviert." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB Speicher wird benötigt. Limit ist %s." -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Filter Kette: %s\n" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Versuchen Sie `%s --help' für mehr Informationen." -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -476,17 +481,17 @@ msgstr "" "Komprimiert oder dekomprimiert .xz DATEI(EN).\n" "\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Obligatorische Argumente für lange Optionen sind auch für kurze Optionen\n" "zwingend.\n" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Operationsmodus:\n" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -498,7 +503,7 @@ msgstr "" " -t, --test überprüfe Datei Integrität\n" " -l, --list liste Datei Informationen" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -506,7 +511,7 @@ msgstr "" "\n" " Operationsmodifikatoren:\n" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -518,7 +523,7 @@ msgstr "" " -c, --stdout schreibe nach Standard Output und lösche nicht die\n" " Eingabedateien" -#: src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -535,7 +540,7 @@ msgstr "" " einem Zeilenumbruch voneinander getrennt werden\n" " --files0=[DATEI] wie --files, aber benutze den Null Charakter als Trenner" -#: src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -543,7 +548,7 @@ msgstr "" "\n" " Grundlegende Optionen für Dateiformat und Kompression:\n" -#: src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -556,7 +561,7 @@ msgstr "" " -C, --check=CHECK Typ des Integritätschecks: `none' (Vorsicht), `crc32',\n" " `crc64' (Voreinstellung), oder `sha256'" -#: src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -565,7 +570,7 @@ msgstr "" " Sie den Speicherverbrauch des Komprimieres *und* des\n" " Dekomprimierers, wenn Sie 7-9 benutzen!" -#: src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -574,7 +579,7 @@ msgstr "" " verhältnis zu verbessern. Das beeinflusst nicht den\n" " Speicherbedarf des Dekomprimierers." -#: src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -589,7 +594,7 @@ msgstr "" " Dekompression, oder beides; LIMIT ist in bytes, % RAM,\n" " oder 0 für Grundeinstellungen." -#: src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -598,7 +603,7 @@ msgstr "" " Nutzungslimit übersteigen, erzeuge einen Fehler statt\n" " die Einstellungen nach unten anzupassen." -#: src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -606,7 +611,7 @@ msgstr "" "\n" " User-definierte Filter Kette für Kompression (alternativ zu Voreinstellung):" -#: src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -639,7 +644,7 @@ msgstr "" " depth=NUM Maximale Suchtiefe; 0=automatisch\n" " (Voreinstellung)" -#: src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -662,7 +667,7 @@ msgstr "" " start=NUM Start-Offset für Konversion\n" " (Voreinstellung=0)" -#: src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -675,7 +680,7 @@ msgstr "" " dist=NUM Abstand zwischen den Bytes, die voneinander\n" " subtrahiert werden (1-256; 1)" -#: src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -683,7 +688,7 @@ msgstr "" "\n" " Andere Optionen:\n" -#: src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -693,23 +698,23 @@ msgstr "" " -v, --verbose sei gesprächig; benutze diese Option zweimal um noch\n" " gesprächiger zu sein" -#: src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn Warnungen verändern nicht den exit status" -#: src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot benutze Maschinen-lesbare Meldungen (nützlich für\n" " Skripte)" -#: src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr " --info-memory zeige Speicherlimit an und terminiere" -#: src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -718,7 +723,7 @@ msgstr "" " Optionen)\n" " -H, --long-help zeige diese lange Hilfe an und terminiere" -#: src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -727,11 +732,11 @@ msgstr "" " -H, --long-help zeige die lange Hilfe an (zeigt auch fortgeschrittene\n" " Optionen an)" -#: src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version zeige Versionsnummer an und terminiere" -#: src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -744,14 +749,14 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Melde Bugs an <%s> (in englisch oder finnisch).\n" "Melde Übersetzungsfehler an <maan@systemlinux.org> (in englisch oder deutsch).\n" -#: src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "%s Homepage: <%s>\n" @@ -805,34 +810,34 @@ msgstr "%s: Datei hat bereits `%s' Endung, überspringe" msgid "%s: Invalid filename suffix" msgstr "%s: Ungültige Datei Endung" -#: src/xz/util.c:61 +#: src/xz/util.c:71 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Wert ist keine nicht-negative ganze Zahl" -#: src/xz/util.c:103 +#: src/xz/util.c:113 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Ungültige Einheit" -#: src/xz/util.c:105 +#: src/xz/util.c:115 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Gültige Einheiten sind `KiB' (2^10), `MiB' (2^20), und `GiB' (2^30)." -#: src/xz/util.c:122 +#: src/xz/util.c:132 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "Wert der Option `%s' muss im Bereich [%<PRIu64>, %<PRIu64>] sein" -#: src/xz/util.c:247 +#: src/xz/util.c:257 msgid "Empty filename, skipping" msgstr "Leere Dateiname, überspringe" -#: src/xz/util.c:261 +#: src/xz/util.c:271 msgid "Compressed data cannot be read from a terminal" msgstr "Komprimierte Daten können nicht vom Terminal gelesen werden" -#: src/xz/util.c:274 +#: src/xz/util.c:284 msgid "Compressed data cannot be written to a terminal" msgstr "Komprimierte Daten können nicht auf das Terminal geschrieben werden" diff --git a/Build/source/extra/xz/po/fr.gmo b/Build/source/extra/xz/po/fr.gmo Binary files differindex ec98241d254..4affdccb210 100644 --- a/Build/source/extra/xz/po/fr.gmo +++ b/Build/source/extra/xz/po/fr.gmo diff --git a/Build/source/extra/xz/po/fr.po b/Build/source/extra/xz/po/fr.po index ec0ba3526a4..aaef3499047 100644 --- a/Build/source/extra/xz/po/fr.po +++ b/Build/source/extra/xz/po/fr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 16:30+0300\n" +"POT-Creation-Date: 2013-06-30 16:50+0300\n" "PO-Revision-Date: 2010-09-24 21;12+0200\n" "Last-Translator: Adrien Nader <camaradetux@gmail.com>\n" "Language-Team: None\n" @@ -35,40 +35,40 @@ msgstr "Un seul fichier peut être spécifié avec `--files' ou `--files0'." msgid "The environment variable %s contains too many arguments" msgstr "La variable d'environnement %s contient trop d'arguments" -#: src/xz/coder.c:95 +#: src/xz/coder.c:99 msgid "Maximum number of filters is four" msgstr "Le nombre maximal de filtres est quatre" -#: src/xz/coder.c:108 +#: src/xz/coder.c:118 msgid "Memory usage limit is too low for the given filter setup." msgstr "La limite d'utilisation mémoire est trop basse pour la configuration de filtres donnée." -#: src/xz/coder.c:129 +#: src/xz/coder.c:139 msgid "Using a preset in raw mode is discouraged." msgstr "Utiliser un préréglage en mode `raw' est déconseillé." -#: src/xz/coder.c:131 +#: src/xz/coder.c:141 msgid "The exact options of the presets may vary between software versions." msgstr "Le détail des préréglages peut varier entre différentes versions du logiciel." -#: src/xz/coder.c:157 +#: src/xz/coder.c:164 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Le format .lzma ne prend en charge que le filtre LZMA1" -#: src/xz/coder.c:165 +#: src/xz/coder.c:172 msgid "LZMA1 cannot be used with the .xz format" msgstr "Le filtre LZMA1 ne peut être utilisé avec le format .xz" -#: src/xz/coder.c:182 +#: src/xz/coder.c:189 msgid "Unsupported filter chain or filter options" msgstr "Enchaînement ou options de filtres non pris en charge" -#: src/xz/coder.c:190 +#: src/xz/coder.c:197 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "La décompression nécessitera %s MiB de mémoire." -#: src/xz/coder.c:247 +#: src/xz/coder.c:254 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas dépasser la limite d'utilisation mémoire de %s MiB" @@ -83,92 +83,92 @@ msgstr "Taille du dictionnaire LZMA%c réduite de %s MiB à %s MiB pour ne pas d #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:137 +#: src/xz/file_io.c:138 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s : Le fichier a apparemment été déplacé, suppression annulée" -#: src/xz/file_io.c:144 src/xz/file_io.c:589 +#: src/xz/file_io.c:145 src/xz/file_io.c:586 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s : Impossible de supprimer : %s" -#: src/xz/file_io.c:169 +#: src/xz/file_io.c:170 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s : Impossible de modifier le propriétaire du fichier : %s" -#: src/xz/file_io.c:175 +#: src/xz/file_io.c:176 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s : Impossible de modifier le groupe propriétaire du fichier : %s" -#: src/xz/file_io.c:194 +#: src/xz/file_io.c:195 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s : Impossible de modifier les permissions du fichier : %s" -#: src/xz/file_io.c:337 src/xz/file_io.c:420 +#: src/xz/file_io.c:338 src/xz/file_io.c:417 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s est un lien symbolique : ignoré" -#: src/xz/file_io.c:455 +#: src/xz/file_io.c:452 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s est un répertoire : ignoré" -#: src/xz/file_io.c:461 +#: src/xz/file_io.c:458 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s n'est pas un fichier régulier : ignoré" -#: src/xz/file_io.c:478 +#: src/xz/file_io.c:475 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s : Le fichier possède les bits `setuid' ou `setgid' : ignoré" -#: src/xz/file_io.c:485 +#: src/xz/file_io.c:482 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s : Le fichier possède le bit `sticky' : ignoré" -#: src/xz/file_io.c:492 +#: src/xz/file_io.c:489 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s : Le fichier d'entrée a plus d'un lien matériel : ignoré" -#: src/xz/file_io.c:713 +#: src/xz/file_io.c:711 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Impossible de rétablir le drapeau O_APPEND sur la sortie standard : %s" -#: src/xz/file_io.c:725 +#: src/xz/file_io.c:723 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s : Impossible de fermer le fichier : %s" -#: src/xz/file_io.c:761 src/xz/file_io.c:945 +#: src/xz/file_io.c:759 src/xz/file_io.c:943 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s : Impossible de se déplacer dans le fichier pour créer un 'sparse file' : %s" -#: src/xz/file_io.c:820 +#: src/xz/file_io.c:818 #, c-format msgid "%s: Read error: %s" msgstr "%s : Erreur d'écriture : %s" -#: src/xz/file_io.c:843 +#: src/xz/file_io.c:841 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s : Impossible de se déplacer dans le fichier : %s" -#: src/xz/file_io.c:853 +#: src/xz/file_io.c:851 #, c-format msgid "%s: Unexpected end of file" msgstr "%s : Fin de fichier inattendue" -#: src/xz/file_io.c:903 +#: src/xz/file_io.c:901 #, c-format msgid "%s: Write error: %s" msgstr "%s : Erreur d'écriture : %s" @@ -265,41 +265,41 @@ msgstr "%s : Trop petit pour être un fichier xz valide." #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:629 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Flux Blocs Compressé Décompressé Ratio Vérif Nom de fichier" -#: src/xz/list.c:652 +#: src/xz/list.c:669 #, c-format msgid " Streams: %s\n" msgstr " Flux : %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:671 #, c-format msgid " Blocks: %s\n" msgstr " Blocs : %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:673 #, c-format msgid " Compressed size: %s\n" msgstr " Taille compressé : %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:676 #, c-format msgid " Uncompressed size: %s\n" msgstr " Taille décompressé : %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:679 #, c-format msgid " Ratio: %s\n" msgstr " Ratio : %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:681 #, c-format msgid " Check: %s\n" msgstr " Vérification : %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:682 #, c-format msgid " Stream padding: %s\n" msgstr " Octets de rembourrage du flux : %s\n" @@ -307,7 +307,7 @@ msgstr " Octets de rembourrage du flux : %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:710 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -317,7 +317,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:765 #, c-format msgid "" " Blocks:\n" @@ -333,52 +333,52 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:777 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " ValVérif %*sEn-tête Drapeaux TailleComp UtilMém Filtres" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:855 src/xz/list.c:1024 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Mémoire nécessaire : %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:857 src/xz/list.c:1026 #, c-format msgid " Sizes in headers: %s\n" msgstr " Tailles stockées dans l'en-tête : %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "Yes" msgstr "Oui" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "No" msgstr "Non" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:1003 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s fichier\n" msgstr[1] "%s fichiers\n" -#: src/xz/list.c:999 +#: src/xz/list.c:1016 msgid "Totals:" msgstr "Totaux :" -#: src/xz/list.c:1000 +#: src/xz/list.c:1017 #, c-format msgid " Number of files: %s\n" msgstr " Nombre de fichiers : %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1089 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list ne marche que sur les fichiers .xz (--format=xz ou --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1095 msgid "--list does not support reading from standard input" msgstr "--list est incompatible avec la lecture sur l'entrée standard" @@ -450,22 +450,27 @@ msgstr "Les données compressées sont corrompues" msgid "Unexpected end of input" msgstr "Fin des données inattendue " -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "%s MiB de mémoire sont nécessaires. La limite est désactivée." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB de mémoire sont nécessaires, la limite étant %s." -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s : Enchaînement de filtres : %s\n" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Utilisez `%s --help' pour plus d'informations." -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -476,17 +481,17 @@ msgstr "" "Compresse ou decompresse FICHIER(s) au format .xz.\n" "\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Les arguments obligatoires pour les options longues le sont aussi pour les\n" "options courtes.\n" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Mode d'opération :\n" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -498,7 +503,7 @@ msgstr "" " -t, --test tester l'intégrité du fichier compressé\n" " -l, --list lister les informations à propos des fichiers .xz" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -506,7 +511,7 @@ msgstr "" "\n" " Modifictauers :\n" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -518,7 +523,7 @@ msgstr "" " -c, --stdout écrire sur la sortie standard et ne pas supprimer les\n" " fichiers d'entrée" -#: src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -534,7 +539,7 @@ msgstr "" " et doivent être suivis d'un caractère de retour à la ligne\n" " --files0[=FILE] comme --files mais avec un caractère null comme séparateur" -#: src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -542,7 +547,7 @@ msgstr "" "\n" " Options basiques de format de fichier et de compression :\n" -#: src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -554,7 +559,7 @@ msgstr "" " -C, --check=CHECK type de vérification d'intégrité : `none' (à utiliser avec\n" " précaution), `crc32', `crc64' (par défaut) ou `sha256'" -#: src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -563,7 +568,7 @@ msgstr "" " l'utilisation mémoire du compresseur *et* du décompresseur\n" " avant d'utiliser 7, 8 ou 9 !" -#: src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -572,7 +577,7 @@ msgstr "" " de temps processeur sans affecter les besoins mémoire du\n" " décompresseur" -#: src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -588,7 +593,7 @@ msgstr "" " décompression ou les deux ; LIMIT est en octets, % de\n" " RAM, ou 0 pour les valeurs par défaut" -#: src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -597,7 +602,7 @@ msgstr "" " d'utilisation mémoire, renvoyer une erreur plutôt que de\n" " diminuer les réglages" -#: src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -605,7 +610,7 @@ msgstr "" "\n" " Enchaînement de filtres de compression personnalisé (au lieu des préréglages) :" -#: src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -634,7 +639,7 @@ msgstr "" " depth=NUM profondeur de recherche maximale ;\n" " 0=automatique (par défaut)" -#: src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -656,7 +661,7 @@ msgstr "" " OPTS valides pour tous les filtres BCJ :\n" " start=NUM start offset for conversions (default=0)" -#: src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -668,7 +673,7 @@ msgstr "" " dist=NUM distance entre les octets soustraits\n" " les uns aux autres (1-256 ; 1)" -#: src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -676,7 +681,7 @@ msgstr "" "\n" " Autres options :\n" -#: src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -685,17 +690,17 @@ msgstr "" " aussi supprimer les erreur\n" " -v, --verbose être bavard ; spécifier deux fois pour l'être davantage" -#: src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn les avertissements ne modifient pas le code de sortie" -#: src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" " --robot utiliser des messages lisibles par un programme\n" " (utile pour les scripts)" -#: src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -703,7 +708,7 @@ msgstr "" " --info-memory affiche la quantité totale de RAM et la limite actuelle\n" " en mémoire puis quitte" -#: src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -711,7 +716,7 @@ msgstr "" " -h, --help affiche l'aide courte (ne liste que les options de base)\n" " -H, --long-help affiche l'aide longue (ceci) puis quitte" -#: src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -719,11 +724,11 @@ msgstr "" " -h, --help affiche l'aide courte (ceci) puis quitte\n" " -H, --long-help affiche l'aide longue (liste aussi les options avancées)" -#: src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version affiche le numéro de version puis quitte" -#: src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -735,14 +740,14 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Signaler les bogues à <%s> (en anglais ou en finlandais).\n" "Signaler les bogues de traduction à <camaradetux@gmail.com>.\n" -#: src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "%s page du projet : <%s>\n" @@ -796,34 +801,34 @@ msgstr "%s : Le fichier a déjà le suffixe '%s', ignoré" msgid "%s: Invalid filename suffix" msgstr "%s: Suffixe de nom de fichier invalide" -#: src/xz/util.c:61 +#: src/xz/util.c:71 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s : La valeur n'est pas un entier décimal non négatif" -#: src/xz/util.c:103 +#: src/xz/util.c:113 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s : Suffixe multiplicateur invalide" -#: src/xz/util.c:105 +#: src/xz/util.c:115 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Les suffixes valides sont 'KiB' (2^10), 'MiB' (2^20) et 'GiB' (2^30)." -#: src/xz/util.c:122 +#: src/xz/util.c:132 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "La valeur de l'option '%s' doit être inclue entre %<PRIu64> et %<PRIu64>" -#: src/xz/util.c:247 +#: src/xz/util.c:257 msgid "Empty filename, skipping" msgstr "Nom de fichier vide, ignoré" -#: src/xz/util.c:261 +#: src/xz/util.c:271 msgid "Compressed data cannot be read from a terminal" msgstr "Les données compressées ne peuvent pas être lues depuis un terminal" -#: src/xz/util.c:274 +#: src/xz/util.c:284 msgid "Compressed data cannot be written to a terminal" msgstr "Les données compressées ne peuvent pas être écrites dans un terminal" diff --git a/Build/source/extra/xz/po/it.gmo b/Build/source/extra/xz/po/it.gmo Binary files differindex 648932f0eb2..7f9e4a316e3 100644 --- a/Build/source/extra/xz/po/it.gmo +++ b/Build/source/extra/xz/po/it.gmo diff --git a/Build/source/extra/xz/po/it.po b/Build/source/extra/xz/po/it.po index 754a9602647..36bd2a299f3 100644 --- a/Build/source/extra/xz/po/it.po +++ b/Build/source/extra/xz/po/it.po @@ -2,27 +2,28 @@ # This file is in the public domain # Gruppo traduzione italiano di Ubuntu-it <gruppo-traduzione@ubuntu-it.org>, 2009, 2010 # Lorenzo De Liso <blackz@ubuntu.com>, 2010. -# Milo Casagrande <milo@ubuntu.com>, 2009, 2010. +# Milo Casagrande <milo@ubuntu.com>, 2009, 2010, 2011, 2012. +# msgid "" msgstr "" "Project-Id-Version: xz-utils\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 16:30+0300\n" -"PO-Revision-Date: 2010-09-16 21:32+0200\n" +"POT-Creation-Date: 2013-06-30 16:50+0300\n" +"PO-Revision-Date: 2012-05-31 09:57+0800\n" "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n" "Language-Team: Italian <tp@lists.linux.it>\n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" +"Content-Transfer-Encoding: 8-bit\n" "X-Launchpad-Export-Date: 2010-08-16 19:16+0000\n" "X-Generator: Launchpad (build Unknown)\n" -"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: src/xz/args.c:333 #, c-format msgid "%s: Unknown file format type" -msgstr "%s: tipo di formato del file sconosciutoN" +msgstr "%s: tipo di formato del file sconosciuto" #: src/xz/args.c:356 src/xz/args.c:364 #, c-format @@ -38,40 +39,40 @@ msgstr "Solo un file può essere specificato con \"--files\" o \"--files0\"." msgid "The environment variable %s contains too many arguments" msgstr "La variabile d'ambiente %s contiene troppi argomenti" -#: src/xz/coder.c:95 +#: src/xz/coder.c:99 msgid "Maximum number of filters is four" msgstr "Il numero massimo di filtri è quattro" -#: src/xz/coder.c:108 +#: src/xz/coder.c:118 msgid "Memory usage limit is too low for the given filter setup." msgstr "Il limite dell'uso della memoria è troppo basso per l'impostazione del filtro dato." -#: src/xz/coder.c:129 +#: src/xz/coder.c:139 msgid "Using a preset in raw mode is discouraged." msgstr "Non è consigliato usare un preset nella modalità raw." -#: src/xz/coder.c:131 +#: src/xz/coder.c:141 msgid "The exact options of the presets may vary between software versions." msgstr "Le opzioni esatte per i preset possono variare tra le versioni del software." -#: src/xz/coder.c:157 +#: src/xz/coder.c:164 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Il formato .lzma supporta solo il filtro LZMA1" -#: src/xz/coder.c:165 +#: src/xz/coder.c:172 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 non può essere usato con il formato .xz" -#: src/xz/coder.c:182 +#: src/xz/coder.c:189 msgid "Unsupported filter chain or filter options" msgstr "Catena di filtri od opzioni del filtro non supportata" -#: src/xz/coder.c:190 +#: src/xz/coder.c:197 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "L'estrazione necessita di %s MiB di memoria." -#: src/xz/coder.c:247 +#: src/xz/coder.c:254 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non superare il limite dell'uso della memoria di %s MiB" @@ -86,92 +87,92 @@ msgstr "Regolata la dimensione del dizionario LZMA%c da %s MiB a %s MiB per non #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:137 +#: src/xz/file_io.c:138 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: sembra che il file sia stato spostato, non viene rimosso" -#: src/xz/file_io.c:144 src/xz/file_io.c:589 +#: src/xz/file_io.c:145 src/xz/file_io.c:586 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: impossibile rimuovere: %s" -#: src/xz/file_io.c:169 +#: src/xz/file_io.c:170 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: impossibile impostare il proprietario del file: %s" -#: src/xz/file_io.c:175 +#: src/xz/file_io.c:176 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: impossibile impostare il gruppo del file: %s" -#: src/xz/file_io.c:194 +#: src/xz/file_io.c:195 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: impossibile impostare i permessi del file: %s" -#: src/xz/file_io.c:337 src/xz/file_io.c:420 +#: src/xz/file_io.c:338 src/xz/file_io.c:417 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: è un collegamento simbolico, viene saltato" -#: src/xz/file_io.c:455 +#: src/xz/file_io.c:452 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: è una directory, viene saltata" -#: src/xz/file_io.c:461 +#: src/xz/file_io.c:458 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: non è un file regolare, viene saltato" -#: src/xz/file_io.c:478 +#: src/xz/file_io.c:475 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: il file ha il bit setuid o setgid impostato, viene saltato" -#: src/xz/file_io.c:485 +#: src/xz/file_io.c:482 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: il file ha lo sticky bit impostato, viene saltato" -#: src/xz/file_io.c:492 +#: src/xz/file_io.c:489 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: il file di input ha più di un collegamento fisico, viene saltato" -#: src/xz/file_io.c:713 +#: src/xz/file_io.c:711 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Errore nel ripristinare la flag O_APPEND sullo standard output: %s" -#: src/xz/file_io.c:725 +#: src/xz/file_io.c:723 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: chiusura del file non riuscita: %s" -#: src/xz/file_io.c:761 src/xz/file_io.c:945 +#: src/xz/file_io.c:759 src/xz/file_io.c:943 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: posizionamento non riuscito nel tentativo di creare un file sparso: %s" -#: src/xz/file_io.c:820 +#: src/xz/file_io.c:818 #, c-format msgid "%s: Read error: %s" msgstr "%s: errore di lettura: %s" -#: src/xz/file_io.c:843 +#: src/xz/file_io.c:841 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: errore nel cercare il file: %s" -#: src/xz/file_io.c:853 +#: src/xz/file_io.c:851 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: fine del file inaspettata" -#: src/xz/file_io.c:903 +#: src/xz/file_io.c:901 #, c-format msgid "%s: Write error: %s" msgstr "%s: errore di scrittura: %s" @@ -268,41 +269,41 @@ msgstr "%s: troppo piccolo per essere un file .xz valido" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:629 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr " Strm Blocc. Compresso Estratto Rapp. Contr Nome file" -#: src/xz/list.c:652 +#: src/xz/list.c:669 #, c-format msgid " Streams: %s\n" msgstr " Stream: %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:671 #, c-format msgid " Blocks: %s\n" msgstr " Blocchi: %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:673 #, c-format msgid " Compressed size: %s\n" msgstr " Dim. compresso: %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:676 #, c-format msgid " Uncompressed size: %s\n" msgstr " Dim. estratto: %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:679 #, c-format msgid " Ratio: %s\n" msgstr " Rapporto: %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:681 #, c-format msgid " Check: %s\n" msgstr " Controllo: %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:682 #, c-format msgid " Stream padding: %s\n" msgstr " Padding dello stream: %s\n" @@ -310,7 +311,7 @@ msgstr " Padding dello stream: %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:710 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -320,7 +321,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:765 #, c-format msgid "" " Blocks:\n" @@ -336,52 +337,52 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:777 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " Val.cont %*s Header Flag Dim.compr. Uso mem. Filtri" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:855 src/xz/list.c:1024 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Memoria necessaria: %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:857 src/xz/list.c:1026 #, c-format msgid " Sizes in headers: %s\n" msgstr " Dim. negli header: %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "Yes" msgstr "Sì" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "No" msgstr "No" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:1003 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "%s file\n" msgstr[1] "%s file\n" -#: src/xz/list.c:999 +#: src/xz/list.c:1016 msgid "Totals:" msgstr "Totali:" -#: src/xz/list.c:1000 +#: src/xz/list.c:1017 #, c-format msgid " Number of files: %s\n" msgstr " Numero di file: %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1089 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list funziona solamente con file .xz (--format=xz o --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1095 msgid "--list does not support reading from standard input" msgstr "--list non è in grado di leggere dallo standard input" @@ -415,7 +416,7 @@ msgstr "Impossibile leggere i dati dallo standard input durante la lettura dei n #: src/xz/message.c:733 #, c-format msgid "%s: " -msgstr "" +msgstr "%s: " #: src/xz/message.c:796 src/xz/message.c:846 msgid "Internal error (bug)" @@ -453,22 +454,27 @@ msgstr "I dati compressi sono danneggiati" msgid "Unexpected end of input" msgstr "Fine dell'input non attesa" -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "%s MiB di memoria sono richiesti. Alcun limite impostato." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "%s MiB di memoria sono richiesti. Il limite è %s." -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: catena di filtri: %s\n" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Provare \"%s --help\" per maggiori informazioni." -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -479,15 +485,15 @@ msgstr "" "Comprime o estrae i FILE nel formato .xz.\n" "\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "Gli argomenti obbligatori per le opzioni lunghe lo sono anche per quelle brevi.\n" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Modalità di operazione:\n" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -499,7 +505,7 @@ msgstr "" " -t, --test Verifica l'integrità dei file compressi\n" " -l, --list Elenca informazioni sui file .xz" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -507,7 +513,7 @@ msgstr "" "\n" " Modificatori di operazioni:\n" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -518,7 +524,7 @@ msgstr "" " collegamenti\n" " -c, --stdout Scrive sullo standard output e non elimina i file di input" -#: src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -535,7 +541,7 @@ msgstr "" " di newline\n" " --files0=[FILE] Come --files ma usa il carattere null come terminatore" -#: src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -543,7 +549,7 @@ msgstr "" "\n" " Formato file di base e opzioni di compressione:\n" -#: src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -555,7 +561,7 @@ msgstr "" " -C, --check=CHECK Tipo di verifica integrità: \"none\" (usare con attenzione),\n" " \"crc32\", \"crc64\" (predefinito) o \"sha256\"" -#: src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -564,7 +570,7 @@ msgstr "" " l'utilizzo di memoria per comprimere ed estrarre prima\n" " di usare 7-9" -#: src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -573,7 +579,7 @@ msgstr "" " utilizzando più tempo di CPU; non cambia i requisiti di\n" " memoria in fase di estrazione" -#: src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -589,7 +595,7 @@ msgstr "" " compressione, l'estrazione o entrambe; LIMIT è in byte,\n" " % della memoria RAM oppure 0 per il valore predefinito" -#: src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -598,7 +604,7 @@ msgstr "" " utilizzo della memoria, lancia un errore invece di\n" " utilizzare valori più piccoli" -#: src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -607,7 +613,7 @@ msgstr "" " Catena di filtri personalizzati per la compressione (alternative per\n" " l'utilizzo di preset):" -#: src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -640,7 +646,7 @@ msgstr "" " depth=NUM Profondità massima di ricerca; 0=automatica\n" " (predefinito)" -#: src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -663,7 +669,7 @@ msgstr "" " start=NUM Offset iniziale per le conversioni\n" " (predefinito=0)" -#: src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -675,7 +681,7 @@ msgstr "" " dist=NUM Distanza tra byte sottratti\n" " gli uni dagli altri (1-256; 1)" -#: src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -683,7 +689,7 @@ msgstr "" "\n" " Altre opzioni:\n" -#: src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -693,15 +699,15 @@ msgstr "" " -v, --verbose Output prolisso; specificare due volte per output ancora\n" " più prolisso" -#: src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn Gli avvisi non influenzano lo stato d'uscita" -#: src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot Usa messaggi analizzabili (utile per gli script)" -#: src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -709,7 +715,7 @@ msgstr "" " --info-memory Visualizza la quantità totale di RAM, il limite attuale\n" " attivo di utilizzo della memore ed esce" -#: src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -717,7 +723,7 @@ msgstr "" " -h, --help Stampa l'aiuto breve (elenca solo le opzioni di base)\n" " -H, --long-help Stampa questo lungo aiuto ed esce" -#: src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -725,11 +731,11 @@ msgstr "" " -h, --help Stampa questo breve aiuto ed esce\n" " -H, --long-help Stampa l'aiuto lungo (elenca anche le opzioni avanzate)" -#: src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version Stampa il numero della versione ed esce" -#: src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -741,14 +747,14 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" "Segnalare i bug a <%s> (in inglese o finlandese).\n" "Segnalare i bug di traduzione a <tp@lists.linux.it>.\n" -#: src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "Sito web di %s: <%s>\n" @@ -802,34 +808,34 @@ msgstr "%s: il file ha già il suffisso \"%s\", viene saltato" msgid "%s: Invalid filename suffix" msgstr "%s: suffisso del nome del file non valido" -#: src/xz/util.c:61 +#: src/xz/util.c:71 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: il valore non è un numero intero decimale non-negativo" -#: src/xz/util.c:103 +#: src/xz/util.c:113 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: suffisso del moltiplicatore non valido" -#: src/xz/util.c:105 +#: src/xz/util.c:115 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "I suffissi validi sono \"KiB\" (2^10), \"MiB\" (2^20), e \"GiB\" (2^30)." -#: src/xz/util.c:122 +#: src/xz/util.c:132 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "Il valore dell'opzione \"%s\" deve essere nell'intervallo [%<PRIu64>, %<PRIu64>]" -#: src/xz/util.c:247 +#: src/xz/util.c:257 msgid "Empty filename, skipping" msgstr "Nome file vuoto, viene saltato" -#: src/xz/util.c:261 +#: src/xz/util.c:271 msgid "Compressed data cannot be read from a terminal" msgstr "I dati compressi non possono essere letti da un terminale" -#: src/xz/util.c:274 +#: src/xz/util.c:284 msgid "Compressed data cannot be written to a terminal" msgstr "I dati compressi non possono essere scritti ad un terminale" diff --git a/Build/source/extra/xz/po/pl.gmo b/Build/source/extra/xz/po/pl.gmo Binary files differindex 81eb89523e9..bf7fa2e5c45 100644 --- a/Build/source/extra/xz/po/pl.gmo +++ b/Build/source/extra/xz/po/pl.gmo diff --git a/Build/source/extra/xz/po/pl.po b/Build/source/extra/xz/po/pl.po index eb4b292fdf4..3a2fb9c212a 100644 --- a/Build/source/extra/xz/po/pl.po +++ b/Build/source/extra/xz/po/pl.po @@ -1,13 +1,13 @@ # Polish translation for xz. # This file is in the public domain. -# Jakub Bogusz <qboosh@pld-linux.org>, 2011. +# Jakub Bogusz <qboosh@pld-linux.org>, 2011-2012. # msgid "" msgstr "" -"Project-Id-Version: xz 5.0.1\n" +"Project-Id-Version: xz 5.0.2\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 16:30+0300\n" -"PO-Revision-Date: 2011-02-02 16:51+0100\n" +"POT-Creation-Date: 2013-06-30 16:50+0300\n" +"PO-Revision-Date: 2012-05-29 18:15+0200\n" "Last-Translator: Jakub Bogusz <qboosh@pld-linux.org>\n" "Language-Team: Polish <translation-team-pl@lists.sourceforge.net>\n" "Language: pl\n" @@ -35,40 +35,40 @@ msgstr "Wraz z opcją `--files' lub `--files0' można podać tylko jeden plik." msgid "The environment variable %s contains too many arguments" msgstr "Zmienna środowiskowa %s zawiera zbyt dużo argumentów" -#: src/xz/coder.c:95 +#: src/xz/coder.c:99 msgid "Maximum number of filters is four" msgstr "Maksymalna liczba filtrów to cztery" -#: src/xz/coder.c:108 +#: src/xz/coder.c:118 msgid "Memory usage limit is too low for the given filter setup." msgstr "Limit użycia pamięci jest zbyt mały dla podanej konfiguracji filtra." -#: src/xz/coder.c:129 +#: src/xz/coder.c:139 msgid "Using a preset in raw mode is discouraged." msgstr "Użycie ustawień predefiniowanych w trybie surowym jest odradzane." -#: src/xz/coder.c:131 +#: src/xz/coder.c:141 msgid "The exact options of the presets may vary between software versions." msgstr "Dokładne opcje ustawień predefiniowanych mogą różnić się między wersjami oprogramowania." -#: src/xz/coder.c:157 +#: src/xz/coder.c:164 msgid "The .lzma format supports only the LZMA1 filter" msgstr "Format .lzma obsługuje tylko filtr LZMA1" -#: src/xz/coder.c:165 +#: src/xz/coder.c:172 msgid "LZMA1 cannot be used with the .xz format" msgstr "LZMA1 nie może być używany z formatem .xz" -#: src/xz/coder.c:182 +#: src/xz/coder.c:189 msgid "Unsupported filter chain or filter options" msgstr "Nieobsługiwany łańcuch filtrów lub opcje filtra" -#: src/xz/coder.c:190 +#: src/xz/coder.c:197 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "Dekompresja będzie wymagała %s MiB pamięci." -#: src/xz/coder.c:247 +#: src/xz/coder.c:254 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "Skorygowano rozmiar słownika LZMA%c z %s MiB do %s MiB aby nie przekroczyć limitu użycia pamięci %s MiB" @@ -83,92 +83,92 @@ msgstr "Skorygowano rozmiar słownika LZMA%c z %s MiB do %s MiB aby nie przekroc #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:137 +#: src/xz/file_io.c:138 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "%s: Plik wygląda na przeniesiony, nie zostanie usunięty" -#: src/xz/file_io.c:144 src/xz/file_io.c:589 +#: src/xz/file_io.c:145 src/xz/file_io.c:586 #, c-format msgid "%s: Cannot remove: %s" msgstr "%s: Nie można usunąć: %s" -#: src/xz/file_io.c:169 +#: src/xz/file_io.c:170 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "%s: Nie można ustawić właściciela pliku: %s" -#: src/xz/file_io.c:175 +#: src/xz/file_io.c:176 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "%s: Nie można ustawić grupy pliku: %s" -#: src/xz/file_io.c:194 +#: src/xz/file_io.c:195 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "%s: Nie można ustawić uprawnień pliku: %s" -#: src/xz/file_io.c:337 src/xz/file_io.c:420 +#: src/xz/file_io.c:338 src/xz/file_io.c:417 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "%s: Jest dowiązaniem symbolicznym, pominięto" -#: src/xz/file_io.c:455 +#: src/xz/file_io.c:452 #, c-format msgid "%s: Is a directory, skipping" msgstr "%s: Jest katalogiem, pominięto" -#: src/xz/file_io.c:461 +#: src/xz/file_io.c:458 #, c-format msgid "%s: Not a regular file, skipping" msgstr "%s: Nie jest zwykłym plikiem, pominięto" -#: src/xz/file_io.c:478 +#: src/xz/file_io.c:475 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "%s: Plik ma ustawiony bit setuid lub setgid, pominięto" -#: src/xz/file_io.c:485 +#: src/xz/file_io.c:482 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "%s: Plik ma ustawiony bit sticky, pominięto" -#: src/xz/file_io.c:492 +#: src/xz/file_io.c:489 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "%s: Plik wejściowy ma więcej niż jedno dowiązanie zwykłe, pominięto" -#: src/xz/file_io.c:713 +#: src/xz/file_io.c:711 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "Błąd podczas odtwarzania flagi O_APPEND dla standardowego wyjścia: %s" -#: src/xz/file_io.c:725 +#: src/xz/file_io.c:723 #, c-format msgid "%s: Closing the file failed: %s" msgstr "%s: Zamknięcie pliku nie powiodło się: %s" -#: src/xz/file_io.c:761 src/xz/file_io.c:945 +#: src/xz/file_io.c:759 src/xz/file_io.c:943 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "%s: Zmiana pozycji nie powiodła się podczas próby utworzenia pliku rzadkiego: %s" -#: src/xz/file_io.c:820 +#: src/xz/file_io.c:818 #, c-format msgid "%s: Read error: %s" msgstr "%s: Błąd odczytu: %s" -#: src/xz/file_io.c:843 +#: src/xz/file_io.c:841 #, c-format msgid "%s: Error seeking the file: %s" msgstr "%s: Błąd podczas zmiany pozycji w pliku: %s" -#: src/xz/file_io.c:853 +#: src/xz/file_io.c:851 #, c-format msgid "%s: Unexpected end of file" msgstr "%s: Nieoczekiwany koniec pliku" -#: src/xz/file_io.c:903 +#: src/xz/file_io.c:901 #, c-format msgid "%s: Write error: %s" msgstr "%s: Błąd zapisu: %s" @@ -265,41 +265,41 @@ msgstr "%s: Za mały na poprawny plik .xz" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:629 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "Strum. Bloki Spakowany Rozpakowany Wsp. Kontrola Nazwa pliku" -#: src/xz/list.c:652 +#: src/xz/list.c:669 #, c-format msgid " Streams: %s\n" msgstr " Strumienie: %s\n" -#: src/xz/list.c:654 +#: src/xz/list.c:671 #, c-format msgid " Blocks: %s\n" msgstr " Bloki: %s\n" -#: src/xz/list.c:656 +#: src/xz/list.c:673 #, c-format msgid " Compressed size: %s\n" msgstr " Rozmiar spakowany: %s\n" -#: src/xz/list.c:659 +#: src/xz/list.c:676 #, c-format msgid " Uncompressed size: %s\n" msgstr " Rozmiar rozpakowany: %s\n" -#: src/xz/list.c:662 +#: src/xz/list.c:679 #, c-format msgid " Ratio: %s\n" msgstr " Współczynnik: %s\n" -#: src/xz/list.c:664 +#: src/xz/list.c:681 #, c-format msgid " Check: %s\n" msgstr " Kontrola spójności: %s\n" -#: src/xz/list.c:665 +#: src/xz/list.c:682 #, c-format msgid " Stream padding: %s\n" msgstr " Wyrównanie strumienia: %s\n" @@ -307,7 +307,7 @@ msgstr " Wyrównanie strumienia: %s\n" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:710 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -317,7 +317,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:765 #, c-format msgid "" " Blocks:\n" @@ -333,32 +333,32 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:777 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr " S.kontr. %*sNagłówek Flagi Rozm. spak. Uż.pamięci Filtry" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:855 src/xz/list.c:1024 #, c-format msgid " Memory needed: %s MiB\n" msgstr " Wymagana pamięć: %s MiB\n" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:857 src/xz/list.c:1026 #, c-format msgid " Sizes in headers: %s\n" msgstr " Rozmiar w nagłówkach: %s\n" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "Yes" msgstr "Tak" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "No" msgstr "Nie" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:1003 #, c-format msgid "%s file\n" msgid_plural "%s files\n" @@ -366,20 +366,20 @@ msgstr[0] "%s plik\n" msgstr[1] "%s pliki\n" msgstr[2] "%s plików\n" -#: src/xz/list.c:999 +#: src/xz/list.c:1016 msgid "Totals:" msgstr "Sumarycznie:" -#: src/xz/list.c:1000 +#: src/xz/list.c:1017 #, c-format msgid " Number of files: %s\n" msgstr " Liczba plików: %s\n" -#: src/xz/list.c:1072 +#: src/xz/list.c:1089 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "--list działa tylko z plikami .xz (--format=xz lub --format=auto)" -#: src/xz/list.c:1078 +#: src/xz/list.c:1095 msgid "--list does not support reading from standard input" msgstr "--list nie obsługuje odczytu ze standardowego wejścia" @@ -413,7 +413,7 @@ msgstr "Nie można odczytać danych ze standardowego wejścia przy czytaniu nazw #: src/xz/message.c:733 #, c-format msgid "%s: " -msgstr "" +msgstr "%s: " #: src/xz/message.c:796 src/xz/message.c:846 msgid "Internal error (bug)" @@ -451,22 +451,27 @@ msgstr "Dane skompresowane są uszkodzone" msgid "Unexpected end of input" msgstr "Nieoczekiwany koniec wejścia" -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "Wymagane jest %s MiB pamięci. Limit jest wyłączony." + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "Wymagane jest %s MiB pamięci. Limit to %s." -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "%s: Łańcuch filtrów: %s\n" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "Polecenie `%s --help' pokaże więcej informacji." -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -477,17 +482,17 @@ msgstr "" "Kompresja lub dekompresja PLIKÓW w formacie .xz.\n" "\n" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" "Argumenty obowiązkowe dla opcji długich są obowiązkowe również dla opcji\n" "krótkich.\n" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr " Tryb pracy:\n" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -499,7 +504,7 @@ msgstr "" " -t, --test sprawdzenie spójności plików skompresowanych\n" " -l, --list wypisanie informacji o plikach .xz" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" @@ -507,7 +512,7 @@ msgstr "" "\n" " Modyfikatory operacji:\n" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" @@ -517,7 +522,7 @@ msgstr "" " -f, --force nadpisywanie plików wyjściowych i (de)kompresja dowiązań\n" " -c, --stdout zapis na standardowe wyjście, nieusuwanie plików wej." -#: src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -533,7 +538,7 @@ msgstr "" " wejścia; muszą być zakończone znakiem nowej linii\n" " --files0[=PLIK] podobnie do --files, ale znakiem kończącym musi być NUL" -#: src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" @@ -541,7 +546,7 @@ msgstr "" "\n" " Podstawowe opcje formatu pliku i kompresji:\n" -#: src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -553,7 +558,7 @@ msgstr "" " -C, --check=TEST typ kontroli spójności: `none' (ostrożnie!),\n" " `crc32', `crc64' (domyślny) lub `sha256'" -#: src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" @@ -562,7 +567,7 @@ msgstr "" " użyciem wartości 7-9 należy wziąć pod uwagę wykorzystanie\n" " pamięci przy kompresji *oraz* dekompresji!" -#: src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" @@ -571,7 +576,7 @@ msgstr "" " ilości czasu procesora; nie wpływa na wymagania\n" " pamięciowe dekompresora" -#: src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -587,7 +592,7 @@ msgstr "" " dekompresji lub obu; LIMIT jest w bajtach, % RAM lub 0\n" " dla limitów domyślnych" -#: src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" @@ -596,7 +601,7 @@ msgstr "" " pamięci, zostanie zgłoszony błąd zamiast zmniejszania\n" " ustawień" -#: src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" @@ -604,7 +609,7 @@ msgstr "" "\n" " Łańcuch własnych filtrów do kompresji (alternatywa do używania -0 .. -9):" -#: src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -633,7 +638,7 @@ msgstr "" " mf=NAZWA dopasowywacz (hc3, hc4, bt2, bt3, bt4; bt4)\n" " depth=ILE maks. głębokość szukania; 0=auto (domyślne)" -#: src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -655,7 +660,7 @@ msgstr "" " Poprawne OPCJE dla wszystkich filtrów BCJ:\n" " start=ILE offset początku konwersji (domyślnie=0)" -#: src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -667,7 +672,7 @@ msgstr "" " dist=ILE odległość między bajtami odejmowanymi od\n" " siebie (1-256; 1)" -#: src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" @@ -675,7 +680,7 @@ msgstr "" "\n" " Inne opcje:\n" -#: src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" @@ -683,15 +688,15 @@ msgstr "" " -q, --quiet pominięcie ostrzeżeń; dwukrotne podanie pomija też błędy\n" " -v, --verbose więcej informacji; dwukrotne podanie to jeszcze więcej" -#: src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr " -Q, --no-warn ostrzeżenia nie mają wpływu na status zakończenia" -#: src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr " --robot komunikaty w formacie dla maszyny (do skryptów)" -#: src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" @@ -699,7 +704,7 @@ msgstr "" " --info-memory wyświetlenie całkowitej ilości pamięci RAM oraz aktualnie\n" " aktywnych limitów pamięci i zakończenie pracy" -#: src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" @@ -707,7 +712,7 @@ msgstr "" " -h, --help wyświetlenie krótkiego opisu (tylko podstawowe opcje)\n" " -H, --long-help wyświetlenie tego długiego opisu i zakończenie" -#: src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" @@ -715,11 +720,11 @@ msgstr "" " -h, --help wyświetlenie tego krótkiego opisu i zakończenie\n" " -H, --long-help wyświetlenie długiego opisu (także opcje zaawansowane)" -#: src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr " -V, --version wyświetlenie informacji o wersji i zakończenie" -#: src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -731,7 +736,7 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" @@ -740,7 +745,7 @@ msgstr "" "Błędy w tłumaczeniu prosimy zgłaszać na adres\n" "<translation-team-pl@lists.sourceforge.net>.\n" -#: src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "Strona domowa %s: <%s>\n" @@ -794,34 +799,34 @@ msgstr "%s: Plik już ma rozszerzenie `%s', pominięto" msgid "%s: Invalid filename suffix" msgstr "%s: Błędne rozszerzenie nazwy pliku" -#: src/xz/util.c:61 +#: src/xz/util.c:71 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "%s: Wartość nie jest nieujemną liczbą całkowitą" -#: src/xz/util.c:103 +#: src/xz/util.c:113 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "%s: Błędny przyrostek mnożnika" -#: src/xz/util.c:105 +#: src/xz/util.c:115 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "Poprawne przyrostki to `KiB' (2^10), `MiB' (2^20) i `GiB' (2^30)." -#: src/xz/util.c:122 +#: src/xz/util.c:132 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "Wartość opcji `%s' musi być w przedziale [%<PRIu64>, %<PRIu64>]" -#: src/xz/util.c:247 +#: src/xz/util.c:257 msgid "Empty filename, skipping" msgstr "Pusta nazwa pliku, pominięto" -#: src/xz/util.c:261 +#: src/xz/util.c:271 msgid "Compressed data cannot be read from a terminal" msgstr "Dane skompresowane nie mogą być czytane z terminala" -#: src/xz/util.c:274 +#: src/xz/util.c:284 msgid "Compressed data cannot be written to a terminal" msgstr "Dane skompresowane nie mogą być zapisywane na terminal" diff --git a/Build/source/extra/xz/po/xz.pot b/Build/source/extra/xz/po/xz.pot index b4a7f993ee1..afbdb853288 100644 --- a/Build/source/extra/xz/po/xz.pot +++ b/Build/source/extra/xz/po/xz.pot @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: xz 5.0.5\n" "Report-Msgid-Bugs-To: lasse.collin@tukaani.org\n" -"POT-Creation-Date: 2011-05-21 16:30+0300\n" +"POT-Creation-Date: 2013-06-30 16:50+0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -36,40 +36,40 @@ msgstr "" msgid "The environment variable %s contains too many arguments" msgstr "" -#: src/xz/coder.c:95 +#: src/xz/coder.c:99 msgid "Maximum number of filters is four" msgstr "" -#: src/xz/coder.c:108 +#: src/xz/coder.c:118 msgid "Memory usage limit is too low for the given filter setup." msgstr "" -#: src/xz/coder.c:129 +#: src/xz/coder.c:139 msgid "Using a preset in raw mode is discouraged." msgstr "" -#: src/xz/coder.c:131 +#: src/xz/coder.c:141 msgid "The exact options of the presets may vary between software versions." msgstr "" -#: src/xz/coder.c:157 +#: src/xz/coder.c:164 msgid "The .lzma format supports only the LZMA1 filter" msgstr "" -#: src/xz/coder.c:165 +#: src/xz/coder.c:172 msgid "LZMA1 cannot be used with the .xz format" msgstr "" -#: src/xz/coder.c:182 +#: src/xz/coder.c:189 msgid "Unsupported filter chain or filter options" msgstr "" -#: src/xz/coder.c:190 +#: src/xz/coder.c:197 #, c-format msgid "Decompression will need %s MiB of memory." msgstr "" -#: src/xz/coder.c:247 +#: src/xz/coder.c:254 #, c-format msgid "Adjusted LZMA%c dictionary size from %s MiB to %s MiB to not exceed the memory usage limit of %s MiB" msgstr "" @@ -84,92 +84,92 @@ msgstr "" #. it is possible that the user has put a new file in place #. of the original file, and in that case it obviously #. shouldn't be removed. -#: src/xz/file_io.c:137 +#: src/xz/file_io.c:138 #, c-format msgid "%s: File seems to have been moved, not removing" msgstr "" -#: src/xz/file_io.c:144 src/xz/file_io.c:589 +#: src/xz/file_io.c:145 src/xz/file_io.c:586 #, c-format msgid "%s: Cannot remove: %s" msgstr "" -#: src/xz/file_io.c:169 +#: src/xz/file_io.c:170 #, c-format msgid "%s: Cannot set the file owner: %s" msgstr "" -#: src/xz/file_io.c:175 +#: src/xz/file_io.c:176 #, c-format msgid "%s: Cannot set the file group: %s" msgstr "" -#: src/xz/file_io.c:194 +#: src/xz/file_io.c:195 #, c-format msgid "%s: Cannot set the file permissions: %s" msgstr "" -#: src/xz/file_io.c:337 src/xz/file_io.c:420 +#: src/xz/file_io.c:338 src/xz/file_io.c:417 #, c-format msgid "%s: Is a symbolic link, skipping" msgstr "" -#: src/xz/file_io.c:455 +#: src/xz/file_io.c:452 #, c-format msgid "%s: Is a directory, skipping" msgstr "" -#: src/xz/file_io.c:461 +#: src/xz/file_io.c:458 #, c-format msgid "%s: Not a regular file, skipping" msgstr "" -#: src/xz/file_io.c:478 +#: src/xz/file_io.c:475 #, c-format msgid "%s: File has setuid or setgid bit set, skipping" msgstr "" -#: src/xz/file_io.c:485 +#: src/xz/file_io.c:482 #, c-format msgid "%s: File has sticky bit set, skipping" msgstr "" -#: src/xz/file_io.c:492 +#: src/xz/file_io.c:489 #, c-format msgid "%s: Input file has more than one hard link, skipping" msgstr "" -#: src/xz/file_io.c:713 +#: src/xz/file_io.c:711 #, c-format msgid "Error restoring the O_APPEND flag to standard output: %s" msgstr "" -#: src/xz/file_io.c:725 +#: src/xz/file_io.c:723 #, c-format msgid "%s: Closing the file failed: %s" msgstr "" -#: src/xz/file_io.c:761 src/xz/file_io.c:945 +#: src/xz/file_io.c:759 src/xz/file_io.c:943 #, c-format msgid "%s: Seeking failed when trying to create a sparse file: %s" msgstr "" -#: src/xz/file_io.c:820 +#: src/xz/file_io.c:818 #, c-format msgid "%s: Read error: %s" msgstr "" -#: src/xz/file_io.c:843 +#: src/xz/file_io.c:841 #, c-format msgid "%s: Error seeking the file: %s" msgstr "" -#: src/xz/file_io.c:853 +#: src/xz/file_io.c:851 #, c-format msgid "%s: Unexpected end of file" msgstr "" -#: src/xz/file_io.c:903 +#: src/xz/file_io.c:901 #, c-format msgid "%s: Write error: %s" msgstr "" @@ -266,41 +266,41 @@ msgstr "" #. to Ratio, the columns are right aligned. Check and Filename #. are left aligned. If you need longer words, it's OK to #. use two lines here. Test with "xz -l foo.xz". -#: src/xz/list.c:612 +#: src/xz/list.c:629 msgid "Strms Blocks Compressed Uncompressed Ratio Check Filename" msgstr "" -#: src/xz/list.c:652 +#: src/xz/list.c:669 #, c-format msgid " Streams: %s\n" msgstr "" -#: src/xz/list.c:654 +#: src/xz/list.c:671 #, c-format msgid " Blocks: %s\n" msgstr "" -#: src/xz/list.c:656 +#: src/xz/list.c:673 #, c-format msgid " Compressed size: %s\n" msgstr "" -#: src/xz/list.c:659 +#: src/xz/list.c:676 #, c-format msgid " Uncompressed size: %s\n" msgstr "" -#: src/xz/list.c:662 +#: src/xz/list.c:679 #, c-format msgid " Ratio: %s\n" msgstr "" -#: src/xz/list.c:664 +#: src/xz/list.c:681 #, c-format msgid " Check: %s\n" msgstr "" -#: src/xz/list.c:665 +#: src/xz/list.c:682 #, c-format msgid " Stream padding: %s\n" msgstr "" @@ -308,7 +308,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All except #. Check are right aligned; Check is left aligned. Test with #. "xz -lv foo.xz". -#: src/xz/list.c:693 +#: src/xz/list.c:710 msgid "" " Streams:\n" " Stream Blocks CompOffset UncompOffset CompSize UncompSize Ratio Check Padding" @@ -316,7 +316,7 @@ msgstr "" #. TRANSLATORS: The second line is column headings. All #. except Check are right aligned; Check is left aligned. -#: src/xz/list.c:748 +#: src/xz/list.c:765 #, c-format msgid "" " Blocks:\n" @@ -330,52 +330,52 @@ msgstr "" #. are right aligned. %*s is replaced with 0-120 #. spaces to make the CheckVal column wide enough. #. Test with "xz -lvv foo.xz". -#: src/xz/list.c:760 +#: src/xz/list.c:777 #, c-format msgid " CheckVal %*s Header Flags CompSize MemUsage Filters" msgstr "" -#: src/xz/list.c:838 src/xz/list.c:1007 +#: src/xz/list.c:855 src/xz/list.c:1024 #, c-format msgid " Memory needed: %s MiB\n" msgstr "" -#: src/xz/list.c:840 src/xz/list.c:1009 +#: src/xz/list.c:857 src/xz/list.c:1026 #, c-format msgid " Sizes in headers: %s\n" msgstr "" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "Yes" msgstr "" -#: src/xz/list.c:841 src/xz/list.c:1010 +#: src/xz/list.c:858 src/xz/list.c:1027 msgid "No" msgstr "" #. TRANSLATORS: %s is an integer. Only the plural form of this #. message is used (e.g. "2 files"). Test with "xz -l foo.xz bar.xz". -#: src/xz/list.c:986 +#: src/xz/list.c:1003 #, c-format msgid "%s file\n" msgid_plural "%s files\n" msgstr[0] "" msgstr[1] "" -#: src/xz/list.c:999 +#: src/xz/list.c:1016 msgid "Totals:" msgstr "" -#: src/xz/list.c:1000 +#: src/xz/list.c:1017 #, c-format msgid " Number of files: %s\n" msgstr "" -#: src/xz/list.c:1072 +#: src/xz/list.c:1089 msgid "--list works only on .xz files (--format=xz or --format=auto)" msgstr "" -#: src/xz/list.c:1078 +#: src/xz/list.c:1095 msgid "--list does not support reading from standard input" msgstr "" @@ -447,22 +447,27 @@ msgstr "" msgid "Unexpected end of input" msgstr "" -#: src/xz/message.c:885 +#: src/xz/message.c:867 +#, c-format +msgid "%s MiB of memory is required. The limiter is disabled." +msgstr "" + +#: src/xz/message.c:895 #, c-format msgid "%s MiB of memory is required. The limit is %s." msgstr "" -#: src/xz/message.c:1052 +#: src/xz/message.c:1062 #, c-format msgid "%s: Filter chain: %s\n" msgstr "" -#: src/xz/message.c:1062 +#: src/xz/message.c:1072 #, c-format msgid "Try `%s --help' for more information." msgstr "" -#: src/xz/message.c:1088 +#: src/xz/message.c:1098 #, c-format msgid "" "Usage: %s [OPTION]... [FILE]...\n" @@ -470,15 +475,15 @@ msgid "" "\n" msgstr "" -#: src/xz/message.c:1095 +#: src/xz/message.c:1105 msgid "Mandatory arguments to long options are mandatory for short options too.\n" msgstr "" -#: src/xz/message.c:1099 +#: src/xz/message.c:1109 msgid " Operation mode:\n" msgstr "" -#: src/xz/message.c:1102 +#: src/xz/message.c:1112 msgid "" " -z, --compress force compression\n" " -d, --decompress force decompression\n" @@ -486,20 +491,20 @@ msgid "" " -l, --list list information about .xz files" msgstr "" -#: src/xz/message.c:1108 +#: src/xz/message.c:1118 msgid "" "\n" " Operation modifiers:\n" msgstr "" -#: src/xz/message.c:1111 +#: src/xz/message.c:1121 msgid "" " -k, --keep keep (don't delete) input files\n" " -f, --force force overwrite of output file and (de)compress links\n" " -c, --stdout write to standard output and don't delete input files" msgstr "" -#: src/xz/message.c:1117 +#: src/xz/message.c:1127 msgid "" " --no-sparse do not create sparse files when decompressing\n" " -S, --suffix=.SUF use the suffix `.SUF' on compressed files\n" @@ -509,13 +514,13 @@ msgid "" " --files0[=FILE] like --files but use the null character as terminator" msgstr "" -#: src/xz/message.c:1125 +#: src/xz/message.c:1135 msgid "" "\n" " Basic file format and compression options:\n" msgstr "" -#: src/xz/message.c:1127 +#: src/xz/message.c:1137 msgid "" " -F, --format=FMT file format to encode or decode; possible values are\n" " `auto' (default), `xz', `lzma', and `raw'\n" @@ -523,19 +528,19 @@ msgid "" " `crc32', `crc64' (default), or `sha256'" msgstr "" -#: src/xz/message.c:1134 +#: src/xz/message.c:1144 msgid "" " -0 ... -9 compression preset; default is 6; take compressor *and*\n" " decompressor memory usage into account before using 7-9!" msgstr "" -#: src/xz/message.c:1138 +#: src/xz/message.c:1148 msgid "" " -e, --extreme try to improve compression ratio by using more CPU time;\n" " does not affect decompressor memory requirements" msgstr "" -#: src/xz/message.c:1143 +#: src/xz/message.c:1153 #, no-c-format msgid "" " --memlimit-compress=LIMIT\n" @@ -545,19 +550,19 @@ msgid "" " or both; LIMIT is in bytes, % of RAM, or 0 for defaults" msgstr "" -#: src/xz/message.c:1150 +#: src/xz/message.c:1160 msgid "" " --no-adjust if compression settings exceed the memory usage limit,\n" " give an error instead of adjusting the settings downwards" msgstr "" -#: src/xz/message.c:1156 +#: src/xz/message.c:1166 msgid "" "\n" " Custom filter chain for compression (alternative for using presets):" msgstr "" -#: src/xz/message.c:1165 +#: src/xz/message.c:1175 msgid "" "\n" " --lzma1[=OPTS] LZMA1 or LZMA2; OPTS is a comma-separated list of zero or\n" @@ -573,7 +578,7 @@ msgid "" " depth=NUM maximum search depth; 0=automatic (default)" msgstr "" -#: src/xz/message.c:1180 +#: src/xz/message.c:1190 msgid "" "\n" " --x86[=OPTS] x86 BCJ filter (32-bit and 64-bit)\n" @@ -586,7 +591,7 @@ msgid "" " start=NUM start offset for conversions (default=0)" msgstr "" -#: src/xz/message.c:1192 +#: src/xz/message.c:1202 msgid "" "\n" " --delta[=OPTS] Delta filter; valid OPTS (valid values; default):\n" @@ -594,49 +599,49 @@ msgid "" " from each other (1-256; 1)" msgstr "" -#: src/xz/message.c:1200 +#: src/xz/message.c:1210 msgid "" "\n" " Other options:\n" msgstr "" -#: src/xz/message.c:1203 +#: src/xz/message.c:1213 msgid "" " -q, --quiet suppress warnings; specify twice to suppress errors too\n" " -v, --verbose be verbose; specify twice for even more verbose" msgstr "" -#: src/xz/message.c:1208 +#: src/xz/message.c:1218 msgid " -Q, --no-warn make warnings not affect the exit status" msgstr "" -#: src/xz/message.c:1210 +#: src/xz/message.c:1220 msgid " --robot use machine-parsable messages (useful for scripts)" msgstr "" -#: src/xz/message.c:1213 +#: src/xz/message.c:1223 msgid "" " --info-memory display the total amount of RAM and the currently active\n" " memory usage limits, and exit" msgstr "" -#: src/xz/message.c:1216 +#: src/xz/message.c:1226 msgid "" " -h, --help display the short help (lists only the basic options)\n" " -H, --long-help display this long help and exit" msgstr "" -#: src/xz/message.c:1220 +#: src/xz/message.c:1230 msgid "" " -h, --help display this short help and exit\n" " -H, --long-help display the long help (lists also the advanced options)" msgstr "" -#: src/xz/message.c:1225 +#: src/xz/message.c:1235 msgid " -V, --version display the version number and exit" msgstr "" -#: src/xz/message.c:1227 +#: src/xz/message.c:1237 msgid "" "\n" "With no FILE, or when FILE is -, read standard input.\n" @@ -646,12 +651,12 @@ msgstr "" #. for this package. Please add _another line_ saying #. "Report translation bugs to <...>\n" with the email or WWW #. address for translation bugs. Thanks. -#: src/xz/message.c:1233 +#: src/xz/message.c:1243 #, c-format msgid "Report bugs to <%s> (in English or Finnish).\n" msgstr "" -#: src/xz/message.c:1235 +#: src/xz/message.c:1245 #, c-format msgid "%s home page: <%s>\n" msgstr "" @@ -705,34 +710,34 @@ msgstr "" msgid "%s: Invalid filename suffix" msgstr "" -#: src/xz/util.c:61 +#: src/xz/util.c:71 #, c-format msgid "%s: Value is not a non-negative decimal integer" msgstr "" -#: src/xz/util.c:103 +#: src/xz/util.c:113 #, c-format msgid "%s: Invalid multiplier suffix" msgstr "" -#: src/xz/util.c:105 +#: src/xz/util.c:115 msgid "Valid suffixes are `KiB' (2^10), `MiB' (2^20), and `GiB' (2^30)." msgstr "" -#: src/xz/util.c:122 +#: src/xz/util.c:132 #, c-format msgid "Value of the option `%s' must be in the range [%<PRIu64>, %<PRIu64>]" msgstr "" -#: src/xz/util.c:247 +#: src/xz/util.c:257 msgid "Empty filename, skipping" msgstr "" -#: src/xz/util.c:261 +#: src/xz/util.c:271 msgid "Compressed data cannot be read from a terminal" msgstr "" -#: src/xz/util.c:274 +#: src/xz/util.c:284 msgid "Compressed data cannot be written to a terminal" msgstr "" diff --git a/Build/source/extra/xz/src/Makefile.in b/Build/source/extra/xz/src/Makefile.in index 8c5a8a7b9ba..1f332eac0d8 100644 --- a/Build/source/extra/xz/src/Makefile.in +++ b/Build/source/extra/xz/src/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -37,17 +81,18 @@ host_triplet = @host@ @COND_LZMAINFO_TRUE@am__append_2 = lzmainfo @COND_SCRIPTS_TRUE@am__append_3 = scripts subdir = src -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -60,20 +105,58 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = liblzma xzdec xz lzmainfo scripts @@ -106,6 +189,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -134,6 +218,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -194,6 +279,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -201,12 +287,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -292,22 +378,25 @@ clean-libtool: -rm -rf .libs _libs # This directory's subdirectories are mostly independent; you can cd -# into them and run `make' without going through this Makefile. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -322,57 +411,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -388,12 +432,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -405,15 +444,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -422,6 +457,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -458,13 +508,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -499,10 +546,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -580,25 +632,22 @@ ps-am: uninstall-am: -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive +.MAKE: $(am__recursive_targets) install-am install-strip -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic clean-libtool \ - ctags ctags-recursive distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am 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-recursive \ - uninstall uninstall-am +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libtool cscopelist-am ctags \ + ctags-am distclean distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am 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 # 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: - diff --git a/Build/source/extra/xz/src/common/sysdefs.h b/Build/source/extra/xz/src/common/sysdefs.h index 69370ba4210..5ea6bdae4ae 100644 --- a/Build/source/extra/xz/src/common/sysdefs.h +++ b/Build/source/extra/xz/src/common/sysdefs.h @@ -103,9 +103,12 @@ # define UINT64_MAX UINT64_C(18446744073709551615) #endif -// Interix has broken header files, which typedef size_t to unsigned long, -// but a few lines later define SIZE_MAX to INT32_MAX. -#ifdef __INTERIX +// Incorrect(?) SIZE_MAX: +// - Interix headers typedef size_t to unsigned long, +// but a few lines later define SIZE_MAX to INT32_MAX. +// - SCO OpenServer (x86) headers typedef size_t to unsigned int +// but define SIZE_MAX to INT32_MAX. +#if defined(__INTERIX) || defined(_SCO_DS) # undef SIZE_MAX #endif diff --git a/Build/source/extra/xz/src/common/tuklib_open_stdxxx.c b/Build/source/extra/xz/src/common/tuklib_open_stdxxx.c index 08bc60d8cf8..26702a6afab 100644 --- a/Build/source/extra/xz/src/common/tuklib_open_stdxxx.c +++ b/Build/source/extra/xz/src/common/tuklib_open_stdxxx.c @@ -39,12 +39,14 @@ tuklib_open_stdxxx(int err_status) | (i == 0 ? O_WRONLY : O_RDONLY)); if (fd != i) { + if (fd != -1) + (void)close(fd); + // Something went wrong. Exit with the // exit status we were given. Don't try // to print an error message, since stderr // may very well be non-existent. This // error should be extremely rare. - (void)close(fd); exit(err_status); } } diff --git a/Build/source/extra/xz/src/liblzma/Makefile.am b/Build/source/extra/xz/src/liblzma/Makefile.am index 7b3d69ae9f4..0529ff848b0 100644 --- a/Build/source/extra/xz/src/liblzma/Makefile.am +++ b/Build/source/extra/xz/src/liblzma/Makefile.am @@ -24,7 +24,7 @@ liblzma_la_CPPFLAGS = \ -I$(top_srcdir)/src/liblzma/simple \ -I$(top_srcdir)/src/common \ -DTUKLIB_SYMBOL_PREFIX=lzma_ -liblzma_la_LDFLAGS = -no-undefined -version-info 5:3:0 +liblzma_la_LDFLAGS = -no-undefined -version-info 5:5:0 include $(srcdir)/common/Makefile.inc include $(srcdir)/check/Makefile.inc diff --git a/Build/source/extra/xz/src/liblzma/Makefile.in b/Build/source/extra/xz/src/liblzma/Makefile.in index 20230f69f5f..d49e8427bc3 100644 --- a/Build/source/extra/xz/src/liblzma/Makefile.in +++ b/Build/source/extra/xz/src/liblzma/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -17,6 +16,51 @@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,12 +79,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ - $(srcdir)/check/Makefile.inc $(srcdir)/common/Makefile.inc \ - $(srcdir)/delta/Makefile.inc $(srcdir)/liblzma.pc.in \ - $(srcdir)/lz/Makefile.inc $(srcdir)/lzma/Makefile.inc \ - $(srcdir)/rangecoder/Makefile.inc \ - $(srcdir)/simple/Makefile.inc +DIST_COMMON = $(srcdir)/common/Makefile.inc \ + $(srcdir)/check/Makefile.inc $(srcdir)/lz/Makefile.inc \ + $(srcdir)/lzma/Makefile.inc $(srcdir)/rangecoder/Makefile.inc \ + $(srcdir)/delta/Makefile.inc $(srcdir)/simple/Makefile.inc \ + $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/liblzma.pc.in $(top_srcdir)/build-aux/depcomp @COND_MAIN_ENCODER_TRUE@am__append_1 = \ @COND_MAIN_ENCODER_TRUE@ common/alone_encoder.c \ @COND_MAIN_ENCODER_TRUE@ common/block_buffer_encoder.c \ @@ -181,15 +225,16 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ @COND_SHARED_TRUE@@COND_W32_TRUE@am__append_39 = liblzma.def subdir = src/liblzma ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -223,6 +268,12 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(docdir)" \ "$(DESTDIR)$(pkgconfigdir)" LTLIBRARIES = $(lib_LTLIBRARIES) @@ -362,42 +413,98 @@ am_liblzma_la_OBJECTS = liblzma_la-tuklib_physmem.lo \ $(am__objects_28) $(am__objects_29) $(am__objects_30) \ $(am__objects_31) $(am__objects_32) $(am__objects_33) liblzma_la_OBJECTS = $(am_liblzma_la_OBJECTS) -liblzma_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +liblzma_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ $(liblzma_la_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f CPPASCOMPILE = $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -LTCPPASCOMPILE = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) +LTCPPASCOMPILE = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CCASFLAGS) $(CCASFLAGS) +AM_V_CPPAS = $(am__v_CPPAS_@AM_V@) +am__v_CPPAS_ = $(am__v_CPPAS_@AM_DEFAULT_V@) +am__v_CPPAS_0 = @echo " CPPAS " $@; +am__v_CPPAS_1 = COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(liblzma_la_SOURCES) DIST_SOURCES = $(am__liblzma_la_SOURCES_DIST) -RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \ - html-recursive info-recursive install-data-recursive \ - install-dvi-recursive install-exec-recursive \ - install-html-recursive install-info-recursive \ - install-pdf-recursive install-ps-recursive install-recursive \ - installcheck-recursive installdirs-recursive pdf-recursive \ - ps-recursive uninstall-recursive +RECURSIVE_TARGETS = all-recursive check-recursive cscopelist-recursive \ + ctags-recursive dvi-recursive html-recursive info-recursive \ + install-data-recursive install-dvi-recursive \ + install-exec-recursive install-html-recursive \ + install-info-recursive install-pdf-recursive \ + install-ps-recursive install-recursive installcheck-recursive \ + installdirs-recursive pdf-recursive ps-recursive \ + tags-recursive uninstall-recursive +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac DATA = $(doc_DATA) $(pkgconfig_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive -AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ - $(RECURSIVE_CLEAN_TARGETS:-recursive=) tags TAGS ctags CTAGS \ +am__recursive_targets = \ + $(RECURSIVE_TARGETS) \ + $(RECURSIVE_CLEAN_TARGETS) \ + $(am__extra_recursive_targets) +AM_RECURSIVE_TARGETS = $(am__recursive_targets:-recursive=) TAGS CTAGS \ distdir +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DIST_SUBDIRS = $(SUBDIRS) @@ -430,6 +537,7 @@ am__relativize = \ ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -458,6 +566,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -518,6 +627,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -525,12 +635,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -609,7 +719,7 @@ liblzma_la_CPPFLAGS = \ -I$(top_srcdir)/src/common \ -DTUKLIB_SYMBOL_PREFIX=lzma_ -liblzma_la_LDFLAGS = -no-undefined -version-info 5:3:0 \ +liblzma_la_LDFLAGS = -no-undefined -version-info 5:5:0 \ $(am__append_38) pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = liblzma.pc @@ -638,6 +748,7 @@ Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ esac; +$(srcdir)/common/Makefile.inc $(srcdir)/check/Makefile.inc $(srcdir)/lz/Makefile.inc $(srcdir)/lzma/Makefile.inc $(srcdir)/rangecoder/Makefile.inc $(srcdir)/delta/Makefile.inc $(srcdir)/simple/Makefile.inc: $(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh @@ -649,9 +760,9 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): liblzma.pc: $(top_builddir)/config.status $(srcdir)/liblzma.pc.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ + install-libLTLIBRARIES: $(lib_LTLIBRARIES) @$(NORMAL_INSTALL) - test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)" @list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \ list2=; for p in $$list; do \ if test -f $$p; then \ @@ -659,6 +770,8 @@ install-libLTLIBRARIES: $(lib_LTLIBRARIES) else :; fi; \ done; \ test -z "$$list2" || { \ + echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \ echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \ } @@ -674,14 +787,17 @@ uninstall-libLTLIBRARIES: clean-libLTLIBRARIES: -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES) - @list='$(lib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -liblzma.la: $(liblzma_la_OBJECTS) $(liblzma_la_DEPENDENCIES) - $(liblzma_la_LINK) -rpath $(libdir) $(liblzma_la_OBJECTS) $(liblzma_la_LIBADD) $(LIBS) + @list='$(lib_LTLIBRARIES)'; \ + locs=`for p in $$list; do echo $$p; done | \ + sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \ + sort -u`; \ + test -z "$$locs" || { \ + echo rm -f $${locs}; \ + rm -f $${locs}; \ + } + +liblzma.la: $(liblzma_la_OBJECTS) $(liblzma_la_DEPENDENCIES) $(EXTRA_liblzma_la_DEPENDENCIES) + $(AM_V_CCLD)$(liblzma_la_LINK) -rpath $(libdir) $(liblzma_la_OBJECTS) $(liblzma_la_LIBADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -764,557 +880,557 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblzma_la-x86.Plo@am__quote@ .S.o: -@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ $< +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ $< .S.obj: -@am__fastdepCCAS_TRUE@ $(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(CPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(CPPASCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .S.lo: -@am__fastdepCCAS_TRUE@ $(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LTCPPASCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(LTCPPASCOMPILE) -c -o $@ $< +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LTCPPASCOMPILE) -c -o $@ $< liblzma_la-crc32_x86.lo: check/crc32_x86.S -@am__fastdepCCAS_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -MT liblzma_la-crc32_x86.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_x86.Tpo -c -o liblzma_la-crc32_x86.lo `test -f 'check/crc32_x86.S' || echo '$(srcdir)/'`check/crc32_x86.S -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc32_x86.Tpo $(DEPDIR)/liblzma_la-crc32_x86.Plo -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='check/crc32_x86.S' object='liblzma_la-crc32_x86.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -MT liblzma_la-crc32_x86.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_x86.Tpo -c -o liblzma_la-crc32_x86.lo `test -f 'check/crc32_x86.S' || echo '$(srcdir)/'`check/crc32_x86.S +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc32_x86.Tpo $(DEPDIR)/liblzma_la-crc32_x86.Plo +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='check/crc32_x86.S' object='liblzma_la-crc32_x86.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o liblzma_la-crc32_x86.lo `test -f 'check/crc32_x86.S' || echo '$(srcdir)/'`check/crc32_x86.S +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o liblzma_la-crc32_x86.lo `test -f 'check/crc32_x86.S' || echo '$(srcdir)/'`check/crc32_x86.S liblzma_la-crc64_x86.lo: check/crc64_x86.S -@am__fastdepCCAS_TRUE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -MT liblzma_la-crc64_x86.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_x86.Tpo -c -o liblzma_la-crc64_x86.lo `test -f 'check/crc64_x86.S' || echo '$(srcdir)/'`check/crc64_x86.S -@am__fastdepCCAS_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc64_x86.Tpo $(DEPDIR)/liblzma_la-crc64_x86.Plo -@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ source='check/crc64_x86.S' object='liblzma_la-crc64_x86.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCCAS_TRUE@ $(AM_V_CPPAS)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -MT liblzma_la-crc64_x86.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_x86.Tpo -c -o liblzma_la-crc64_x86.lo `test -f 'check/crc64_x86.S' || echo '$(srcdir)/'`check/crc64_x86.S +@am__fastdepCCAS_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc64_x86.Tpo $(DEPDIR)/liblzma_la-crc64_x86.Plo +@AMDEP_TRUE@@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS)source='check/crc64_x86.S' object='liblzma_la-crc64_x86.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCCAS_FALSE@ DEPDIR=$(DEPDIR) $(CCASDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCCAS_FALSE@ $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o liblzma_la-crc64_x86.lo `test -f 'check/crc64_x86.S' || echo '$(srcdir)/'`check/crc64_x86.S +@am__fastdepCCAS_FALSE@ $(AM_V_CPPAS@am__nodep@)$(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CCAS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CCASFLAGS) $(CCASFLAGS) -c -o liblzma_la-crc64_x86.lo `test -f 'check/crc64_x86.S' || echo '$(srcdir)/'`check/crc64_x86.S .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< liblzma_la-tuklib_physmem.lo: $(top_srcdir)/src/common/tuklib_physmem.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-tuklib_physmem.lo -MD -MP -MF $(DEPDIR)/liblzma_la-tuklib_physmem.Tpo -c -o liblzma_la-tuklib_physmem.lo `test -f '$(top_srcdir)/src/common/tuklib_physmem.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_physmem.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-tuklib_physmem.Tpo $(DEPDIR)/liblzma_la-tuklib_physmem.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_physmem.c' object='liblzma_la-tuklib_physmem.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-tuklib_physmem.lo -MD -MP -MF $(DEPDIR)/liblzma_la-tuklib_physmem.Tpo -c -o liblzma_la-tuklib_physmem.lo `test -f '$(top_srcdir)/src/common/tuklib_physmem.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_physmem.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-tuklib_physmem.Tpo $(DEPDIR)/liblzma_la-tuklib_physmem.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_physmem.c' object='liblzma_la-tuklib_physmem.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-tuklib_physmem.lo `test -f '$(top_srcdir)/src/common/tuklib_physmem.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_physmem.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-tuklib_physmem.lo `test -f '$(top_srcdir)/src/common/tuklib_physmem.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_physmem.c liblzma_la-common.lo: common/common.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-common.Tpo -c -o liblzma_la-common.lo `test -f 'common/common.c' || echo '$(srcdir)/'`common/common.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-common.Tpo $(DEPDIR)/liblzma_la-common.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/common.c' object='liblzma_la-common.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-common.Tpo -c -o liblzma_la-common.lo `test -f 'common/common.c' || echo '$(srcdir)/'`common/common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-common.Tpo $(DEPDIR)/liblzma_la-common.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/common.c' object='liblzma_la-common.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-common.lo `test -f 'common/common.c' || echo '$(srcdir)/'`common/common.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-common.lo `test -f 'common/common.c' || echo '$(srcdir)/'`common/common.c liblzma_la-block_util.lo: common/block_util.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_util.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_util.Tpo -c -o liblzma_la-block_util.lo `test -f 'common/block_util.c' || echo '$(srcdir)/'`common/block_util.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_util.Tpo $(DEPDIR)/liblzma_la-block_util.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_util.c' object='liblzma_la-block_util.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_util.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_util.Tpo -c -o liblzma_la-block_util.lo `test -f 'common/block_util.c' || echo '$(srcdir)/'`common/block_util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_util.Tpo $(DEPDIR)/liblzma_la-block_util.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_util.c' object='liblzma_la-block_util.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_util.lo `test -f 'common/block_util.c' || echo '$(srcdir)/'`common/block_util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_util.lo `test -f 'common/block_util.c' || echo '$(srcdir)/'`common/block_util.c liblzma_la-easy_preset.lo: common/easy_preset.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_preset.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_preset.Tpo -c -o liblzma_la-easy_preset.lo `test -f 'common/easy_preset.c' || echo '$(srcdir)/'`common/easy_preset.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-easy_preset.Tpo $(DEPDIR)/liblzma_la-easy_preset.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/easy_preset.c' object='liblzma_la-easy_preset.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_preset.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_preset.Tpo -c -o liblzma_la-easy_preset.lo `test -f 'common/easy_preset.c' || echo '$(srcdir)/'`common/easy_preset.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-easy_preset.Tpo $(DEPDIR)/liblzma_la-easy_preset.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/easy_preset.c' object='liblzma_la-easy_preset.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_preset.lo `test -f 'common/easy_preset.c' || echo '$(srcdir)/'`common/easy_preset.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_preset.lo `test -f 'common/easy_preset.c' || echo '$(srcdir)/'`common/easy_preset.c liblzma_la-filter_common.lo: common/filter_common.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_common.Tpo -c -o liblzma_la-filter_common.lo `test -f 'common/filter_common.c' || echo '$(srcdir)/'`common/filter_common.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_common.Tpo $(DEPDIR)/liblzma_la-filter_common.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_common.c' object='liblzma_la-filter_common.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_common.Tpo -c -o liblzma_la-filter_common.lo `test -f 'common/filter_common.c' || echo '$(srcdir)/'`common/filter_common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_common.Tpo $(DEPDIR)/liblzma_la-filter_common.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_common.c' object='liblzma_la-filter_common.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_common.lo `test -f 'common/filter_common.c' || echo '$(srcdir)/'`common/filter_common.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_common.lo `test -f 'common/filter_common.c' || echo '$(srcdir)/'`common/filter_common.c liblzma_la-hardware_physmem.lo: common/hardware_physmem.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-hardware_physmem.lo -MD -MP -MF $(DEPDIR)/liblzma_la-hardware_physmem.Tpo -c -o liblzma_la-hardware_physmem.lo `test -f 'common/hardware_physmem.c' || echo '$(srcdir)/'`common/hardware_physmem.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-hardware_physmem.Tpo $(DEPDIR)/liblzma_la-hardware_physmem.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/hardware_physmem.c' object='liblzma_la-hardware_physmem.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-hardware_physmem.lo -MD -MP -MF $(DEPDIR)/liblzma_la-hardware_physmem.Tpo -c -o liblzma_la-hardware_physmem.lo `test -f 'common/hardware_physmem.c' || echo '$(srcdir)/'`common/hardware_physmem.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-hardware_physmem.Tpo $(DEPDIR)/liblzma_la-hardware_physmem.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/hardware_physmem.c' object='liblzma_la-hardware_physmem.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-hardware_physmem.lo `test -f 'common/hardware_physmem.c' || echo '$(srcdir)/'`common/hardware_physmem.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-hardware_physmem.lo `test -f 'common/hardware_physmem.c' || echo '$(srcdir)/'`common/hardware_physmem.c liblzma_la-index.lo: common/index.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index.Tpo -c -o liblzma_la-index.lo `test -f 'common/index.c' || echo '$(srcdir)/'`common/index.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-index.Tpo $(DEPDIR)/liblzma_la-index.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/index.c' object='liblzma_la-index.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index.Tpo -c -o liblzma_la-index.lo `test -f 'common/index.c' || echo '$(srcdir)/'`common/index.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-index.Tpo $(DEPDIR)/liblzma_la-index.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/index.c' object='liblzma_la-index.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index.lo `test -f 'common/index.c' || echo '$(srcdir)/'`common/index.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index.lo `test -f 'common/index.c' || echo '$(srcdir)/'`common/index.c liblzma_la-stream_flags_common.lo: common/stream_flags_common.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_flags_common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_flags_common.Tpo -c -o liblzma_la-stream_flags_common.lo `test -f 'common/stream_flags_common.c' || echo '$(srcdir)/'`common/stream_flags_common.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_flags_common.Tpo $(DEPDIR)/liblzma_la-stream_flags_common.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_flags_common.c' object='liblzma_la-stream_flags_common.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_flags_common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_flags_common.Tpo -c -o liblzma_la-stream_flags_common.lo `test -f 'common/stream_flags_common.c' || echo '$(srcdir)/'`common/stream_flags_common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_flags_common.Tpo $(DEPDIR)/liblzma_la-stream_flags_common.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_flags_common.c' object='liblzma_la-stream_flags_common.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_flags_common.lo `test -f 'common/stream_flags_common.c' || echo '$(srcdir)/'`common/stream_flags_common.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_flags_common.lo `test -f 'common/stream_flags_common.c' || echo '$(srcdir)/'`common/stream_flags_common.c liblzma_la-vli_size.lo: common/vli_size.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-vli_size.lo -MD -MP -MF $(DEPDIR)/liblzma_la-vli_size.Tpo -c -o liblzma_la-vli_size.lo `test -f 'common/vli_size.c' || echo '$(srcdir)/'`common/vli_size.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-vli_size.Tpo $(DEPDIR)/liblzma_la-vli_size.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/vli_size.c' object='liblzma_la-vli_size.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-vli_size.lo -MD -MP -MF $(DEPDIR)/liblzma_la-vli_size.Tpo -c -o liblzma_la-vli_size.lo `test -f 'common/vli_size.c' || echo '$(srcdir)/'`common/vli_size.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-vli_size.Tpo $(DEPDIR)/liblzma_la-vli_size.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/vli_size.c' object='liblzma_la-vli_size.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_size.lo `test -f 'common/vli_size.c' || echo '$(srcdir)/'`common/vli_size.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_size.lo `test -f 'common/vli_size.c' || echo '$(srcdir)/'`common/vli_size.c liblzma_la-alone_encoder.lo: common/alone_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-alone_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-alone_encoder.Tpo -c -o liblzma_la-alone_encoder.lo `test -f 'common/alone_encoder.c' || echo '$(srcdir)/'`common/alone_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-alone_encoder.Tpo $(DEPDIR)/liblzma_la-alone_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/alone_encoder.c' object='liblzma_la-alone_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-alone_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-alone_encoder.Tpo -c -o liblzma_la-alone_encoder.lo `test -f 'common/alone_encoder.c' || echo '$(srcdir)/'`common/alone_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-alone_encoder.Tpo $(DEPDIR)/liblzma_la-alone_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/alone_encoder.c' object='liblzma_la-alone_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-alone_encoder.lo `test -f 'common/alone_encoder.c' || echo '$(srcdir)/'`common/alone_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-alone_encoder.lo `test -f 'common/alone_encoder.c' || echo '$(srcdir)/'`common/alone_encoder.c liblzma_la-block_buffer_encoder.lo: common/block_buffer_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_buffer_encoder.Tpo -c -o liblzma_la-block_buffer_encoder.lo `test -f 'common/block_buffer_encoder.c' || echo '$(srcdir)/'`common/block_buffer_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-block_buffer_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_buffer_encoder.c' object='liblzma_la-block_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_buffer_encoder.Tpo -c -o liblzma_la-block_buffer_encoder.lo `test -f 'common/block_buffer_encoder.c' || echo '$(srcdir)/'`common/block_buffer_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-block_buffer_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_buffer_encoder.c' object='liblzma_la-block_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_buffer_encoder.lo `test -f 'common/block_buffer_encoder.c' || echo '$(srcdir)/'`common/block_buffer_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_buffer_encoder.lo `test -f 'common/block_buffer_encoder.c' || echo '$(srcdir)/'`common/block_buffer_encoder.c liblzma_la-block_encoder.lo: common/block_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_encoder.Tpo -c -o liblzma_la-block_encoder.lo `test -f 'common/block_encoder.c' || echo '$(srcdir)/'`common/block_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_encoder.Tpo $(DEPDIR)/liblzma_la-block_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_encoder.c' object='liblzma_la-block_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_encoder.Tpo -c -o liblzma_la-block_encoder.lo `test -f 'common/block_encoder.c' || echo '$(srcdir)/'`common/block_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_encoder.Tpo $(DEPDIR)/liblzma_la-block_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_encoder.c' object='liblzma_la-block_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_encoder.lo `test -f 'common/block_encoder.c' || echo '$(srcdir)/'`common/block_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_encoder.lo `test -f 'common/block_encoder.c' || echo '$(srcdir)/'`common/block_encoder.c liblzma_la-block_header_encoder.lo: common/block_header_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_header_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_header_encoder.Tpo -c -o liblzma_la-block_header_encoder.lo `test -f 'common/block_header_encoder.c' || echo '$(srcdir)/'`common/block_header_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_header_encoder.Tpo $(DEPDIR)/liblzma_la-block_header_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_header_encoder.c' object='liblzma_la-block_header_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_header_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_header_encoder.Tpo -c -o liblzma_la-block_header_encoder.lo `test -f 'common/block_header_encoder.c' || echo '$(srcdir)/'`common/block_header_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_header_encoder.Tpo $(DEPDIR)/liblzma_la-block_header_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_header_encoder.c' object='liblzma_la-block_header_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_header_encoder.lo `test -f 'common/block_header_encoder.c' || echo '$(srcdir)/'`common/block_header_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_header_encoder.lo `test -f 'common/block_header_encoder.c' || echo '$(srcdir)/'`common/block_header_encoder.c liblzma_la-easy_buffer_encoder.lo: common/easy_buffer_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_buffer_encoder.Tpo -c -o liblzma_la-easy_buffer_encoder.lo `test -f 'common/easy_buffer_encoder.c' || echo '$(srcdir)/'`common/easy_buffer_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-easy_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-easy_buffer_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/easy_buffer_encoder.c' object='liblzma_la-easy_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_buffer_encoder.Tpo -c -o liblzma_la-easy_buffer_encoder.lo `test -f 'common/easy_buffer_encoder.c' || echo '$(srcdir)/'`common/easy_buffer_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-easy_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-easy_buffer_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/easy_buffer_encoder.c' object='liblzma_la-easy_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_buffer_encoder.lo `test -f 'common/easy_buffer_encoder.c' || echo '$(srcdir)/'`common/easy_buffer_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_buffer_encoder.lo `test -f 'common/easy_buffer_encoder.c' || echo '$(srcdir)/'`common/easy_buffer_encoder.c liblzma_la-easy_encoder.lo: common/easy_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_encoder.Tpo -c -o liblzma_la-easy_encoder.lo `test -f 'common/easy_encoder.c' || echo '$(srcdir)/'`common/easy_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-easy_encoder.Tpo $(DEPDIR)/liblzma_la-easy_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/easy_encoder.c' object='liblzma_la-easy_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_encoder.Tpo -c -o liblzma_la-easy_encoder.lo `test -f 'common/easy_encoder.c' || echo '$(srcdir)/'`common/easy_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-easy_encoder.Tpo $(DEPDIR)/liblzma_la-easy_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/easy_encoder.c' object='liblzma_la-easy_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_encoder.lo `test -f 'common/easy_encoder.c' || echo '$(srcdir)/'`common/easy_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_encoder.lo `test -f 'common/easy_encoder.c' || echo '$(srcdir)/'`common/easy_encoder.c liblzma_la-easy_encoder_memusage.lo: common/easy_encoder_memusage.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_encoder_memusage.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_encoder_memusage.Tpo -c -o liblzma_la-easy_encoder_memusage.lo `test -f 'common/easy_encoder_memusage.c' || echo '$(srcdir)/'`common/easy_encoder_memusage.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-easy_encoder_memusage.Tpo $(DEPDIR)/liblzma_la-easy_encoder_memusage.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/easy_encoder_memusage.c' object='liblzma_la-easy_encoder_memusage.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_encoder_memusage.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_encoder_memusage.Tpo -c -o liblzma_la-easy_encoder_memusage.lo `test -f 'common/easy_encoder_memusage.c' || echo '$(srcdir)/'`common/easy_encoder_memusage.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-easy_encoder_memusage.Tpo $(DEPDIR)/liblzma_la-easy_encoder_memusage.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/easy_encoder_memusage.c' object='liblzma_la-easy_encoder_memusage.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_encoder_memusage.lo `test -f 'common/easy_encoder_memusage.c' || echo '$(srcdir)/'`common/easy_encoder_memusage.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_encoder_memusage.lo `test -f 'common/easy_encoder_memusage.c' || echo '$(srcdir)/'`common/easy_encoder_memusage.c liblzma_la-filter_buffer_encoder.lo: common/filter_buffer_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_buffer_encoder.Tpo -c -o liblzma_la-filter_buffer_encoder.lo `test -f 'common/filter_buffer_encoder.c' || echo '$(srcdir)/'`common/filter_buffer_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-filter_buffer_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_buffer_encoder.c' object='liblzma_la-filter_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_buffer_encoder.Tpo -c -o liblzma_la-filter_buffer_encoder.lo `test -f 'common/filter_buffer_encoder.c' || echo '$(srcdir)/'`common/filter_buffer_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-filter_buffer_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_buffer_encoder.c' object='liblzma_la-filter_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_buffer_encoder.lo `test -f 'common/filter_buffer_encoder.c' || echo '$(srcdir)/'`common/filter_buffer_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_buffer_encoder.lo `test -f 'common/filter_buffer_encoder.c' || echo '$(srcdir)/'`common/filter_buffer_encoder.c liblzma_la-filter_encoder.lo: common/filter_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_encoder.Tpo -c -o liblzma_la-filter_encoder.lo `test -f 'common/filter_encoder.c' || echo '$(srcdir)/'`common/filter_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_encoder.Tpo $(DEPDIR)/liblzma_la-filter_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_encoder.c' object='liblzma_la-filter_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_encoder.Tpo -c -o liblzma_la-filter_encoder.lo `test -f 'common/filter_encoder.c' || echo '$(srcdir)/'`common/filter_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_encoder.Tpo $(DEPDIR)/liblzma_la-filter_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_encoder.c' object='liblzma_la-filter_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_encoder.lo `test -f 'common/filter_encoder.c' || echo '$(srcdir)/'`common/filter_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_encoder.lo `test -f 'common/filter_encoder.c' || echo '$(srcdir)/'`common/filter_encoder.c liblzma_la-filter_flags_encoder.lo: common/filter_flags_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_flags_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_flags_encoder.Tpo -c -o liblzma_la-filter_flags_encoder.lo `test -f 'common/filter_flags_encoder.c' || echo '$(srcdir)/'`common/filter_flags_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_flags_encoder.Tpo $(DEPDIR)/liblzma_la-filter_flags_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_flags_encoder.c' object='liblzma_la-filter_flags_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_flags_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_flags_encoder.Tpo -c -o liblzma_la-filter_flags_encoder.lo `test -f 'common/filter_flags_encoder.c' || echo '$(srcdir)/'`common/filter_flags_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_flags_encoder.Tpo $(DEPDIR)/liblzma_la-filter_flags_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_flags_encoder.c' object='liblzma_la-filter_flags_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_flags_encoder.lo `test -f 'common/filter_flags_encoder.c' || echo '$(srcdir)/'`common/filter_flags_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_flags_encoder.lo `test -f 'common/filter_flags_encoder.c' || echo '$(srcdir)/'`common/filter_flags_encoder.c liblzma_la-index_encoder.lo: common/index_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index_encoder.Tpo -c -o liblzma_la-index_encoder.lo `test -f 'common/index_encoder.c' || echo '$(srcdir)/'`common/index_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-index_encoder.Tpo $(DEPDIR)/liblzma_la-index_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/index_encoder.c' object='liblzma_la-index_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index_encoder.Tpo -c -o liblzma_la-index_encoder.lo `test -f 'common/index_encoder.c' || echo '$(srcdir)/'`common/index_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-index_encoder.Tpo $(DEPDIR)/liblzma_la-index_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/index_encoder.c' object='liblzma_la-index_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index_encoder.lo `test -f 'common/index_encoder.c' || echo '$(srcdir)/'`common/index_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index_encoder.lo `test -f 'common/index_encoder.c' || echo '$(srcdir)/'`common/index_encoder.c liblzma_la-stream_buffer_encoder.lo: common/stream_buffer_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_buffer_encoder.Tpo -c -o liblzma_la-stream_buffer_encoder.lo `test -f 'common/stream_buffer_encoder.c' || echo '$(srcdir)/'`common/stream_buffer_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-stream_buffer_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_buffer_encoder.c' object='liblzma_la-stream_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_buffer_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_buffer_encoder.Tpo -c -o liblzma_la-stream_buffer_encoder.lo `test -f 'common/stream_buffer_encoder.c' || echo '$(srcdir)/'`common/stream_buffer_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_buffer_encoder.Tpo $(DEPDIR)/liblzma_la-stream_buffer_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_buffer_encoder.c' object='liblzma_la-stream_buffer_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_buffer_encoder.lo `test -f 'common/stream_buffer_encoder.c' || echo '$(srcdir)/'`common/stream_buffer_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_buffer_encoder.lo `test -f 'common/stream_buffer_encoder.c' || echo '$(srcdir)/'`common/stream_buffer_encoder.c liblzma_la-stream_encoder.lo: common/stream_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_encoder.Tpo -c -o liblzma_la-stream_encoder.lo `test -f 'common/stream_encoder.c' || echo '$(srcdir)/'`common/stream_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_encoder.Tpo $(DEPDIR)/liblzma_la-stream_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_encoder.c' object='liblzma_la-stream_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_encoder.Tpo -c -o liblzma_la-stream_encoder.lo `test -f 'common/stream_encoder.c' || echo '$(srcdir)/'`common/stream_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_encoder.Tpo $(DEPDIR)/liblzma_la-stream_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_encoder.c' object='liblzma_la-stream_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_encoder.lo `test -f 'common/stream_encoder.c' || echo '$(srcdir)/'`common/stream_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_encoder.lo `test -f 'common/stream_encoder.c' || echo '$(srcdir)/'`common/stream_encoder.c liblzma_la-stream_flags_encoder.lo: common/stream_flags_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_flags_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_flags_encoder.Tpo -c -o liblzma_la-stream_flags_encoder.lo `test -f 'common/stream_flags_encoder.c' || echo '$(srcdir)/'`common/stream_flags_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_flags_encoder.Tpo $(DEPDIR)/liblzma_la-stream_flags_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_flags_encoder.c' object='liblzma_la-stream_flags_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_flags_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_flags_encoder.Tpo -c -o liblzma_la-stream_flags_encoder.lo `test -f 'common/stream_flags_encoder.c' || echo '$(srcdir)/'`common/stream_flags_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_flags_encoder.Tpo $(DEPDIR)/liblzma_la-stream_flags_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_flags_encoder.c' object='liblzma_la-stream_flags_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_flags_encoder.lo `test -f 'common/stream_flags_encoder.c' || echo '$(srcdir)/'`common/stream_flags_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_flags_encoder.lo `test -f 'common/stream_flags_encoder.c' || echo '$(srcdir)/'`common/stream_flags_encoder.c liblzma_la-vli_encoder.lo: common/vli_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-vli_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-vli_encoder.Tpo -c -o liblzma_la-vli_encoder.lo `test -f 'common/vli_encoder.c' || echo '$(srcdir)/'`common/vli_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-vli_encoder.Tpo $(DEPDIR)/liblzma_la-vli_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/vli_encoder.c' object='liblzma_la-vli_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-vli_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-vli_encoder.Tpo -c -o liblzma_la-vli_encoder.lo `test -f 'common/vli_encoder.c' || echo '$(srcdir)/'`common/vli_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-vli_encoder.Tpo $(DEPDIR)/liblzma_la-vli_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/vli_encoder.c' object='liblzma_la-vli_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_encoder.lo `test -f 'common/vli_encoder.c' || echo '$(srcdir)/'`common/vli_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_encoder.lo `test -f 'common/vli_encoder.c' || echo '$(srcdir)/'`common/vli_encoder.c liblzma_la-alone_decoder.lo: common/alone_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-alone_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-alone_decoder.Tpo -c -o liblzma_la-alone_decoder.lo `test -f 'common/alone_decoder.c' || echo '$(srcdir)/'`common/alone_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-alone_decoder.Tpo $(DEPDIR)/liblzma_la-alone_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/alone_decoder.c' object='liblzma_la-alone_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-alone_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-alone_decoder.Tpo -c -o liblzma_la-alone_decoder.lo `test -f 'common/alone_decoder.c' || echo '$(srcdir)/'`common/alone_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-alone_decoder.Tpo $(DEPDIR)/liblzma_la-alone_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/alone_decoder.c' object='liblzma_la-alone_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-alone_decoder.lo `test -f 'common/alone_decoder.c' || echo '$(srcdir)/'`common/alone_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-alone_decoder.lo `test -f 'common/alone_decoder.c' || echo '$(srcdir)/'`common/alone_decoder.c liblzma_la-auto_decoder.lo: common/auto_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-auto_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-auto_decoder.Tpo -c -o liblzma_la-auto_decoder.lo `test -f 'common/auto_decoder.c' || echo '$(srcdir)/'`common/auto_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-auto_decoder.Tpo $(DEPDIR)/liblzma_la-auto_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/auto_decoder.c' object='liblzma_la-auto_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-auto_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-auto_decoder.Tpo -c -o liblzma_la-auto_decoder.lo `test -f 'common/auto_decoder.c' || echo '$(srcdir)/'`common/auto_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-auto_decoder.Tpo $(DEPDIR)/liblzma_la-auto_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/auto_decoder.c' object='liblzma_la-auto_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-auto_decoder.lo `test -f 'common/auto_decoder.c' || echo '$(srcdir)/'`common/auto_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-auto_decoder.lo `test -f 'common/auto_decoder.c' || echo '$(srcdir)/'`common/auto_decoder.c liblzma_la-block_buffer_decoder.lo: common/block_buffer_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_buffer_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_buffer_decoder.Tpo -c -o liblzma_la-block_buffer_decoder.lo `test -f 'common/block_buffer_decoder.c' || echo '$(srcdir)/'`common/block_buffer_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_buffer_decoder.Tpo $(DEPDIR)/liblzma_la-block_buffer_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_buffer_decoder.c' object='liblzma_la-block_buffer_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_buffer_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_buffer_decoder.Tpo -c -o liblzma_la-block_buffer_decoder.lo `test -f 'common/block_buffer_decoder.c' || echo '$(srcdir)/'`common/block_buffer_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_buffer_decoder.Tpo $(DEPDIR)/liblzma_la-block_buffer_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_buffer_decoder.c' object='liblzma_la-block_buffer_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_buffer_decoder.lo `test -f 'common/block_buffer_decoder.c' || echo '$(srcdir)/'`common/block_buffer_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_buffer_decoder.lo `test -f 'common/block_buffer_decoder.c' || echo '$(srcdir)/'`common/block_buffer_decoder.c liblzma_la-block_decoder.lo: common/block_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_decoder.Tpo -c -o liblzma_la-block_decoder.lo `test -f 'common/block_decoder.c' || echo '$(srcdir)/'`common/block_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_decoder.Tpo $(DEPDIR)/liblzma_la-block_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_decoder.c' object='liblzma_la-block_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_decoder.Tpo -c -o liblzma_la-block_decoder.lo `test -f 'common/block_decoder.c' || echo '$(srcdir)/'`common/block_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_decoder.Tpo $(DEPDIR)/liblzma_la-block_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_decoder.c' object='liblzma_la-block_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_decoder.lo `test -f 'common/block_decoder.c' || echo '$(srcdir)/'`common/block_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_decoder.lo `test -f 'common/block_decoder.c' || echo '$(srcdir)/'`common/block_decoder.c liblzma_la-block_header_decoder.lo: common/block_header_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_header_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_header_decoder.Tpo -c -o liblzma_la-block_header_decoder.lo `test -f 'common/block_header_decoder.c' || echo '$(srcdir)/'`common/block_header_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-block_header_decoder.Tpo $(DEPDIR)/liblzma_la-block_header_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/block_header_decoder.c' object='liblzma_la-block_header_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-block_header_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-block_header_decoder.Tpo -c -o liblzma_la-block_header_decoder.lo `test -f 'common/block_header_decoder.c' || echo '$(srcdir)/'`common/block_header_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-block_header_decoder.Tpo $(DEPDIR)/liblzma_la-block_header_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/block_header_decoder.c' object='liblzma_la-block_header_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_header_decoder.lo `test -f 'common/block_header_decoder.c' || echo '$(srcdir)/'`common/block_header_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-block_header_decoder.lo `test -f 'common/block_header_decoder.c' || echo '$(srcdir)/'`common/block_header_decoder.c liblzma_la-easy_decoder_memusage.lo: common/easy_decoder_memusage.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_decoder_memusage.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_decoder_memusage.Tpo -c -o liblzma_la-easy_decoder_memusage.lo `test -f 'common/easy_decoder_memusage.c' || echo '$(srcdir)/'`common/easy_decoder_memusage.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-easy_decoder_memusage.Tpo $(DEPDIR)/liblzma_la-easy_decoder_memusage.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/easy_decoder_memusage.c' object='liblzma_la-easy_decoder_memusage.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-easy_decoder_memusage.lo -MD -MP -MF $(DEPDIR)/liblzma_la-easy_decoder_memusage.Tpo -c -o liblzma_la-easy_decoder_memusage.lo `test -f 'common/easy_decoder_memusage.c' || echo '$(srcdir)/'`common/easy_decoder_memusage.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-easy_decoder_memusage.Tpo $(DEPDIR)/liblzma_la-easy_decoder_memusage.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/easy_decoder_memusage.c' object='liblzma_la-easy_decoder_memusage.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_decoder_memusage.lo `test -f 'common/easy_decoder_memusage.c' || echo '$(srcdir)/'`common/easy_decoder_memusage.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-easy_decoder_memusage.lo `test -f 'common/easy_decoder_memusage.c' || echo '$(srcdir)/'`common/easy_decoder_memusage.c liblzma_la-filter_buffer_decoder.lo: common/filter_buffer_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_buffer_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_buffer_decoder.Tpo -c -o liblzma_la-filter_buffer_decoder.lo `test -f 'common/filter_buffer_decoder.c' || echo '$(srcdir)/'`common/filter_buffer_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_buffer_decoder.Tpo $(DEPDIR)/liblzma_la-filter_buffer_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_buffer_decoder.c' object='liblzma_la-filter_buffer_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_buffer_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_buffer_decoder.Tpo -c -o liblzma_la-filter_buffer_decoder.lo `test -f 'common/filter_buffer_decoder.c' || echo '$(srcdir)/'`common/filter_buffer_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_buffer_decoder.Tpo $(DEPDIR)/liblzma_la-filter_buffer_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_buffer_decoder.c' object='liblzma_la-filter_buffer_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_buffer_decoder.lo `test -f 'common/filter_buffer_decoder.c' || echo '$(srcdir)/'`common/filter_buffer_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_buffer_decoder.lo `test -f 'common/filter_buffer_decoder.c' || echo '$(srcdir)/'`common/filter_buffer_decoder.c liblzma_la-filter_decoder.lo: common/filter_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_decoder.Tpo -c -o liblzma_la-filter_decoder.lo `test -f 'common/filter_decoder.c' || echo '$(srcdir)/'`common/filter_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_decoder.Tpo $(DEPDIR)/liblzma_la-filter_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_decoder.c' object='liblzma_la-filter_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_decoder.Tpo -c -o liblzma_la-filter_decoder.lo `test -f 'common/filter_decoder.c' || echo '$(srcdir)/'`common/filter_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_decoder.Tpo $(DEPDIR)/liblzma_la-filter_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_decoder.c' object='liblzma_la-filter_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_decoder.lo `test -f 'common/filter_decoder.c' || echo '$(srcdir)/'`common/filter_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_decoder.lo `test -f 'common/filter_decoder.c' || echo '$(srcdir)/'`common/filter_decoder.c liblzma_la-filter_flags_decoder.lo: common/filter_flags_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_flags_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_flags_decoder.Tpo -c -o liblzma_la-filter_flags_decoder.lo `test -f 'common/filter_flags_decoder.c' || echo '$(srcdir)/'`common/filter_flags_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-filter_flags_decoder.Tpo $(DEPDIR)/liblzma_la-filter_flags_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/filter_flags_decoder.c' object='liblzma_la-filter_flags_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-filter_flags_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-filter_flags_decoder.Tpo -c -o liblzma_la-filter_flags_decoder.lo `test -f 'common/filter_flags_decoder.c' || echo '$(srcdir)/'`common/filter_flags_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-filter_flags_decoder.Tpo $(DEPDIR)/liblzma_la-filter_flags_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/filter_flags_decoder.c' object='liblzma_la-filter_flags_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_flags_decoder.lo `test -f 'common/filter_flags_decoder.c' || echo '$(srcdir)/'`common/filter_flags_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-filter_flags_decoder.lo `test -f 'common/filter_flags_decoder.c' || echo '$(srcdir)/'`common/filter_flags_decoder.c liblzma_la-index_decoder.lo: common/index_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index_decoder.Tpo -c -o liblzma_la-index_decoder.lo `test -f 'common/index_decoder.c' || echo '$(srcdir)/'`common/index_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-index_decoder.Tpo $(DEPDIR)/liblzma_la-index_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/index_decoder.c' object='liblzma_la-index_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index_decoder.Tpo -c -o liblzma_la-index_decoder.lo `test -f 'common/index_decoder.c' || echo '$(srcdir)/'`common/index_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-index_decoder.Tpo $(DEPDIR)/liblzma_la-index_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/index_decoder.c' object='liblzma_la-index_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index_decoder.lo `test -f 'common/index_decoder.c' || echo '$(srcdir)/'`common/index_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index_decoder.lo `test -f 'common/index_decoder.c' || echo '$(srcdir)/'`common/index_decoder.c liblzma_la-index_hash.lo: common/index_hash.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index_hash.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index_hash.Tpo -c -o liblzma_la-index_hash.lo `test -f 'common/index_hash.c' || echo '$(srcdir)/'`common/index_hash.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-index_hash.Tpo $(DEPDIR)/liblzma_la-index_hash.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/index_hash.c' object='liblzma_la-index_hash.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-index_hash.lo -MD -MP -MF $(DEPDIR)/liblzma_la-index_hash.Tpo -c -o liblzma_la-index_hash.lo `test -f 'common/index_hash.c' || echo '$(srcdir)/'`common/index_hash.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-index_hash.Tpo $(DEPDIR)/liblzma_la-index_hash.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/index_hash.c' object='liblzma_la-index_hash.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index_hash.lo `test -f 'common/index_hash.c' || echo '$(srcdir)/'`common/index_hash.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-index_hash.lo `test -f 'common/index_hash.c' || echo '$(srcdir)/'`common/index_hash.c liblzma_la-stream_buffer_decoder.lo: common/stream_buffer_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_buffer_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_buffer_decoder.Tpo -c -o liblzma_la-stream_buffer_decoder.lo `test -f 'common/stream_buffer_decoder.c' || echo '$(srcdir)/'`common/stream_buffer_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_buffer_decoder.Tpo $(DEPDIR)/liblzma_la-stream_buffer_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_buffer_decoder.c' object='liblzma_la-stream_buffer_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_buffer_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_buffer_decoder.Tpo -c -o liblzma_la-stream_buffer_decoder.lo `test -f 'common/stream_buffer_decoder.c' || echo '$(srcdir)/'`common/stream_buffer_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_buffer_decoder.Tpo $(DEPDIR)/liblzma_la-stream_buffer_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_buffer_decoder.c' object='liblzma_la-stream_buffer_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_buffer_decoder.lo `test -f 'common/stream_buffer_decoder.c' || echo '$(srcdir)/'`common/stream_buffer_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_buffer_decoder.lo `test -f 'common/stream_buffer_decoder.c' || echo '$(srcdir)/'`common/stream_buffer_decoder.c liblzma_la-stream_decoder.lo: common/stream_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_decoder.Tpo -c -o liblzma_la-stream_decoder.lo `test -f 'common/stream_decoder.c' || echo '$(srcdir)/'`common/stream_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_decoder.Tpo $(DEPDIR)/liblzma_la-stream_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_decoder.c' object='liblzma_la-stream_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_decoder.Tpo -c -o liblzma_la-stream_decoder.lo `test -f 'common/stream_decoder.c' || echo '$(srcdir)/'`common/stream_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_decoder.Tpo $(DEPDIR)/liblzma_la-stream_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_decoder.c' object='liblzma_la-stream_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_decoder.lo `test -f 'common/stream_decoder.c' || echo '$(srcdir)/'`common/stream_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_decoder.lo `test -f 'common/stream_decoder.c' || echo '$(srcdir)/'`common/stream_decoder.c liblzma_la-stream_flags_decoder.lo: common/stream_flags_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_flags_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_flags_decoder.Tpo -c -o liblzma_la-stream_flags_decoder.lo `test -f 'common/stream_flags_decoder.c' || echo '$(srcdir)/'`common/stream_flags_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-stream_flags_decoder.Tpo $(DEPDIR)/liblzma_la-stream_flags_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/stream_flags_decoder.c' object='liblzma_la-stream_flags_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-stream_flags_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-stream_flags_decoder.Tpo -c -o liblzma_la-stream_flags_decoder.lo `test -f 'common/stream_flags_decoder.c' || echo '$(srcdir)/'`common/stream_flags_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-stream_flags_decoder.Tpo $(DEPDIR)/liblzma_la-stream_flags_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/stream_flags_decoder.c' object='liblzma_la-stream_flags_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_flags_decoder.lo `test -f 'common/stream_flags_decoder.c' || echo '$(srcdir)/'`common/stream_flags_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-stream_flags_decoder.lo `test -f 'common/stream_flags_decoder.c' || echo '$(srcdir)/'`common/stream_flags_decoder.c liblzma_la-vli_decoder.lo: common/vli_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-vli_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-vli_decoder.Tpo -c -o liblzma_la-vli_decoder.lo `test -f 'common/vli_decoder.c' || echo '$(srcdir)/'`common/vli_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-vli_decoder.Tpo $(DEPDIR)/liblzma_la-vli_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='common/vli_decoder.c' object='liblzma_la-vli_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-vli_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-vli_decoder.Tpo -c -o liblzma_la-vli_decoder.lo `test -f 'common/vli_decoder.c' || echo '$(srcdir)/'`common/vli_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-vli_decoder.Tpo $(DEPDIR)/liblzma_la-vli_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='common/vli_decoder.c' object='liblzma_la-vli_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_decoder.lo `test -f 'common/vli_decoder.c' || echo '$(srcdir)/'`common/vli_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-vli_decoder.lo `test -f 'common/vli_decoder.c' || echo '$(srcdir)/'`common/vli_decoder.c liblzma_la-check.lo: check/check.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-check.lo -MD -MP -MF $(DEPDIR)/liblzma_la-check.Tpo -c -o liblzma_la-check.lo `test -f 'check/check.c' || echo '$(srcdir)/'`check/check.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-check.Tpo $(DEPDIR)/liblzma_la-check.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/check.c' object='liblzma_la-check.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-check.lo -MD -MP -MF $(DEPDIR)/liblzma_la-check.Tpo -c -o liblzma_la-check.lo `test -f 'check/check.c' || echo '$(srcdir)/'`check/check.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-check.Tpo $(DEPDIR)/liblzma_la-check.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/check.c' object='liblzma_la-check.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-check.lo `test -f 'check/check.c' || echo '$(srcdir)/'`check/check.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-check.lo `test -f 'check/check.c' || echo '$(srcdir)/'`check/check.c liblzma_la-crc32_small.lo: check/crc32_small.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc32_small.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_small.Tpo -c -o liblzma_la-crc32_small.lo `test -f 'check/crc32_small.c' || echo '$(srcdir)/'`check/crc32_small.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc32_small.Tpo $(DEPDIR)/liblzma_la-crc32_small.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/crc32_small.c' object='liblzma_la-crc32_small.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc32_small.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_small.Tpo -c -o liblzma_la-crc32_small.lo `test -f 'check/crc32_small.c' || echo '$(srcdir)/'`check/crc32_small.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc32_small.Tpo $(DEPDIR)/liblzma_la-crc32_small.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/crc32_small.c' object='liblzma_la-crc32_small.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc32_small.lo `test -f 'check/crc32_small.c' || echo '$(srcdir)/'`check/crc32_small.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc32_small.lo `test -f 'check/crc32_small.c' || echo '$(srcdir)/'`check/crc32_small.c liblzma_la-crc32_table.lo: check/crc32_table.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc32_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_table.Tpo -c -o liblzma_la-crc32_table.lo `test -f 'check/crc32_table.c' || echo '$(srcdir)/'`check/crc32_table.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc32_table.Tpo $(DEPDIR)/liblzma_la-crc32_table.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/crc32_table.c' object='liblzma_la-crc32_table.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc32_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_table.Tpo -c -o liblzma_la-crc32_table.lo `test -f 'check/crc32_table.c' || echo '$(srcdir)/'`check/crc32_table.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc32_table.Tpo $(DEPDIR)/liblzma_la-crc32_table.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/crc32_table.c' object='liblzma_la-crc32_table.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc32_table.lo `test -f 'check/crc32_table.c' || echo '$(srcdir)/'`check/crc32_table.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc32_table.lo `test -f 'check/crc32_table.c' || echo '$(srcdir)/'`check/crc32_table.c liblzma_la-crc32_fast.lo: check/crc32_fast.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc32_fast.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_fast.Tpo -c -o liblzma_la-crc32_fast.lo `test -f 'check/crc32_fast.c' || echo '$(srcdir)/'`check/crc32_fast.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc32_fast.Tpo $(DEPDIR)/liblzma_la-crc32_fast.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/crc32_fast.c' object='liblzma_la-crc32_fast.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc32_fast.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc32_fast.Tpo -c -o liblzma_la-crc32_fast.lo `test -f 'check/crc32_fast.c' || echo '$(srcdir)/'`check/crc32_fast.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc32_fast.Tpo $(DEPDIR)/liblzma_la-crc32_fast.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/crc32_fast.c' object='liblzma_la-crc32_fast.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc32_fast.lo `test -f 'check/crc32_fast.c' || echo '$(srcdir)/'`check/crc32_fast.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc32_fast.lo `test -f 'check/crc32_fast.c' || echo '$(srcdir)/'`check/crc32_fast.c liblzma_la-crc64_small.lo: check/crc64_small.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc64_small.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_small.Tpo -c -o liblzma_la-crc64_small.lo `test -f 'check/crc64_small.c' || echo '$(srcdir)/'`check/crc64_small.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc64_small.Tpo $(DEPDIR)/liblzma_la-crc64_small.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/crc64_small.c' object='liblzma_la-crc64_small.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc64_small.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_small.Tpo -c -o liblzma_la-crc64_small.lo `test -f 'check/crc64_small.c' || echo '$(srcdir)/'`check/crc64_small.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc64_small.Tpo $(DEPDIR)/liblzma_la-crc64_small.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/crc64_small.c' object='liblzma_la-crc64_small.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc64_small.lo `test -f 'check/crc64_small.c' || echo '$(srcdir)/'`check/crc64_small.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc64_small.lo `test -f 'check/crc64_small.c' || echo '$(srcdir)/'`check/crc64_small.c liblzma_la-crc64_table.lo: check/crc64_table.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc64_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_table.Tpo -c -o liblzma_la-crc64_table.lo `test -f 'check/crc64_table.c' || echo '$(srcdir)/'`check/crc64_table.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc64_table.Tpo $(DEPDIR)/liblzma_la-crc64_table.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/crc64_table.c' object='liblzma_la-crc64_table.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc64_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_table.Tpo -c -o liblzma_la-crc64_table.lo `test -f 'check/crc64_table.c' || echo '$(srcdir)/'`check/crc64_table.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc64_table.Tpo $(DEPDIR)/liblzma_la-crc64_table.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/crc64_table.c' object='liblzma_la-crc64_table.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc64_table.lo `test -f 'check/crc64_table.c' || echo '$(srcdir)/'`check/crc64_table.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc64_table.lo `test -f 'check/crc64_table.c' || echo '$(srcdir)/'`check/crc64_table.c liblzma_la-crc64_fast.lo: check/crc64_fast.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc64_fast.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_fast.Tpo -c -o liblzma_la-crc64_fast.lo `test -f 'check/crc64_fast.c' || echo '$(srcdir)/'`check/crc64_fast.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-crc64_fast.Tpo $(DEPDIR)/liblzma_la-crc64_fast.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/crc64_fast.c' object='liblzma_la-crc64_fast.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-crc64_fast.lo -MD -MP -MF $(DEPDIR)/liblzma_la-crc64_fast.Tpo -c -o liblzma_la-crc64_fast.lo `test -f 'check/crc64_fast.c' || echo '$(srcdir)/'`check/crc64_fast.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-crc64_fast.Tpo $(DEPDIR)/liblzma_la-crc64_fast.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/crc64_fast.c' object='liblzma_la-crc64_fast.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc64_fast.lo `test -f 'check/crc64_fast.c' || echo '$(srcdir)/'`check/crc64_fast.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-crc64_fast.lo `test -f 'check/crc64_fast.c' || echo '$(srcdir)/'`check/crc64_fast.c liblzma_la-sha256.lo: check/sha256.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-sha256.lo -MD -MP -MF $(DEPDIR)/liblzma_la-sha256.Tpo -c -o liblzma_la-sha256.lo `test -f 'check/sha256.c' || echo '$(srcdir)/'`check/sha256.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-sha256.Tpo $(DEPDIR)/liblzma_la-sha256.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='check/sha256.c' object='liblzma_la-sha256.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-sha256.lo -MD -MP -MF $(DEPDIR)/liblzma_la-sha256.Tpo -c -o liblzma_la-sha256.lo `test -f 'check/sha256.c' || echo '$(srcdir)/'`check/sha256.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-sha256.Tpo $(DEPDIR)/liblzma_la-sha256.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='check/sha256.c' object='liblzma_la-sha256.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-sha256.lo `test -f 'check/sha256.c' || echo '$(srcdir)/'`check/sha256.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-sha256.lo `test -f 'check/sha256.c' || echo '$(srcdir)/'`check/sha256.c liblzma_la-lz_encoder.lo: lz/lz_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lz_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lz_encoder.Tpo -c -o liblzma_la-lz_encoder.lo `test -f 'lz/lz_encoder.c' || echo '$(srcdir)/'`lz/lz_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lz_encoder.Tpo $(DEPDIR)/liblzma_la-lz_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lz/lz_encoder.c' object='liblzma_la-lz_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lz_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lz_encoder.Tpo -c -o liblzma_la-lz_encoder.lo `test -f 'lz/lz_encoder.c' || echo '$(srcdir)/'`lz/lz_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lz_encoder.Tpo $(DEPDIR)/liblzma_la-lz_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lz/lz_encoder.c' object='liblzma_la-lz_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_encoder.lo `test -f 'lz/lz_encoder.c' || echo '$(srcdir)/'`lz/lz_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_encoder.lo `test -f 'lz/lz_encoder.c' || echo '$(srcdir)/'`lz/lz_encoder.c liblzma_la-lz_encoder_mf.lo: lz/lz_encoder_mf.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lz_encoder_mf.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lz_encoder_mf.Tpo -c -o liblzma_la-lz_encoder_mf.lo `test -f 'lz/lz_encoder_mf.c' || echo '$(srcdir)/'`lz/lz_encoder_mf.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lz_encoder_mf.Tpo $(DEPDIR)/liblzma_la-lz_encoder_mf.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lz/lz_encoder_mf.c' object='liblzma_la-lz_encoder_mf.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lz_encoder_mf.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lz_encoder_mf.Tpo -c -o liblzma_la-lz_encoder_mf.lo `test -f 'lz/lz_encoder_mf.c' || echo '$(srcdir)/'`lz/lz_encoder_mf.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lz_encoder_mf.Tpo $(DEPDIR)/liblzma_la-lz_encoder_mf.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lz/lz_encoder_mf.c' object='liblzma_la-lz_encoder_mf.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_encoder_mf.lo `test -f 'lz/lz_encoder_mf.c' || echo '$(srcdir)/'`lz/lz_encoder_mf.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_encoder_mf.lo `test -f 'lz/lz_encoder_mf.c' || echo '$(srcdir)/'`lz/lz_encoder_mf.c liblzma_la-lz_decoder.lo: lz/lz_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lz_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lz_decoder.Tpo -c -o liblzma_la-lz_decoder.lo `test -f 'lz/lz_decoder.c' || echo '$(srcdir)/'`lz/lz_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lz_decoder.Tpo $(DEPDIR)/liblzma_la-lz_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lz/lz_decoder.c' object='liblzma_la-lz_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lz_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lz_decoder.Tpo -c -o liblzma_la-lz_decoder.lo `test -f 'lz/lz_decoder.c' || echo '$(srcdir)/'`lz/lz_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lz_decoder.Tpo $(DEPDIR)/liblzma_la-lz_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lz/lz_decoder.c' object='liblzma_la-lz_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_decoder.lo `test -f 'lz/lz_decoder.c' || echo '$(srcdir)/'`lz/lz_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lz_decoder.lo `test -f 'lz/lz_decoder.c' || echo '$(srcdir)/'`lz/lz_decoder.c liblzma_la-lzma_encoder.lo: lzma/lzma_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder.Tpo -c -o liblzma_la-lzma_encoder.lo `test -f 'lzma/lzma_encoder.c' || echo '$(srcdir)/'`lzma/lzma_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder.Tpo $(DEPDIR)/liblzma_la-lzma_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma_encoder.c' object='liblzma_la-lzma_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder.Tpo -c -o liblzma_la-lzma_encoder.lo `test -f 'lzma/lzma_encoder.c' || echo '$(srcdir)/'`lzma/lzma_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder.Tpo $(DEPDIR)/liblzma_la-lzma_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma_encoder.c' object='liblzma_la-lzma_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder.lo `test -f 'lzma/lzma_encoder.c' || echo '$(srcdir)/'`lzma/lzma_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder.lo `test -f 'lzma/lzma_encoder.c' || echo '$(srcdir)/'`lzma/lzma_encoder.c liblzma_la-lzma_encoder_presets.lo: lzma/lzma_encoder_presets.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_presets.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_presets.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma_encoder_presets.c' object='liblzma_la-lzma_encoder_presets.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_presets.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_presets.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_presets.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma_encoder_presets.c' object='liblzma_la-lzma_encoder_presets.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_presets.lo `test -f 'lzma/lzma_encoder_presets.c' || echo '$(srcdir)/'`lzma/lzma_encoder_presets.c liblzma_la-lzma_encoder_optimum_fast.lo: lzma/lzma_encoder_optimum_fast.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_optimum_fast.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_optimum_fast.Tpo -c -o liblzma_la-lzma_encoder_optimum_fast.lo `test -f 'lzma/lzma_encoder_optimum_fast.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_fast.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_optimum_fast.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_optimum_fast.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma_encoder_optimum_fast.c' object='liblzma_la-lzma_encoder_optimum_fast.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_optimum_fast.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_optimum_fast.Tpo -c -o liblzma_la-lzma_encoder_optimum_fast.lo `test -f 'lzma/lzma_encoder_optimum_fast.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_fast.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_optimum_fast.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_optimum_fast.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma_encoder_optimum_fast.c' object='liblzma_la-lzma_encoder_optimum_fast.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_optimum_fast.lo `test -f 'lzma/lzma_encoder_optimum_fast.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_fast.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_optimum_fast.lo `test -f 'lzma/lzma_encoder_optimum_fast.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_fast.c liblzma_la-lzma_encoder_optimum_normal.lo: lzma/lzma_encoder_optimum_normal.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_optimum_normal.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_optimum_normal.Tpo -c -o liblzma_la-lzma_encoder_optimum_normal.lo `test -f 'lzma/lzma_encoder_optimum_normal.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_normal.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_optimum_normal.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_optimum_normal.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma_encoder_optimum_normal.c' object='liblzma_la-lzma_encoder_optimum_normal.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_encoder_optimum_normal.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_encoder_optimum_normal.Tpo -c -o liblzma_la-lzma_encoder_optimum_normal.lo `test -f 'lzma/lzma_encoder_optimum_normal.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_normal.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_encoder_optimum_normal.Tpo $(DEPDIR)/liblzma_la-lzma_encoder_optimum_normal.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma_encoder_optimum_normal.c' object='liblzma_la-lzma_encoder_optimum_normal.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_optimum_normal.lo `test -f 'lzma/lzma_encoder_optimum_normal.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_normal.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_encoder_optimum_normal.lo `test -f 'lzma/lzma_encoder_optimum_normal.c' || echo '$(srcdir)/'`lzma/lzma_encoder_optimum_normal.c liblzma_la-fastpos_table.lo: lzma/fastpos_table.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-fastpos_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-fastpos_table.Tpo -c -o liblzma_la-fastpos_table.lo `test -f 'lzma/fastpos_table.c' || echo '$(srcdir)/'`lzma/fastpos_table.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-fastpos_table.Tpo $(DEPDIR)/liblzma_la-fastpos_table.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/fastpos_table.c' object='liblzma_la-fastpos_table.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-fastpos_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-fastpos_table.Tpo -c -o liblzma_la-fastpos_table.lo `test -f 'lzma/fastpos_table.c' || echo '$(srcdir)/'`lzma/fastpos_table.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-fastpos_table.Tpo $(DEPDIR)/liblzma_la-fastpos_table.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/fastpos_table.c' object='liblzma_la-fastpos_table.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-fastpos_table.lo `test -f 'lzma/fastpos_table.c' || echo '$(srcdir)/'`lzma/fastpos_table.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-fastpos_table.lo `test -f 'lzma/fastpos_table.c' || echo '$(srcdir)/'`lzma/fastpos_table.c liblzma_la-lzma_decoder.lo: lzma/lzma_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_decoder.Tpo -c -o liblzma_la-lzma_decoder.lo `test -f 'lzma/lzma_decoder.c' || echo '$(srcdir)/'`lzma/lzma_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma_decoder.Tpo $(DEPDIR)/liblzma_la-lzma_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma_decoder.c' object='liblzma_la-lzma_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma_decoder.Tpo -c -o liblzma_la-lzma_decoder.lo `test -f 'lzma/lzma_decoder.c' || echo '$(srcdir)/'`lzma/lzma_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma_decoder.Tpo $(DEPDIR)/liblzma_la-lzma_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma_decoder.c' object='liblzma_la-lzma_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_decoder.lo `test -f 'lzma/lzma_decoder.c' || echo '$(srcdir)/'`lzma/lzma_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma_decoder.lo `test -f 'lzma/lzma_decoder.c' || echo '$(srcdir)/'`lzma/lzma_decoder.c liblzma_la-lzma2_encoder.lo: lzma/lzma2_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma2_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma2_encoder.Tpo -c -o liblzma_la-lzma2_encoder.lo `test -f 'lzma/lzma2_encoder.c' || echo '$(srcdir)/'`lzma/lzma2_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma2_encoder.Tpo $(DEPDIR)/liblzma_la-lzma2_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma2_encoder.c' object='liblzma_la-lzma2_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma2_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma2_encoder.Tpo -c -o liblzma_la-lzma2_encoder.lo `test -f 'lzma/lzma2_encoder.c' || echo '$(srcdir)/'`lzma/lzma2_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma2_encoder.Tpo $(DEPDIR)/liblzma_la-lzma2_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma2_encoder.c' object='liblzma_la-lzma2_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma2_encoder.lo `test -f 'lzma/lzma2_encoder.c' || echo '$(srcdir)/'`lzma/lzma2_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma2_encoder.lo `test -f 'lzma/lzma2_encoder.c' || echo '$(srcdir)/'`lzma/lzma2_encoder.c liblzma_la-lzma2_decoder.lo: lzma/lzma2_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma2_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma2_decoder.Tpo -c -o liblzma_la-lzma2_decoder.lo `test -f 'lzma/lzma2_decoder.c' || echo '$(srcdir)/'`lzma/lzma2_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-lzma2_decoder.Tpo $(DEPDIR)/liblzma_la-lzma2_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzma/lzma2_decoder.c' object='liblzma_la-lzma2_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-lzma2_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-lzma2_decoder.Tpo -c -o liblzma_la-lzma2_decoder.lo `test -f 'lzma/lzma2_decoder.c' || echo '$(srcdir)/'`lzma/lzma2_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-lzma2_decoder.Tpo $(DEPDIR)/liblzma_la-lzma2_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzma/lzma2_decoder.c' object='liblzma_la-lzma2_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma2_decoder.lo `test -f 'lzma/lzma2_decoder.c' || echo '$(srcdir)/'`lzma/lzma2_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-lzma2_decoder.lo `test -f 'lzma/lzma2_decoder.c' || echo '$(srcdir)/'`lzma/lzma2_decoder.c liblzma_la-price_table.lo: rangecoder/price_table.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-price_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-price_table.Tpo -c -o liblzma_la-price_table.lo `test -f 'rangecoder/price_table.c' || echo '$(srcdir)/'`rangecoder/price_table.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-price_table.Tpo $(DEPDIR)/liblzma_la-price_table.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='rangecoder/price_table.c' object='liblzma_la-price_table.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-price_table.lo -MD -MP -MF $(DEPDIR)/liblzma_la-price_table.Tpo -c -o liblzma_la-price_table.lo `test -f 'rangecoder/price_table.c' || echo '$(srcdir)/'`rangecoder/price_table.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-price_table.Tpo $(DEPDIR)/liblzma_la-price_table.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='rangecoder/price_table.c' object='liblzma_la-price_table.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-price_table.lo `test -f 'rangecoder/price_table.c' || echo '$(srcdir)/'`rangecoder/price_table.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-price_table.lo `test -f 'rangecoder/price_table.c' || echo '$(srcdir)/'`rangecoder/price_table.c liblzma_la-delta_common.lo: delta/delta_common.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-delta_common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-delta_common.Tpo -c -o liblzma_la-delta_common.lo `test -f 'delta/delta_common.c' || echo '$(srcdir)/'`delta/delta_common.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-delta_common.Tpo $(DEPDIR)/liblzma_la-delta_common.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='delta/delta_common.c' object='liblzma_la-delta_common.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-delta_common.lo -MD -MP -MF $(DEPDIR)/liblzma_la-delta_common.Tpo -c -o liblzma_la-delta_common.lo `test -f 'delta/delta_common.c' || echo '$(srcdir)/'`delta/delta_common.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-delta_common.Tpo $(DEPDIR)/liblzma_la-delta_common.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='delta/delta_common.c' object='liblzma_la-delta_common.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-delta_common.lo `test -f 'delta/delta_common.c' || echo '$(srcdir)/'`delta/delta_common.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-delta_common.lo `test -f 'delta/delta_common.c' || echo '$(srcdir)/'`delta/delta_common.c liblzma_la-delta_encoder.lo: delta/delta_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-delta_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-delta_encoder.Tpo -c -o liblzma_la-delta_encoder.lo `test -f 'delta/delta_encoder.c' || echo '$(srcdir)/'`delta/delta_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-delta_encoder.Tpo $(DEPDIR)/liblzma_la-delta_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='delta/delta_encoder.c' object='liblzma_la-delta_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-delta_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-delta_encoder.Tpo -c -o liblzma_la-delta_encoder.lo `test -f 'delta/delta_encoder.c' || echo '$(srcdir)/'`delta/delta_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-delta_encoder.Tpo $(DEPDIR)/liblzma_la-delta_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='delta/delta_encoder.c' object='liblzma_la-delta_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-delta_encoder.lo `test -f 'delta/delta_encoder.c' || echo '$(srcdir)/'`delta/delta_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-delta_encoder.lo `test -f 'delta/delta_encoder.c' || echo '$(srcdir)/'`delta/delta_encoder.c liblzma_la-delta_decoder.lo: delta/delta_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-delta_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-delta_decoder.Tpo -c -o liblzma_la-delta_decoder.lo `test -f 'delta/delta_decoder.c' || echo '$(srcdir)/'`delta/delta_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-delta_decoder.Tpo $(DEPDIR)/liblzma_la-delta_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='delta/delta_decoder.c' object='liblzma_la-delta_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-delta_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-delta_decoder.Tpo -c -o liblzma_la-delta_decoder.lo `test -f 'delta/delta_decoder.c' || echo '$(srcdir)/'`delta/delta_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-delta_decoder.Tpo $(DEPDIR)/liblzma_la-delta_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='delta/delta_decoder.c' object='liblzma_la-delta_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-delta_decoder.lo `test -f 'delta/delta_decoder.c' || echo '$(srcdir)/'`delta/delta_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-delta_decoder.lo `test -f 'delta/delta_decoder.c' || echo '$(srcdir)/'`delta/delta_decoder.c liblzma_la-simple_coder.lo: simple/simple_coder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-simple_coder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-simple_coder.Tpo -c -o liblzma_la-simple_coder.lo `test -f 'simple/simple_coder.c' || echo '$(srcdir)/'`simple/simple_coder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-simple_coder.Tpo $(DEPDIR)/liblzma_la-simple_coder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/simple_coder.c' object='liblzma_la-simple_coder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-simple_coder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-simple_coder.Tpo -c -o liblzma_la-simple_coder.lo `test -f 'simple/simple_coder.c' || echo '$(srcdir)/'`simple/simple_coder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-simple_coder.Tpo $(DEPDIR)/liblzma_la-simple_coder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/simple_coder.c' object='liblzma_la-simple_coder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-simple_coder.lo `test -f 'simple/simple_coder.c' || echo '$(srcdir)/'`simple/simple_coder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-simple_coder.lo `test -f 'simple/simple_coder.c' || echo '$(srcdir)/'`simple/simple_coder.c liblzma_la-simple_encoder.lo: simple/simple_encoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-simple_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-simple_encoder.Tpo -c -o liblzma_la-simple_encoder.lo `test -f 'simple/simple_encoder.c' || echo '$(srcdir)/'`simple/simple_encoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-simple_encoder.Tpo $(DEPDIR)/liblzma_la-simple_encoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/simple_encoder.c' object='liblzma_la-simple_encoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-simple_encoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-simple_encoder.Tpo -c -o liblzma_la-simple_encoder.lo `test -f 'simple/simple_encoder.c' || echo '$(srcdir)/'`simple/simple_encoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-simple_encoder.Tpo $(DEPDIR)/liblzma_la-simple_encoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/simple_encoder.c' object='liblzma_la-simple_encoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-simple_encoder.lo `test -f 'simple/simple_encoder.c' || echo '$(srcdir)/'`simple/simple_encoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-simple_encoder.lo `test -f 'simple/simple_encoder.c' || echo '$(srcdir)/'`simple/simple_encoder.c liblzma_la-simple_decoder.lo: simple/simple_decoder.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-simple_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-simple_decoder.Tpo -c -o liblzma_la-simple_decoder.lo `test -f 'simple/simple_decoder.c' || echo '$(srcdir)/'`simple/simple_decoder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-simple_decoder.Tpo $(DEPDIR)/liblzma_la-simple_decoder.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/simple_decoder.c' object='liblzma_la-simple_decoder.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-simple_decoder.lo -MD -MP -MF $(DEPDIR)/liblzma_la-simple_decoder.Tpo -c -o liblzma_la-simple_decoder.lo `test -f 'simple/simple_decoder.c' || echo '$(srcdir)/'`simple/simple_decoder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-simple_decoder.Tpo $(DEPDIR)/liblzma_la-simple_decoder.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/simple_decoder.c' object='liblzma_la-simple_decoder.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-simple_decoder.lo `test -f 'simple/simple_decoder.c' || echo '$(srcdir)/'`simple/simple_decoder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-simple_decoder.lo `test -f 'simple/simple_decoder.c' || echo '$(srcdir)/'`simple/simple_decoder.c liblzma_la-x86.lo: simple/x86.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-x86.lo -MD -MP -MF $(DEPDIR)/liblzma_la-x86.Tpo -c -o liblzma_la-x86.lo `test -f 'simple/x86.c' || echo '$(srcdir)/'`simple/x86.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-x86.Tpo $(DEPDIR)/liblzma_la-x86.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/x86.c' object='liblzma_la-x86.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-x86.lo -MD -MP -MF $(DEPDIR)/liblzma_la-x86.Tpo -c -o liblzma_la-x86.lo `test -f 'simple/x86.c' || echo '$(srcdir)/'`simple/x86.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-x86.Tpo $(DEPDIR)/liblzma_la-x86.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/x86.c' object='liblzma_la-x86.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-x86.lo `test -f 'simple/x86.c' || echo '$(srcdir)/'`simple/x86.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-x86.lo `test -f 'simple/x86.c' || echo '$(srcdir)/'`simple/x86.c liblzma_la-powerpc.lo: simple/powerpc.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-powerpc.lo -MD -MP -MF $(DEPDIR)/liblzma_la-powerpc.Tpo -c -o liblzma_la-powerpc.lo `test -f 'simple/powerpc.c' || echo '$(srcdir)/'`simple/powerpc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-powerpc.Tpo $(DEPDIR)/liblzma_la-powerpc.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/powerpc.c' object='liblzma_la-powerpc.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-powerpc.lo -MD -MP -MF $(DEPDIR)/liblzma_la-powerpc.Tpo -c -o liblzma_la-powerpc.lo `test -f 'simple/powerpc.c' || echo '$(srcdir)/'`simple/powerpc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-powerpc.Tpo $(DEPDIR)/liblzma_la-powerpc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/powerpc.c' object='liblzma_la-powerpc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-powerpc.lo `test -f 'simple/powerpc.c' || echo '$(srcdir)/'`simple/powerpc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-powerpc.lo `test -f 'simple/powerpc.c' || echo '$(srcdir)/'`simple/powerpc.c liblzma_la-ia64.lo: simple/ia64.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-ia64.lo -MD -MP -MF $(DEPDIR)/liblzma_la-ia64.Tpo -c -o liblzma_la-ia64.lo `test -f 'simple/ia64.c' || echo '$(srcdir)/'`simple/ia64.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-ia64.Tpo $(DEPDIR)/liblzma_la-ia64.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/ia64.c' object='liblzma_la-ia64.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-ia64.lo -MD -MP -MF $(DEPDIR)/liblzma_la-ia64.Tpo -c -o liblzma_la-ia64.lo `test -f 'simple/ia64.c' || echo '$(srcdir)/'`simple/ia64.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-ia64.Tpo $(DEPDIR)/liblzma_la-ia64.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/ia64.c' object='liblzma_la-ia64.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-ia64.lo `test -f 'simple/ia64.c' || echo '$(srcdir)/'`simple/ia64.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-ia64.lo `test -f 'simple/ia64.c' || echo '$(srcdir)/'`simple/ia64.c liblzma_la-arm.lo: simple/arm.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-arm.lo -MD -MP -MF $(DEPDIR)/liblzma_la-arm.Tpo -c -o liblzma_la-arm.lo `test -f 'simple/arm.c' || echo '$(srcdir)/'`simple/arm.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-arm.Tpo $(DEPDIR)/liblzma_la-arm.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/arm.c' object='liblzma_la-arm.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-arm.lo -MD -MP -MF $(DEPDIR)/liblzma_la-arm.Tpo -c -o liblzma_la-arm.lo `test -f 'simple/arm.c' || echo '$(srcdir)/'`simple/arm.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-arm.Tpo $(DEPDIR)/liblzma_la-arm.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/arm.c' object='liblzma_la-arm.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-arm.lo `test -f 'simple/arm.c' || echo '$(srcdir)/'`simple/arm.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-arm.lo `test -f 'simple/arm.c' || echo '$(srcdir)/'`simple/arm.c liblzma_la-armthumb.lo: simple/armthumb.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-armthumb.lo -MD -MP -MF $(DEPDIR)/liblzma_la-armthumb.Tpo -c -o liblzma_la-armthumb.lo `test -f 'simple/armthumb.c' || echo '$(srcdir)/'`simple/armthumb.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-armthumb.Tpo $(DEPDIR)/liblzma_la-armthumb.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/armthumb.c' object='liblzma_la-armthumb.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-armthumb.lo -MD -MP -MF $(DEPDIR)/liblzma_la-armthumb.Tpo -c -o liblzma_la-armthumb.lo `test -f 'simple/armthumb.c' || echo '$(srcdir)/'`simple/armthumb.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-armthumb.Tpo $(DEPDIR)/liblzma_la-armthumb.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/armthumb.c' object='liblzma_la-armthumb.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-armthumb.lo `test -f 'simple/armthumb.c' || echo '$(srcdir)/'`simple/armthumb.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-armthumb.lo `test -f 'simple/armthumb.c' || echo '$(srcdir)/'`simple/armthumb.c liblzma_la-sparc.lo: simple/sparc.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-sparc.lo -MD -MP -MF $(DEPDIR)/liblzma_la-sparc.Tpo -c -o liblzma_la-sparc.lo `test -f 'simple/sparc.c' || echo '$(srcdir)/'`simple/sparc.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/liblzma_la-sparc.Tpo $(DEPDIR)/liblzma_la-sparc.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='simple/sparc.c' object='liblzma_la-sparc.lo' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT liblzma_la-sparc.lo -MD -MP -MF $(DEPDIR)/liblzma_la-sparc.Tpo -c -o liblzma_la-sparc.lo `test -f 'simple/sparc.c' || echo '$(srcdir)/'`simple/sparc.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/liblzma_la-sparc.Tpo $(DEPDIR)/liblzma_la-sparc.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='simple/sparc.c' object='liblzma_la-sparc.lo' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-sparc.lo `test -f 'simple/sparc.c' || echo '$(srcdir)/'`simple/sparc.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(liblzma_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o liblzma_la-sparc.lo `test -f 'simple/sparc.c' || echo '$(srcdir)/'`simple/sparc.c mostlyclean-libtool: -rm -f *.lo @@ -1323,8 +1439,11 @@ clean-libtool: -rm -rf .libs _libs install-docDATA: $(doc_DATA) @$(NORMAL_INSTALL) - test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)" @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1338,13 +1457,14 @@ uninstall-docDATA: @$(NORMAL_UNINSTALL) @list='$(doc_DATA)'; test -n "$(docdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(docdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(docdir)" && rm -f $$files + dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir) install-pkgconfigDATA: $(pkgconfig_DATA) @$(NORMAL_INSTALL) - test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(pkgconfigdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; \ @@ -1358,27 +1478,28 @@ uninstall-pkgconfigDATA: @$(NORMAL_UNINSTALL) @list='$(pkgconfig_DATA)'; test -n "$(pkgconfigdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(pkgconfigdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(pkgconfigdir)" && rm -f $$files + dir='$(DESTDIR)$(pkgconfigdir)'; $(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. -# To change the values of `make' variables: instead of editing Makefiles, -# (1) if the variable is set in `config.status', edit `config.status' -# (which will cause the Makefiles to be regenerated when you run `make'); -# (2) otherwise, pass the desired values on the `make' command line. -$(RECURSIVE_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ +# into them and run 'make' without going through this Makefile. +# To change the values of 'make' variables: instead of editing Makefiles, +# (1) if the variable is set in 'config.status', edit 'config.status' +# (which will cause the Makefiles to be regenerated when you run 'make'); +# (2) otherwise, pass the desired values on the 'make' command line. +$(am__recursive_targets): + @fail=; \ + if $(am__make_keepgoing); then \ + failcom='fail=yes'; \ + else \ + failcom='exit 1'; \ + fi; \ dot_seen=no; \ target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ + case "$@" in \ + distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ + *) list='$(SUBDIRS)' ;; \ + esac; \ + for subdir in $$list; do \ echo "Making $$target in $$subdir"; \ if test "$$subdir" = "."; then \ dot_seen=yes; \ @@ -1393,57 +1514,12 @@ $(RECURSIVE_TARGETS): $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ fi; test -z "$$fail" -$(RECURSIVE_CLEAN_TARGETS): - @fail= failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - case "$@" in \ - distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \ - *) list='$(SUBDIRS)' ;; \ - esac; \ - rev=''; for subdir in $$list; do \ - if test "$$subdir" = "."; then :; else \ - rev="$$subdir $$rev"; \ - fi; \ - done; \ - rev="$$rev ."; \ - target=`echo $@ | sed s/-recursive//`; \ - for subdir in $$rev; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done && test -z "$$fail" -tags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \ - done -ctags-recursive: - list='$(SUBDIRS)'; for subdir in $$list; do \ - test "$$subdir" = . || ($(am__cd) $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \ - done +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-recursive +TAGS: tags -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \ @@ -1459,12 +1535,7 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ set "$$@" "$$include_option=$$here/$$subdir/TAGS"; \ fi; \ done; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -1476,15 +1547,11 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-recursive + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -1493,6 +1560,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-recursive + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -1529,13 +1611,10 @@ distdir: $(DISTFILES) done @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ if test "$$subdir" = .; then :; else \ - test -d "$(distdir)/$$subdir" \ - || $(MKDIR_P) "$(distdir)/$$subdir" \ - || exit 1; \ - fi; \ - done - @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ - if test "$$subdir" = .; then :; else \ + $(am__make_dryrun) \ + || test -d "$(distdir)/$$subdir" \ + || $(MKDIR_P) "$(distdir)/$$subdir" \ + || exit 1; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ $(am__relativize); \ new_distdir=$$reldir; \ @@ -1573,10 +1652,15 @@ install-am: all-am installcheck: installcheck-recursive install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -1661,25 +1745,24 @@ ps-am: uninstall-am: uninstall-docDATA uninstall-libLTLIBRARIES \ uninstall-pkgconfigDATA -.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \ - install-am install-strip tags-recursive - -.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \ - all all-am check check-am clean clean-generic \ - clean-libLTLIBRARIES clean-libtool ctags ctags-recursive \ - distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-docDATA install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-libLTLIBRARIES \ - install-man install-pdf install-pdf-am install-pkgconfigDATA \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs installdirs-am maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags tags-recursive uninstall uninstall-am uninstall-docDATA \ - uninstall-libLTLIBRARIES uninstall-pkgconfigDATA +.MAKE: $(am__recursive_targets) install-am install-strip + +.PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \ + check-am clean clean-generic clean-libLTLIBRARIES \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-compile distclean-generic distclean-libtool \ + distclean-tags distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-docDATA install-dvi install-dvi-am install-exec \ + install-exec-am install-html install-html-am install-info \ + install-info-am install-libLTLIBRARIES install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + installdirs-am maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-docDATA uninstall-libLTLIBRARIES \ + uninstall-pkgconfigDATA # Windows resource compiler support. libtool knows what to do with .rc @@ -1707,4 +1790,3 @@ liblzma.def.in: liblzma.la # 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: - diff --git a/Build/source/extra/xz/src/liblzma/api/Makefile.in b/Build/source/extra/xz/src/liblzma/api/Makefile.in index 900c7ee77b8..34766fc8129 100644 --- a/Build/source/extra/xz/src/liblzma/api/Makefile.in +++ b/Build/source/extra/xz/src/liblzma/api/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -35,18 +79,19 @@ POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ subdir = src/liblzma/api -DIST_COMMON = $(nobase_include_HEADERS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(nobase_include_HEADERS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -59,8 +104,25 @@ mkinstalldirs = $(install_sh) -d CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = CONFIG_CLEAN_VPATH_FILES = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -82,14 +144,38 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(includedir)" HEADERS = $(nobase_include_HEADERS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -118,6 +204,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -178,6 +265,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -185,12 +273,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -290,15 +378,18 @@ clean-libtool: -rm -rf .libs _libs install-nobase_includeHEADERS: $(nobase_include_HEADERS) @$(NORMAL_INSTALL) - test -z "$(includedir)" || $(MKDIR_P) "$(DESTDIR)$(includedir)" @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(includedir)" || exit 1; \ + fi; \ $(am__nobase_list) | while read dir files; do \ xfiles=; for file in $$files; do \ if test -f "$$file"; then xfiles="$$xfiles $$file"; \ else xfiles="$$xfiles $(srcdir)/$$file"; fi; done; \ test -z "$$xfiles" || { \ test "x$$dir" = x. || { \ - echo "$(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ + echo " $(MKDIR_P) '$(DESTDIR)$(includedir)/$$dir'"; \ $(MKDIR_P) "$(DESTDIR)$(includedir)/$$dir"; }; \ echo " $(INSTALL_HEADER) $$xfiles '$(DESTDIR)$(includedir)/$$dir'"; \ $(INSTALL_HEADER) $$xfiles "$(DESTDIR)$(includedir)/$$dir" || exit $$?; }; \ @@ -308,30 +399,17 @@ uninstall-nobase_includeHEADERS: @$(NORMAL_UNINSTALL) @list='$(nobase_include_HEADERS)'; test -n "$(includedir)" || list=; \ $(am__nobase_strip_setup); files=`$(am__nobase_strip)`; \ - test -n "$$files" || exit 0; \ - echo " ( cd '$(DESTDIR)$(includedir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(includedir)" && rm -f $$files - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + dir='$(DESTDIR)$(includedir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -343,15 +421,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -360,6 +434,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -411,10 +500,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -494,21 +588,21 @@ uninstall-am: uninstall-nobase_includeHEADERS .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool ctags distclean distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-nobase_includeHEADERS \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-nobase_includeHEADERS +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \ + clean-libtool cscopelist-am ctags ctags-am distclean \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man \ + install-nobase_includeHEADERS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-nobase_includeHEADERS # 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: - diff --git a/Build/source/extra/xz/src/liblzma/api/lzma/version.h b/Build/source/extra/xz/src/liblzma/api/lzma/version.h index 92266637760..66e93965dca 100644 --- a/Build/source/extra/xz/src/liblzma/api/lzma/version.h +++ b/Build/source/extra/xz/src/liblzma/api/lzma/version.h @@ -22,7 +22,7 @@ */ #define LZMA_VERSION_MAJOR 5 #define LZMA_VERSION_MINOR 0 -#define LZMA_VERSION_PATCH 3 +#define LZMA_VERSION_PATCH 5 #define LZMA_VERSION_STABILITY LZMA_VERSION_STABILITY_STABLE #ifndef LZMA_VERSION_COMMIT diff --git a/Build/source/extra/xz/src/liblzma/check/sha256.c b/Build/source/extra/xz/src/liblzma/check/sha256.c index 04231dbaef9..23bda9222dd 100644 --- a/Build/source/extra/xz/src/liblzma/check/sha256.c +++ b/Build/source/extra/xz/src/liblzma/check/sha256.c @@ -6,7 +6,6 @@ /// \todo Crypto++ has x86 ASM optimizations. They use SSE so if they /// are imported to liblzma, SSE instructions need to be used /// conditionally to keep the code working on older boxes. -/// We could also support using some external libary for SHA-256. // // This code is based on the code found from 7-Zip, which has a modified // version of the SHA-256 found from Crypto++ <http://www.cryptopp.com/>. diff --git a/Build/source/extra/xz/src/liblzma/common/alone_decoder.c b/Build/source/extra/xz/src/liblzma/common/alone_decoder.c index 678c79e6543..c25112e6875 100644 --- a/Build/source/extra/xz/src/liblzma/common/alone_decoder.c +++ b/Build/source/extra/xz/src/liblzma/common/alone_decoder.c @@ -26,6 +26,11 @@ struct lzma_coder_s { SEQ_CODE, } sequence; + /// If true, reject files that are unlikely to be .lzma files. + /// If false, more non-.lzma files get accepted and will give + /// LZMA_DATA_ERROR either immediately or after a few output bytes. + bool picky; + /// Position in the header fields size_t pos; @@ -68,13 +73,13 @@ alone_decode(lzma_coder *coder, |= (size_t)(in[*in_pos]) << (coder->pos * 8); if (++coder->pos == 4) { - if (coder->options.dict_size != UINT32_MAX) { + if (coder->picky && coder->options.dict_size + != UINT32_MAX) { // A hack to ditch tons of false positives: // We allow only dictionary sizes that are // 2^n or 2^n + 2^(n-1). LZMA_Alone created // only files with 2^n, but accepts any - // dictionary size. If someone complains, this - // will be reconsidered. + // dictionary size. uint32_t d = coder->options.dict_size - 1; d |= d >> 2; d |= d >> 3; @@ -103,9 +108,9 @@ alone_decode(lzma_coder *coder, // Another hack to ditch false positives: Assume that // if the uncompressed size is known, it must be less - // than 256 GiB. Again, if someone complains, this - // will be reconsidered. - if (coder->uncompressed_size != LZMA_VLI_UNKNOWN + // than 256 GiB. + if (coder->picky + && coder->uncompressed_size != LZMA_VLI_UNKNOWN && coder->uncompressed_size >= (LZMA_VLI_C(1) << 38)) return LZMA_FORMAT_ERROR; @@ -189,7 +194,7 @@ alone_decoder_memconfig(lzma_coder *coder, uint64_t *memusage, extern lzma_ret lzma_alone_decoder_init(lzma_next_coder *next, lzma_allocator *allocator, - uint64_t memlimit) + uint64_t memlimit, bool picky) { lzma_next_coder_init(&lzma_alone_decoder_init, next, allocator); @@ -208,6 +213,7 @@ lzma_alone_decoder_init(lzma_next_coder *next, lzma_allocator *allocator, } next->coder->sequence = SEQ_PROPERTIES; + next->coder->picky = picky; next->coder->pos = 0; next->coder->options.dict_size = 0; next->coder->options.preset_dict = NULL; @@ -223,7 +229,7 @@ lzma_alone_decoder_init(lzma_next_coder *next, lzma_allocator *allocator, extern LZMA_API(lzma_ret) lzma_alone_decoder(lzma_stream *strm, uint64_t memlimit) { - lzma_next_strm_init(lzma_alone_decoder_init, strm, memlimit); + lzma_next_strm_init(lzma_alone_decoder_init, strm, memlimit, false); strm->internal->supported_actions[LZMA_RUN] = true; strm->internal->supported_actions[LZMA_FINISH] = true; diff --git a/Build/source/extra/xz/src/liblzma/common/alone_decoder.h b/Build/source/extra/xz/src/liblzma/common/alone_decoder.h index 70d0d2a0ffa..f666fc3823e 100644 --- a/Build/source/extra/xz/src/liblzma/common/alone_decoder.h +++ b/Build/source/extra/xz/src/liblzma/common/alone_decoder.h @@ -16,7 +16,8 @@ #include "common.h" -extern lzma_ret lzma_alone_decoder_init(lzma_next_coder *next, - lzma_allocator *allocator, uint64_t memlimit); +extern lzma_ret lzma_alone_decoder_init( + lzma_next_coder *next, lzma_allocator *allocator, + uint64_t memlimit, bool picky); #endif diff --git a/Build/source/extra/xz/src/liblzma/common/auto_decoder.c b/Build/source/extra/xz/src/liblzma/common/auto_decoder.c index ae6c3e78642..35c895fd14c 100644 --- a/Build/source/extra/xz/src/liblzma/common/auto_decoder.c +++ b/Build/source/extra/xz/src/liblzma/common/auto_decoder.c @@ -54,7 +54,7 @@ auto_decode(lzma_coder *coder, lzma_allocator *allocator, coder->memlimit, coder->flags)); } else { return_if_error(lzma_alone_decoder_init(&coder->next, - allocator, coder->memlimit)); + allocator, coder->memlimit, true)); // If the application wants to know about missing // integrity check or about the check in general, we diff --git a/Build/source/extra/xz/src/liblzma/common/index.c b/Build/source/extra/xz/src/liblzma/common/index.c index ddb9d364362..9af4bc19d1b 100644 --- a/Build/source/extra/xz/src/liblzma/common/index.c +++ b/Build/source/extra/xz/src/liblzma/common/index.c @@ -398,10 +398,13 @@ extern LZMA_API(lzma_index *) lzma_index_init(lzma_allocator *allocator) { lzma_index *i = index_init_plain(allocator); + if (i == NULL) + return NULL; + index_stream *s = index_stream_init(0, 0, 1, 0, allocator); - if (i == NULL || s == NULL) { - index_stream_end(s, allocator); + if (s == NULL) { lzma_free(i, allocator); + return NULL; } index_tree_append(&i->streams, &s->node); diff --git a/Build/source/extra/xz/src/liblzma/lz/lz_encoder_hash.h b/Build/source/extra/xz/src/liblzma/lz/lz_encoder_hash.h index c398d7d05e4..342a333d168 100644 --- a/Build/source/extra/xz/src/liblzma/lz/lz_encoder_hash.h +++ b/Build/source/extra/xz/src/liblzma/lz/lz_encoder_hash.h @@ -39,7 +39,7 @@ // Endianness doesn't matter in hash_2_calc() (no effect on the output). #ifdef TUKLIB_FAST_UNALIGNED_ACCESS # define hash_2_calc() \ - const uint32_t hash_value = *(const uint16_t *)(cur); + const uint32_t hash_value = *(const uint16_t *)(cur) #else # define hash_2_calc() \ const uint32_t hash_value \ diff --git a/Build/source/extra/xz/src/liblzma/simple/simple_coder.c b/Build/source/extra/xz/src/liblzma/simple/simple_coder.c index 37de7fa1a0c..a02b039aa0b 100644 --- a/Build/source/extra/xz/src/liblzma/simple/simple_coder.c +++ b/Build/source/extra/xz/src/liblzma/simple/simple_coder.c @@ -35,9 +35,6 @@ copy_or_code(lzma_coder *coder, lzma_allocator *allocator, } else { // Call the next coder in the chain to provide us some data. - // We don't care about uncompressed_size here, because - // the next filter in the chain will do it for us (since - // we don't change the size of the data). const lzma_ret ret = coder->next.code( coder->next.coder, allocator, in, in_pos, in_size, @@ -110,7 +107,7 @@ simple_code(lzma_coder *coder, lzma_allocator *allocator, // filtered if the buffer sizes used by the application are reasonable. const size_t out_avail = out_size - *out_pos; const size_t buf_avail = coder->size - coder->pos; - if (out_avail > buf_avail) { + if (out_avail > buf_avail || buf_avail == 0) { // Store the old position so that we know from which byte // to start filtering. const size_t out_start = *out_pos; diff --git a/Build/source/extra/xz/src/liblzma/simple/simple_private.h b/Build/source/extra/xz/src/liblzma/simple/simple_private.h index a69f82785fb..fcf9f7c1980 100644 --- a/Build/source/extra/xz/src/liblzma/simple/simple_private.h +++ b/Build/source/extra/xz/src/liblzma/simple/simple_private.h @@ -22,8 +22,7 @@ struct lzma_coder_s { /// Next filter in the chain lzma_next_coder next; - /// True if the next coder in the chain has returned LZMA_STREAM_END - /// or if we have processed uncompressed_size bytes. + /// True if the next coder in the chain has returned LZMA_STREAM_END. bool end_was_reached; /// True if filter() should encode the data; false to decode. diff --git a/Build/source/extra/xz/src/lzmainfo/Makefile.in b/Build/source/extra/xz/src/lzmainfo/Makefile.in index 9be17311171..cf60465e48b 100644 --- a/Build/source/extra/xz/src/lzmainfo/Makefile.in +++ b/Build/source/extra/xz/src/lzmainfo/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -38,18 +82,19 @@ bin_PROGRAMS = lzmainfo$(EXEEXT) @COND_W32_TRUE@am__append_1 = lzmainfo_w32res.rc @COND_GNULIB_TRUE@am__append_2 = $(top_builddir)/lib/libgnu.a subdir = src/lzmainfo -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -75,21 +120,51 @@ lzmainfo_OBJECTS = $(am_lzmainfo_OBJECTS) am__DEPENDENCIES_1 = lzmainfo_DEPENDENCIES = $(top_builddir)/src/liblzma/liblzma.la \ $(am__append_2) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(lzmainfo_SOURCES) DIST_SOURCES = $(am__lzmainfo_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -111,15 +186,39 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -148,6 +247,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -208,6 +308,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -215,12 +316,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -310,14 +411,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -338,7 +444,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -351,9 +458,10 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -lzmainfo$(EXEEXT): $(lzmainfo_OBJECTS) $(lzmainfo_DEPENDENCIES) + +lzmainfo$(EXEEXT): $(lzmainfo_OBJECTS) $(lzmainfo_DEPENDENCIES) $(EXTRA_lzmainfo_DEPENDENCIES) @rm -f lzmainfo$(EXEEXT) - $(LINK) $(lzmainfo_OBJECTS) $(lzmainfo_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(lzmainfo_OBJECTS) $(lzmainfo_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -366,67 +474,67 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lzmainfo-tuklib_progname.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< lzmainfo-lzmainfo.o: lzmainfo.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-lzmainfo.o -MD -MP -MF $(DEPDIR)/lzmainfo-lzmainfo.Tpo -c -o lzmainfo-lzmainfo.o `test -f 'lzmainfo.c' || echo '$(srcdir)/'`lzmainfo.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmainfo-lzmainfo.Tpo $(DEPDIR)/lzmainfo-lzmainfo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzmainfo.c' object='lzmainfo-lzmainfo.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-lzmainfo.o -MD -MP -MF $(DEPDIR)/lzmainfo-lzmainfo.Tpo -c -o lzmainfo-lzmainfo.o `test -f 'lzmainfo.c' || echo '$(srcdir)/'`lzmainfo.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmainfo-lzmainfo.Tpo $(DEPDIR)/lzmainfo-lzmainfo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzmainfo.c' object='lzmainfo-lzmainfo.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-lzmainfo.o `test -f 'lzmainfo.c' || echo '$(srcdir)/'`lzmainfo.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-lzmainfo.o `test -f 'lzmainfo.c' || echo '$(srcdir)/'`lzmainfo.c lzmainfo-lzmainfo.obj: lzmainfo.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-lzmainfo.obj -MD -MP -MF $(DEPDIR)/lzmainfo-lzmainfo.Tpo -c -o lzmainfo-lzmainfo.obj `if test -f 'lzmainfo.c'; then $(CYGPATH_W) 'lzmainfo.c'; else $(CYGPATH_W) '$(srcdir)/lzmainfo.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmainfo-lzmainfo.Tpo $(DEPDIR)/lzmainfo-lzmainfo.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='lzmainfo.c' object='lzmainfo-lzmainfo.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-lzmainfo.obj -MD -MP -MF $(DEPDIR)/lzmainfo-lzmainfo.Tpo -c -o lzmainfo-lzmainfo.obj `if test -f 'lzmainfo.c'; then $(CYGPATH_W) 'lzmainfo.c'; else $(CYGPATH_W) '$(srcdir)/lzmainfo.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmainfo-lzmainfo.Tpo $(DEPDIR)/lzmainfo-lzmainfo.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='lzmainfo.c' object='lzmainfo-lzmainfo.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-lzmainfo.obj `if test -f 'lzmainfo.c'; then $(CYGPATH_W) 'lzmainfo.c'; else $(CYGPATH_W) '$(srcdir)/lzmainfo.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-lzmainfo.obj `if test -f 'lzmainfo.c'; then $(CYGPATH_W) 'lzmainfo.c'; else $(CYGPATH_W) '$(srcdir)/lzmainfo.c'; fi` lzmainfo-tuklib_progname.o: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_progname.o -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_progname.Tpo -c -o lzmainfo-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmainfo-tuklib_progname.Tpo $(DEPDIR)/lzmainfo-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmainfo-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_progname.o -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_progname.Tpo -c -o lzmainfo-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmainfo-tuklib_progname.Tpo $(DEPDIR)/lzmainfo-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmainfo-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c lzmainfo-tuklib_progname.obj: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_progname.Tpo -c -o lzmainfo-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmainfo-tuklib_progname.Tpo $(DEPDIR)/lzmainfo-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmainfo-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_progname.Tpo -c -o lzmainfo-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmainfo-tuklib_progname.Tpo $(DEPDIR)/lzmainfo-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmainfo-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` lzmainfo-tuklib_exit.o: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_exit.o -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_exit.Tpo -c -o lzmainfo-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmainfo-tuklib_exit.Tpo $(DEPDIR)/lzmainfo-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmainfo-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_exit.o -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_exit.Tpo -c -o lzmainfo-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmainfo-tuklib_exit.Tpo $(DEPDIR)/lzmainfo-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmainfo-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c lzmainfo-tuklib_exit.obj: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_exit.Tpo -c -o lzmainfo-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmainfo-tuklib_exit.Tpo $(DEPDIR)/lzmainfo-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmainfo-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmainfo-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/lzmainfo-tuklib_exit.Tpo -c -o lzmainfo-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmainfo-tuklib_exit.Tpo $(DEPDIR)/lzmainfo-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmainfo-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmainfo_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmainfo-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -435,11 +543,18 @@ clean-libtool: -rm -rf .libs _libs install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -468,30 +583,17 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -503,15 +605,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -520,24 +618,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -584,10 +684,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -673,20 +778,20 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-man1 install-pdf install-pdf-am install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-binPROGRAMS uninstall-man \ - uninstall-man1 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-pdf install-pdf-am install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ + pdf pdf-am ps ps-am tags tags-am uninstall uninstall-am \ + uninstall-binPROGRAMS uninstall-man uninstall-man1 # Windows resource compiler support @@ -697,4 +802,3 @@ uninstall-man: uninstall-man1 # 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: - diff --git a/Build/source/extra/xz/src/lzmainfo/lzmainfo.1 b/Build/source/extra/xz/src/lzmainfo/lzmainfo.1 index f2b93b4c643..ce38eee5032 100644 --- a/Build/source/extra/xz/src/lzmainfo/lzmainfo.1 +++ b/Build/source/extra/xz/src/lzmainfo/lzmainfo.1 @@ -4,14 +4,14 @@ .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH LZMAINFO 1 "2010-09-27" "Tukaani" "XZ Utils" +.TH LZMAINFO 1 "2013-06-30" "Tukaani" "XZ Utils" .SH NAME lzmainfo \- show information stored in the .lzma file header .SH SYNOPSIS .B lzmainfo .RB [ \-\-help ] .RB [ \-\-version ] -.RI [ file ]... +.RI [ file... ] .SH DESCRIPTION .B lzmainfo shows information stored in the diff --git a/Build/source/extra/xz/src/scripts/Makefile.in b/Build/source/extra/xz/src/scripts/Makefile.in index fbab8f99cc6..e5296fda567 100644 --- a/Build/source/extra/xz/src/scripts/Makefile.in +++ b/Build/source/extra/xz/src/scripts/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -44,19 +88,20 @@ host_triplet = @host@ @COND_LZMALINKS_TRUE@ xzless-lzless subdir = src/scripts -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/xzdiff.in $(srcdir)/xzgrep.in \ - $(srcdir)/xzless.in $(srcdir)/xzmore.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(srcdir)/xzdiff.in $(srcdir)/xzgrep.in $(srcdir)/xzmore.in \ + $(srcdir)/xzless.in $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -90,17 +135,42 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" SCRIPTS = $(nodist_bin_SCRIPTS) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = SOURCES = DIST_SOURCES = +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -129,6 +199,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -189,6 +260,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -196,12 +268,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -289,8 +361,11 @@ xzless: $(top_builddir)/config.status $(srcdir)/xzless.in cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ install-nodist_binSCRIPTS: $(nodist_bin_SCRIPTS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ if test -f "$$d$$p"; then echo "$$d$$p"; echo "$$p"; else :; fi; \ @@ -318,9 +393,7 @@ uninstall-nodist_binSCRIPTS: @list='$(nodist_bin_SCRIPTS)'; test -n "$(bindir)" || exit 0; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 's,.*/,,;$(transform)'`; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(bindir)" && rm -f $$files + dir='$(DESTDIR)$(bindir)'; $(am__uninstall_files_from_dir) mostlyclean-libtool: -rm -f *.lo @@ -329,11 +402,18 @@ clean-libtool: -rm -rf .libs _libs install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -362,30 +442,15 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } -tags: TAGS -TAGS: + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) +tags TAGS: + +ctags CTAGS: -ctags: CTAGS -CTAGS: +cscope cscopelist: distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -432,10 +497,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -522,17 +592,18 @@ uninstall-man: uninstall-man1 uninstall-am .PHONY: all all-am check check-am clean clean-generic clean-libtool \ - distclean distclean-generic distclean-libtool distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-data-hook install-dvi \ - install-dvi-am install-exec install-exec-am install-exec-hook \ - install-html install-html-am install-info install-info-am \ - install-man install-man1 install-nodist_binSCRIPTS install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ + cscopelist-am ctags-am distclean distclean-generic \ + distclean-libtool distdir dvi dvi-am html html-am info info-am \ + install install-am install-data install-data-am \ + install-data-hook install-dvi install-dvi-am install-exec \ + install-exec-am install-exec-hook install-html install-html-am \ + install-info install-info-am install-man install-man1 \ + install-nodist_binSCRIPTS install-pdf install-pdf-am \ + install-ps install-ps-am install-strip installcheck \ + installcheck-am installdirs maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ - uninstall-hook uninstall-man uninstall-man1 \ + mostlyclean-libtool pdf pdf-am ps ps-am tags-am uninstall \ + uninstall-am uninstall-hook uninstall-man uninstall-man1 \ uninstall-nodist_binSCRIPTS @@ -569,4 +640,3 @@ uninstall-hook: # 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: - diff --git a/Build/source/extra/xz/src/scripts/xzdiff.in b/Build/source/extra/xz/src/scripts/xzdiff.in index 45633e0a860..deec3ebf02a 100644 --- a/Build/source/extra/xz/src/scripts/xzdiff.in +++ b/Build/source/extra/xz/src/scripts/xzdiff.in @@ -120,10 +120,12 @@ elif test $# -eq 2; then ( ($xz2 -cdfq -- "$2" 4>&-; echo $? >&4) 3>&- 5<&- </dev/null | eval "$cmp" /dev/fd/5 - >&3) 5<&0 ) + cmp_status=$? case $xz_status in *[1-9]*) xz_status=1;; *) xz_status=0;; esac + (exit $cmp_status) else F=`expr "/$2" : '.*/\(.*\)[-.][ablmtxz2]*$'` || F=$prog tmp= diff --git a/Build/source/extra/xz/src/scripts/xzgrep.in b/Build/source/extra/xz/src/scripts/xzgrep.in index ae30725c69f..2bfce19ffb1 100644 --- a/Build/source/extra/xz/src/scripts/xzgrep.in +++ b/Build/source/extra/xz/src/scripts/xzgrep.in @@ -109,7 +109,7 @@ while test $# -ne 0; do files_with_matches=1;; (-L | --files-witho*) files_without_matches=1;; - (--no-f*) + (-h | --no-f*) no_filename=1;; (-V | --v | --ve | --ver | --vers | --versi | --versio | --version) echo "$version" || exit 2 @@ -194,7 +194,8 @@ for i; do fi >&3 5>&- ) r=$? - test "$xz_status" -eq 0 || test "$xz_status" -eq 2 || r=2 + test "$xz_status" -eq 0 || test "$xz_status" -eq 2 \ + || test "$(kill -l "$xz_status" 2> /dev/null)" = "PIPE" || r=2 test $res -lt $r && res=$r done exit $res diff --git a/Build/source/extra/xz/src/scripts/xzless.in b/Build/source/extra/xz/src/scripts/xzless.in index a3da697c590..288dd871e4c 100644 --- a/Build/source/extra/xz/src/scripts/xzless.in +++ b/Build/source/extra/xz/src/scripts/xzless.in @@ -46,7 +46,7 @@ if test "${LESSMETACHARS+set}" != set; then LESSMETACHARS="$space$tab$nl'"';*?"()<>[|&^`#\$%=~' fi -if test "$(less -V | { read ver && echo ${ver#less }; })" -ge 429; then +if test "$(less -V | { read less ver re && echo ${ver}; })" -ge 429; then # less 429 or later: LESSOPEN pipe will be used on # standard input if $LESSOPEN begins with |-. LESSOPEN="|-$xz -cdfq -- %s" diff --git a/Build/source/extra/xz/src/scripts/xzmore.1 b/Build/source/extra/xz/src/scripts/xzmore.1 index 30dad6871af..9613974ecf7 100644 --- a/Build/source/extra/xz/src/scripts/xzmore.1 +++ b/Build/source/extra/xz/src/scripts/xzmore.1 @@ -4,15 +4,15 @@ .\" .\" License: GNU GPLv2+ .\" -.TH XZMORE 1 "2010-09-27" "Tukaani" "XZ Utils" +.TH XZMORE 1 "2013-06-30" "Tukaani" "XZ Utils" .SH NAME xzmore, lzmore \- view xz or lzma compressed (text) files .SH SYNOPSIS .B xzmore -.RI [ "filename ..." ] +.RI [ file... ] .br .B lzmore -.RI [ "filename ..." ] +.RI [ file... ] .SH DESCRIPTION .B xzmore is a filter which allows examination of diff --git a/Build/source/extra/xz/src/xz/Makefile.in b/Build/source/extra/xz/src/xz/Makefile.in index 745bbe1f358..2bbe7616d33 100644 --- a/Build/source/extra/xz/src/xz/Makefile.in +++ b/Build/source/extra/xz/src/xz/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -39,18 +83,19 @@ bin_PROGRAMS = xz$(EXEEXT) @COND_GNULIB_TRUE@am__append_2 = $(top_builddir)/lib/libgnu.a @COND_LZMALINKS_TRUE@am__append_3 = lzma unlzma lzcat subdir = src/xz -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -88,21 +133,51 @@ xz_OBJECTS = $(am_xz_OBJECTS) am__DEPENDENCIES_1 = xz_DEPENDENCIES = $(top_builddir)/src/liblzma/liblzma.la \ $(am__append_2) $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(xz_SOURCES) DIST_SOURCES = $(am__xz_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -124,15 +199,39 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -161,6 +260,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -221,6 +321,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -228,12 +329,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -333,14 +434,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -361,7 +467,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -374,9 +481,10 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -xz$(EXEEXT): $(xz_OBJECTS) $(xz_DEPENDENCIES) + +xz$(EXEEXT): $(xz_OBJECTS) $(xz_DEPENDENCIES) $(EXTRA_xz_DEPENDENCIES) @rm -f xz$(EXEEXT) - $(LINK) $(xz_OBJECTS) $(xz_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(xz_OBJECTS) $(xz_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -403,263 +511,263 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xz-util.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< xz-args.o: args.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-args.o -MD -MP -MF $(DEPDIR)/xz-args.Tpo -c -o xz-args.o `test -f 'args.c' || echo '$(srcdir)/'`args.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-args.Tpo $(DEPDIR)/xz-args.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='args.c' object='xz-args.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-args.o -MD -MP -MF $(DEPDIR)/xz-args.Tpo -c -o xz-args.o `test -f 'args.c' || echo '$(srcdir)/'`args.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-args.Tpo $(DEPDIR)/xz-args.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='args.c' object='xz-args.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-args.o `test -f 'args.c' || echo '$(srcdir)/'`args.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-args.o `test -f 'args.c' || echo '$(srcdir)/'`args.c xz-args.obj: args.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-args.obj -MD -MP -MF $(DEPDIR)/xz-args.Tpo -c -o xz-args.obj `if test -f 'args.c'; then $(CYGPATH_W) 'args.c'; else $(CYGPATH_W) '$(srcdir)/args.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-args.Tpo $(DEPDIR)/xz-args.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='args.c' object='xz-args.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-args.obj -MD -MP -MF $(DEPDIR)/xz-args.Tpo -c -o xz-args.obj `if test -f 'args.c'; then $(CYGPATH_W) 'args.c'; else $(CYGPATH_W) '$(srcdir)/args.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-args.Tpo $(DEPDIR)/xz-args.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='args.c' object='xz-args.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-args.obj `if test -f 'args.c'; then $(CYGPATH_W) 'args.c'; else $(CYGPATH_W) '$(srcdir)/args.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-args.obj `if test -f 'args.c'; then $(CYGPATH_W) 'args.c'; else $(CYGPATH_W) '$(srcdir)/args.c'; fi` xz-coder.o: coder.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-coder.o -MD -MP -MF $(DEPDIR)/xz-coder.Tpo -c -o xz-coder.o `test -f 'coder.c' || echo '$(srcdir)/'`coder.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-coder.Tpo $(DEPDIR)/xz-coder.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coder.c' object='xz-coder.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-coder.o -MD -MP -MF $(DEPDIR)/xz-coder.Tpo -c -o xz-coder.o `test -f 'coder.c' || echo '$(srcdir)/'`coder.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-coder.Tpo $(DEPDIR)/xz-coder.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coder.c' object='xz-coder.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-coder.o `test -f 'coder.c' || echo '$(srcdir)/'`coder.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-coder.o `test -f 'coder.c' || echo '$(srcdir)/'`coder.c xz-coder.obj: coder.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-coder.obj -MD -MP -MF $(DEPDIR)/xz-coder.Tpo -c -o xz-coder.obj `if test -f 'coder.c'; then $(CYGPATH_W) 'coder.c'; else $(CYGPATH_W) '$(srcdir)/coder.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-coder.Tpo $(DEPDIR)/xz-coder.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='coder.c' object='xz-coder.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-coder.obj -MD -MP -MF $(DEPDIR)/xz-coder.Tpo -c -o xz-coder.obj `if test -f 'coder.c'; then $(CYGPATH_W) 'coder.c'; else $(CYGPATH_W) '$(srcdir)/coder.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-coder.Tpo $(DEPDIR)/xz-coder.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='coder.c' object='xz-coder.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-coder.obj `if test -f 'coder.c'; then $(CYGPATH_W) 'coder.c'; else $(CYGPATH_W) '$(srcdir)/coder.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-coder.obj `if test -f 'coder.c'; then $(CYGPATH_W) 'coder.c'; else $(CYGPATH_W) '$(srcdir)/coder.c'; fi` xz-file_io.o: file_io.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-file_io.o -MD -MP -MF $(DEPDIR)/xz-file_io.Tpo -c -o xz-file_io.o `test -f 'file_io.c' || echo '$(srcdir)/'`file_io.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-file_io.Tpo $(DEPDIR)/xz-file_io.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='file_io.c' object='xz-file_io.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-file_io.o -MD -MP -MF $(DEPDIR)/xz-file_io.Tpo -c -o xz-file_io.o `test -f 'file_io.c' || echo '$(srcdir)/'`file_io.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-file_io.Tpo $(DEPDIR)/xz-file_io.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='file_io.c' object='xz-file_io.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-file_io.o `test -f 'file_io.c' || echo '$(srcdir)/'`file_io.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-file_io.o `test -f 'file_io.c' || echo '$(srcdir)/'`file_io.c xz-file_io.obj: file_io.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-file_io.obj -MD -MP -MF $(DEPDIR)/xz-file_io.Tpo -c -o xz-file_io.obj `if test -f 'file_io.c'; then $(CYGPATH_W) 'file_io.c'; else $(CYGPATH_W) '$(srcdir)/file_io.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-file_io.Tpo $(DEPDIR)/xz-file_io.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='file_io.c' object='xz-file_io.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-file_io.obj -MD -MP -MF $(DEPDIR)/xz-file_io.Tpo -c -o xz-file_io.obj `if test -f 'file_io.c'; then $(CYGPATH_W) 'file_io.c'; else $(CYGPATH_W) '$(srcdir)/file_io.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-file_io.Tpo $(DEPDIR)/xz-file_io.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='file_io.c' object='xz-file_io.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-file_io.obj `if test -f 'file_io.c'; then $(CYGPATH_W) 'file_io.c'; else $(CYGPATH_W) '$(srcdir)/file_io.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-file_io.obj `if test -f 'file_io.c'; then $(CYGPATH_W) 'file_io.c'; else $(CYGPATH_W) '$(srcdir)/file_io.c'; fi` xz-hardware.o: hardware.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-hardware.o -MD -MP -MF $(DEPDIR)/xz-hardware.Tpo -c -o xz-hardware.o `test -f 'hardware.c' || echo '$(srcdir)/'`hardware.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-hardware.Tpo $(DEPDIR)/xz-hardware.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hardware.c' object='xz-hardware.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-hardware.o -MD -MP -MF $(DEPDIR)/xz-hardware.Tpo -c -o xz-hardware.o `test -f 'hardware.c' || echo '$(srcdir)/'`hardware.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-hardware.Tpo $(DEPDIR)/xz-hardware.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hardware.c' object='xz-hardware.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-hardware.o `test -f 'hardware.c' || echo '$(srcdir)/'`hardware.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-hardware.o `test -f 'hardware.c' || echo '$(srcdir)/'`hardware.c xz-hardware.obj: hardware.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-hardware.obj -MD -MP -MF $(DEPDIR)/xz-hardware.Tpo -c -o xz-hardware.obj `if test -f 'hardware.c'; then $(CYGPATH_W) 'hardware.c'; else $(CYGPATH_W) '$(srcdir)/hardware.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-hardware.Tpo $(DEPDIR)/xz-hardware.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='hardware.c' object='xz-hardware.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-hardware.obj -MD -MP -MF $(DEPDIR)/xz-hardware.Tpo -c -o xz-hardware.obj `if test -f 'hardware.c'; then $(CYGPATH_W) 'hardware.c'; else $(CYGPATH_W) '$(srcdir)/hardware.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-hardware.Tpo $(DEPDIR)/xz-hardware.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='hardware.c' object='xz-hardware.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-hardware.obj `if test -f 'hardware.c'; then $(CYGPATH_W) 'hardware.c'; else $(CYGPATH_W) '$(srcdir)/hardware.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-hardware.obj `if test -f 'hardware.c'; then $(CYGPATH_W) 'hardware.c'; else $(CYGPATH_W) '$(srcdir)/hardware.c'; fi` xz-list.o: list.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-list.o -MD -MP -MF $(DEPDIR)/xz-list.Tpo -c -o xz-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-list.Tpo $(DEPDIR)/xz-list.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='list.c' object='xz-list.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-list.o -MD -MP -MF $(DEPDIR)/xz-list.Tpo -c -o xz-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-list.Tpo $(DEPDIR)/xz-list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='list.c' object='xz-list.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-list.o `test -f 'list.c' || echo '$(srcdir)/'`list.c xz-list.obj: list.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-list.obj -MD -MP -MF $(DEPDIR)/xz-list.Tpo -c -o xz-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-list.Tpo $(DEPDIR)/xz-list.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='list.c' object='xz-list.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-list.obj -MD -MP -MF $(DEPDIR)/xz-list.Tpo -c -o xz-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-list.Tpo $(DEPDIR)/xz-list.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='list.c' object='xz-list.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-list.obj `if test -f 'list.c'; then $(CYGPATH_W) 'list.c'; else $(CYGPATH_W) '$(srcdir)/list.c'; fi` xz-main.o: main.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.o -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xz-main.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.o -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='xz-main.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c xz-main.obj: main.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.obj -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='main.c' object='xz-main.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-main.obj -MD -MP -MF $(DEPDIR)/xz-main.Tpo -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-main.Tpo $(DEPDIR)/xz-main.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='main.c' object='xz-main.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'; fi` xz-message.o: message.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.o -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='message.c' object='xz-message.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.o -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='message.c' object='xz-message.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.o `test -f 'message.c' || echo '$(srcdir)/'`message.c xz-message.obj: message.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.obj -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='message.c' object='xz-message.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-message.obj -MD -MP -MF $(DEPDIR)/xz-message.Tpo -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-message.Tpo $(DEPDIR)/xz-message.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='message.c' object='xz-message.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-message.obj `if test -f 'message.c'; then $(CYGPATH_W) 'message.c'; else $(CYGPATH_W) '$(srcdir)/message.c'; fi` xz-options.o: options.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.o -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='options.c' object='xz-options.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.o -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='options.c' object='xz-options.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.o `test -f 'options.c' || echo '$(srcdir)/'`options.c xz-options.obj: options.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.obj -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='options.c' object='xz-options.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-options.obj -MD -MP -MF $(DEPDIR)/xz-options.Tpo -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-options.Tpo $(DEPDIR)/xz-options.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='options.c' object='xz-options.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-options.obj `if test -f 'options.c'; then $(CYGPATH_W) 'options.c'; else $(CYGPATH_W) '$(srcdir)/options.c'; fi` xz-signals.o: signals.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.o -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='signals.c' object='xz-signals.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.o -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signals.c' object='xz-signals.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.o `test -f 'signals.c' || echo '$(srcdir)/'`signals.c xz-signals.obj: signals.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.obj -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='signals.c' object='xz-signals.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-signals.obj -MD -MP -MF $(DEPDIR)/xz-signals.Tpo -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-signals.Tpo $(DEPDIR)/xz-signals.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='signals.c' object='xz-signals.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-signals.obj `if test -f 'signals.c'; then $(CYGPATH_W) 'signals.c'; else $(CYGPATH_W) '$(srcdir)/signals.c'; fi` xz-suffix.o: suffix.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.o -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='suffix.c' object='xz-suffix.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.o -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='suffix.c' object='xz-suffix.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.o `test -f 'suffix.c' || echo '$(srcdir)/'`suffix.c xz-suffix.obj: suffix.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.obj -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='suffix.c' object='xz-suffix.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-suffix.obj -MD -MP -MF $(DEPDIR)/xz-suffix.Tpo -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-suffix.Tpo $(DEPDIR)/xz-suffix.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='suffix.c' object='xz-suffix.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-suffix.obj `if test -f 'suffix.c'; then $(CYGPATH_W) 'suffix.c'; else $(CYGPATH_W) '$(srcdir)/suffix.c'; fi` xz-util.o: util.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.o -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='util.c' object='xz-util.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.o -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util.c' object='xz-util.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.o `test -f 'util.c' || echo '$(srcdir)/'`util.c xz-util.obj: util.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.obj -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='util.c' object='xz-util.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-util.obj -MD -MP -MF $(DEPDIR)/xz-util.Tpo -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-util.Tpo $(DEPDIR)/xz-util.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='util.c' object='xz-util.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-util.obj `if test -f 'util.c'; then $(CYGPATH_W) 'util.c'; else $(CYGPATH_W) '$(srcdir)/util.c'; fi` xz-tuklib_open_stdxxx.o: $(top_srcdir)/src/common/tuklib_open_stdxxx.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.o -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.o `test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_open_stdxxx.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.o -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.o `test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_open_stdxxx.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.o `test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_open_stdxxx.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.o `test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_open_stdxxx.c xz-tuklib_open_stdxxx.obj: $(top_srcdir)/src/common/tuklib_open_stdxxx.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.obj `if test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_open_stdxxx.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo -c -o xz-tuklib_open_stdxxx.obj `if test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_open_stdxxx.Tpo $(DEPDIR)/xz-tuklib_open_stdxxx.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_open_stdxxx.c' object='xz-tuklib_open_stdxxx.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.obj `if test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_open_stdxxx.obj `if test -f '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_open_stdxxx.c'; fi` xz-tuklib_progname.o: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.o -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='xz-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.o -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='xz-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c xz-tuklib_progname.obj: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='xz-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_progname.Tpo -c -o xz-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_progname.Tpo $(DEPDIR)/xz-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='xz-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` xz-tuklib_exit.o: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.o -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='xz-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.o -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='xz-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c xz-tuklib_exit.obj: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='xz-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_exit.Tpo -c -o xz-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_exit.Tpo $(DEPDIR)/xz-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='xz-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` xz-tuklib_cpucores.o: $(top_srcdir)/src/common/tuklib_cpucores.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_cpucores.o -MD -MP -MF $(DEPDIR)/xz-tuklib_cpucores.Tpo -c -o xz-tuklib_cpucores.o `test -f '$(top_srcdir)/src/common/tuklib_cpucores.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_cpucores.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_cpucores.Tpo $(DEPDIR)/xz-tuklib_cpucores.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_cpucores.c' object='xz-tuklib_cpucores.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_cpucores.o -MD -MP -MF $(DEPDIR)/xz-tuklib_cpucores.Tpo -c -o xz-tuklib_cpucores.o `test -f '$(top_srcdir)/src/common/tuklib_cpucores.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_cpucores.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_cpucores.Tpo $(DEPDIR)/xz-tuklib_cpucores.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_cpucores.c' object='xz-tuklib_cpucores.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_cpucores.o `test -f '$(top_srcdir)/src/common/tuklib_cpucores.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_cpucores.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_cpucores.o `test -f '$(top_srcdir)/src/common/tuklib_cpucores.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_cpucores.c xz-tuklib_cpucores.obj: $(top_srcdir)/src/common/tuklib_cpucores.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_cpucores.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_cpucores.Tpo -c -o xz-tuklib_cpucores.obj `if test -f '$(top_srcdir)/src/common/tuklib_cpucores.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_cpucores.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_cpucores.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_cpucores.Tpo $(DEPDIR)/xz-tuklib_cpucores.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_cpucores.c' object='xz-tuklib_cpucores.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_cpucores.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_cpucores.Tpo -c -o xz-tuklib_cpucores.obj `if test -f '$(top_srcdir)/src/common/tuklib_cpucores.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_cpucores.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_cpucores.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_cpucores.Tpo $(DEPDIR)/xz-tuklib_cpucores.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_cpucores.c' object='xz-tuklib_cpucores.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_cpucores.obj `if test -f '$(top_srcdir)/src/common/tuklib_cpucores.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_cpucores.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_cpucores.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_cpucores.obj `if test -f '$(top_srcdir)/src/common/tuklib_cpucores.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_cpucores.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_cpucores.c'; fi` xz-tuklib_mbstr_width.o: $(top_srcdir)/src/common/tuklib_mbstr_width.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_width.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_width.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_width.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_width.c xz-tuklib_mbstr_width.obj: $(top_srcdir)/src/common/tuklib_mbstr_width.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_width.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_width.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_width.Tpo -c -o xz-tuklib_mbstr_width.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_width.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_width.Tpo $(DEPDIR)/xz-tuklib_mbstr_width.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_mbstr_width.c' object='xz-tuklib_mbstr_width.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_width.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_width.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_width.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_width.c'; fi` xz-tuklib_mbstr_fw.o: $(top_srcdir)/src/common/tuklib_mbstr_fw.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_fw.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.o -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_fw.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_fw.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.o `test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_mbstr_fw.c xz-tuklib_mbstr_fw.obj: $(top_srcdir)/src/common/tuklib_mbstr_fw.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xz-tuklib_mbstr_fw.obj -MD -MP -MF $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo -c -o xz-tuklib_mbstr_fw.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xz-tuklib_mbstr_fw.Tpo $(DEPDIR)/xz-tuklib_mbstr_fw.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_mbstr_fw.c' object='xz-tuklib_mbstr_fw.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xz_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xz-tuklib_mbstr_fw.obj `if test -f '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_mbstr_fw.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -668,11 +776,18 @@ clean-libtool: -rm -rf .libs _libs install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -701,30 +816,17 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -736,15 +838,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -753,24 +851,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -817,10 +917,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -910,21 +1015,21 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-data-am install-exec-am install-strip \ uninstall-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-data-hook install-dvi install-dvi-am install-exec \ - install-exec-am install-exec-hook install-html install-html-am \ - install-info install-info-am install-man install-man1 \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip installcheck installcheck-am installdirs \ - maintainer-clean maintainer-clean-generic mostlyclean \ - mostlyclean-compile mostlyclean-generic mostlyclean-libtool \ - pdf pdf-am ps ps-am tags uninstall uninstall-am \ - uninstall-binPROGRAMS uninstall-hook uninstall-man \ - uninstall-man1 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-data-hook install-dvi \ + install-dvi-am install-exec install-exec-am install-exec-hook \ + install-html install-html-am install-info install-info-am \ + install-man install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-hook \ + uninstall-man uninstall-man1 # Windows resource compiler support @@ -965,4 +1070,3 @@ uninstall-hook: # 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: - diff --git a/Build/source/extra/xz/src/xz/args.c b/Build/source/extra/xz/src/xz/args.c index 4bd84a0c141..34761d45d67 100644 --- a/Build/source/extra/xz/src/xz/args.c +++ b/Build/source/extra/xz/src/xz/args.c @@ -438,7 +438,7 @@ parse_environment(args_info *args, char *argv0, const char *varname) } else if (prev_was_space) { prev_was_space = false; - // Keep argc small enough to fit into a singed int + // Keep argc small enough to fit into a signed int // and to keep it usable for memory allocation. if (++argc == my_min( INT_MAX, SIZE_MAX / sizeof(char *))) diff --git a/Build/source/extra/xz/src/xz/coder.c b/Build/source/extra/xz/src/xz/coder.c index b123ec5bf2b..e0867e2aa29 100644 --- a/Build/source/extra/xz/src/xz/coder.c +++ b/Build/source/extra/xz/src/xz/coder.c @@ -37,15 +37,10 @@ static io_buf in_buf; static io_buf out_buf; /// Number of filters. Zero indicates that we are using a preset. -static size_t filters_count = 0; +static uint32_t filters_count = 0; /// Number of the preset (0-9) -static size_t preset_number = 6; - -/// If a preset is used (no custom filter chain) and preset_extreme is true, -/// a significantly slower compression is used to achieve slightly better -/// compression ratio. -static bool preset_extreme = false; +static uint32_t preset_number = LZMA_PRESET_DEFAULT; /// Integrity check type static lzma_check check; @@ -63,11 +58,9 @@ coder_set_check(lzma_check new_check) } -extern void -coder_set_preset(size_t new_preset) +static void +forget_filter_chain(void) { - preset_number = new_preset; - // Setting a preset makes us forget a possibly defined custom // filter chain. while (filters_count > 0) { @@ -81,9 +74,20 @@ coder_set_preset(size_t new_preset) extern void +coder_set_preset(uint32_t new_preset) +{ + preset_number &= ~LZMA_PRESET_LEVEL_MASK; + preset_number |= new_preset; + forget_filter_chain(); + return; +} + + +extern void coder_set_extreme(void) { - preset_extreme = true; + preset_number |= LZMA_PRESET_EXTREME; + forget_filter_chain(); return; } @@ -98,6 +102,12 @@ coder_add_filter(lzma_vli id, void *options) filters[filters_count].options = options; ++filters_count; + // Setting a custom filter chain makes us forget the preset options. + // This makes a difference if one specifies e.g. "xz -9 --lzma2 -e" + // where the custom filter chain resets the preset level back to + // the default 6, making the example equivalent to "xz -6e". + preset_number = LZMA_PRESET_DEFAULT; + return; } @@ -134,9 +144,6 @@ coder_set_compression_settings(void) } // Get the preset for LZMA1 or LZMA2. - if (preset_extreme) - preset_number |= LZMA_PRESET_EXTREME; - if (lzma_lzma_preset(&opt_lzma, preset_number)) message_bug(); @@ -284,7 +291,10 @@ coder_set_compression_settings(void) static bool is_format_xz(void) { - return strm.avail_in >= 6 && memcmp(in_buf.u8, "\3757zXZ", 6) == 0; + // Specify the magic as hex to be compatible with EBCDIC systems. + static const uint8_t magic[6] = { 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00 }; + return strm.avail_in >= sizeof(magic) + && memcmp(in_buf.u8, magic, sizeof(magic)) == 0; } diff --git a/Build/source/extra/xz/src/xz/coder.h b/Build/source/extra/xz/src/xz/coder.h index 4626466f39c..2d3add97274 100644 --- a/Build/source/extra/xz/src/xz/coder.h +++ b/Build/source/extra/xz/src/xz/coder.h @@ -46,7 +46,7 @@ extern bool opt_auto_adjust; extern void coder_set_check(lzma_check check); /// Set preset number -extern void coder_set_preset(size_t new_preset); +extern void coder_set_preset(uint32_t new_preset); /// Enable extreme mode extern void coder_set_extreme(void); diff --git a/Build/source/extra/xz/src/xz/file_io.c b/Build/source/extra/xz/src/xz/file_io.c index f9b7f305e09..871a099b619 100644 --- a/Build/source/extra/xz/src/xz/file_io.c +++ b/Build/source/extra/xz/src/xz/file_io.c @@ -41,9 +41,10 @@ static bool warn_fchown; static bool try_sparse = true; #ifndef TUKLIB_DOSLIKE -/// File status flags of standard output. This is used by io_open_dest() -/// and io_close_dest(). -static int stdout_flags = 0; +/// Original file status flags of standard output. This is used by +/// io_open_dest() and io_close_dest() to save and restore the flags. +static int stdout_flags; +static bool restore_stdout_flags = false; #endif @@ -397,10 +398,6 @@ io_open_src_real(file_pair *pair) was_symlink = true; # elif defined(__NetBSD__) - // As of 2010-09-05, NetBSD doesn't document what errno is - // used with O_NOFOLLOW. It is EFTYPE though, and I - // understood that is very unlikely to change even though - // it is undocumented. if (errno == EFTYPE) was_symlink = true; @@ -441,7 +438,7 @@ io_open_src_real(file_pair *pair) flags &= ~O_NONBLOCK; - if (fcntl(pair->src_fd, F_SETFL, flags)) + if (fcntl(pair->src_fd, F_SETFL, flags) == -1) goto error_msg; } #endif @@ -634,11 +631,11 @@ io_open_dest_real(file_pair *pair) if (!S_ISREG(pair->dest_st.st_mode)) return false; - const int flags = fcntl(STDOUT_FILENO, F_GETFL); - if (flags == -1) + stdout_flags = fcntl(STDOUT_FILENO, F_GETFL); + if (stdout_flags == -1) return false; - if (flags & O_APPEND) { + if (stdout_flags & O_APPEND) { // Creating a sparse file is not possible // when O_APPEND is active (it's used by // shell's >> redirection). As I understand @@ -657,12 +654,14 @@ io_open_dest_real(file_pair *pair) return false; if (fcntl(STDOUT_FILENO, F_SETFL, - stdout_flags & ~O_APPEND)) + stdout_flags & ~O_APPEND) + == -1) return false; - // Remember the flags so that io_close_dest() - // can restore them. - stdout_flags = flags; + // Disabling O_APPEND succeeded. Mark + // that the flags should be restored + // in io_close_dest(). + restore_stdout_flags = true; } else if (lseek(STDOUT_FILENO, 0, SEEK_CUR) != pair->dest_st.st_size) { @@ -703,13 +702,12 @@ io_close_dest(file_pair *pair, bool success) { #ifndef TUKLIB_DOSLIKE // If io_open_dest() has disabled O_APPEND, restore it here. - if (stdout_flags != 0) { + if (restore_stdout_flags) { assert(pair->dest_fd == STDOUT_FILENO); - const int fail = fcntl(STDOUT_FILENO, F_SETFL, stdout_flags); - stdout_flags = 0; + restore_stdout_flags = false; - if (fail) { + if (fcntl(STDOUT_FILENO, F_SETFL, stdout_flags) == -1) { message_error(_("Error restoring the O_APPEND flag " "to standard output: %s"), strerror(errno)); @@ -882,7 +880,7 @@ io_write_buf(file_pair *pair, const uint8_t *buf, size_t size) if (amount == -1) { if (errno == EINTR) { if (user_abort) - return -1; + return true; continue; } diff --git a/Build/source/extra/xz/src/xz/list.c b/Build/source/extra/xz/src/xz/list.c index 1c93718b138..0e73d519ea4 100644 --- a/Build/source/extra/xz/src/xz/list.c +++ b/Build/source/extra/xz/src/xz/list.c @@ -203,6 +203,20 @@ parse_indexes(xz_file_info *xfi, file_pair *pair) goto error; } + // Check that the Stream Footer doesn't specify something + // that we don't support. This can only happen if the xz + // version is older than liblzma and liblzma supports + // something new. + // + // It is enough to check Stream Footer. Stream Header must + // match when it is compared against Stream Footer with + // lzma_stream_flags_compare(). + if (footer_flags.version != 0) { + message_error("%s: %s", pair->src_name, + message_strm(LZMA_OPTIONS_ERROR)); + goto error; + } + // Check that the size of the Index field looks sane. lzma_vli index_size = footer_flags.backward_size; if ((lzma_vli)(pos) < index_size + LZMA_STREAM_HEADER_SIZE) { @@ -382,14 +396,9 @@ parse_block_header(file_pair *pair, const lzma_index_iter *iter, if (buf.u8[0] == 0) goto data_error; - lzma_block block; - lzma_filter filters[LZMA_FILTERS_MAX + 1]; - - // Initialize the pointers so that they can be passed to free(). - for (size_t i = 0; i < ARRAY_SIZE(filters); ++i) - filters[i].options = NULL; - // Initialize the block structure and decode Block Header Size. + lzma_filter filters[LZMA_FILTERS_MAX + 1]; + lzma_block block; block.version = 0; block.check = iter->stream.flags->check; block.filters = filters; @@ -434,9 +443,25 @@ parse_block_header(file_pair *pair, const lzma_index_iter *iter, switch (lzma_block_compressed_size(&block, iter->block.unpadded_size)) { case LZMA_OK: - break; + // Validate also block.uncompressed_size if it is present. + // If it isn't present, there's no need to set it since + // we aren't going to actually decompress the Block; if + // we were decompressing, then we should set it so that + // the Block decoder could validate the Uncompressed Size + // that was stored in the Index. + if (block.uncompressed_size == LZMA_VLI_UNKNOWN + || block.uncompressed_size + == iter->block.uncompressed_size) + break; + + // If the above fails, the file is corrupt so + // LZMA_DATA_ERROR is a good error code. case LZMA_DATA_ERROR: + // Free the memory allocated by lzma_block_header_decode(). + for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i) + free(filters[i].options); + goto data_error; default: @@ -466,14 +491,6 @@ data_error: // Show the error message. message_error("%s: %s", pair->src_name, message_strm(LZMA_DATA_ERROR)); - - // Free the memory allocated by lzma_block_header_decode(). - // This is truly needed only if we get here after a succcessful - // call to lzma_block_header_decode() but it doesn't hurt to - // always do it. - for (size_t i = 0; filters[i].id != LZMA_VLI_UNKNOWN; ++i) - free(filters[i].options); - return true; } diff --git a/Build/source/extra/xz/src/xz/message.c b/Build/source/extra/xz/src/xz/message.c index 80c86a49c3d..0a7a522f7af 100644 --- a/Build/source/extra/xz/src/xz/message.c +++ b/Build/source/extra/xz/src/xz/message.c @@ -211,7 +211,7 @@ message_set_files(unsigned int files) static void print_filename(void) { - if (files_total != 1 || filename != stdin_filename) { + if (!opt_robot && (files_total != 1 || filename != stdin_filename)) { signals_block(); FILE *file = opt_mode == MODE_LIST ? stdout : stderr; @@ -859,6 +859,17 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage) // the user might need to +1 MiB to get high enough limit.) memusage = round_up_to_mib(memusage); + uint64_t memlimit = hardware_memlimit_get(opt_mode); + + // Handle the case when there is no memory usage limit. + // This way we don't print a weird message with a huge number. + if (memlimit == UINT64_MAX) { + message(v, _("%s MiB of memory is required. " + "The limiter is disabled."), + uint64_to_str(memusage, 0)); + return; + } + // With US-ASCII: // 2^64 with thousand separators + " MiB" suffix + '\0' = 26 + 4 + 1 // But there may be multibyte chars so reserve enough space. @@ -867,7 +878,6 @@ message_mem_needed(enum message_verbosity v, uint64_t memusage) // Show the memory usage limit as MiB unless it is less than 1 MiB. // This way it's easy to notice errors where one has typed // --memory=123 instead of --memory=123MiB. - uint64_t memlimit = hardware_memlimit_get(opt_mode); if (memlimit < (UINT32_C(1) << 20)) { snprintf(memlimitstr, sizeof(memlimitstr), "%s B", uint64_to_str(memlimit, 1)); diff --git a/Build/source/extra/xz/src/xz/util.c b/Build/source/extra/xz/src/xz/util.c index 987b4430253..35850f4c904 100644 --- a/Build/source/extra/xz/src/xz/util.c +++ b/Build/source/extra/xz/src/xz/util.c @@ -26,9 +26,19 @@ xrealloc(void *ptr, size_t size) { assert(size > 0); + // Save ptr so that we can free it if realloc fails. + // The point is that message_fatal ends up calling stdio functions + // which in some libc implementations might allocate memory from + // the heap. Freeing ptr improves the chances that there's free + // memory for stdio functions if they need it. + void *p = ptr; ptr = realloc(ptr, size); - if (ptr == NULL) - message_fatal("%s", strerror(errno)); + + if (ptr == NULL) { + const int saved_errno = errno; + free(p); + message_fatal("%s", strerror(saved_errno)); + } return ptr; } diff --git a/Build/source/extra/xz/src/xz/xz.1 b/Build/source/extra/xz/src/xz/xz.1 index f1c9135d159..363b90cb4e5 100644 --- a/Build/source/extra/xz/src/xz/xz.1 +++ b/Build/source/extra/xz/src/xz/xz.1 @@ -5,16 +5,17 @@ .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZ 1 "2010-10-04" "Tukaani" "XZ Utils" +.TH XZ 1 "2013-06-21" "Tukaani" "XZ Utils" . .SH NAME xz, unxz, xzcat, lzma, unlzma, lzcat \- Compress or decompress .xz and .lzma files . .SH SYNOPSIS .B xz -.RI [ option ]... -.RI [ file ]... -.PP +.RI [ option... ] +.RI [ file... ] +. +.SH COMMAND ALIASES .B unxz is equivalent to .BR "xz \-\-decompress" . @@ -708,7 +709,7 @@ be dramatically higher than that of the single-threaded mode. DecMem contains the decompressor memory requirements. That is, the compression settings determine the memory requirements of the decompressor. -The exact decompressor memory usage is slighly more than +The exact decompressor memory usage is slightly more than the LZMA2 dictionary size, but the values in the table have been rounded up to the next full MiB. .RE @@ -897,11 +898,14 @@ if threading will be enabled by default. .SS "Custom compressor filter chains" A custom filter chain allows specifying the compression settings in detail instead of relying on -the settings associated to the preset levels. +the settings associated to the presets. When a custom filter chain is specified, -the compression preset level options -(\fB\-0\fR ... \fB\-9\fR and \fB\-\-extreme\fR) are -silently ignored. +preset options (\fB\-0\fR ... \fB\-9\fR and \fB\-\-extreme\fR) +earlier on the command line are forgotten. +If a preset option is specified +after one or more custom filter chain options, +the new preset takes effect and +the custom filter chain options specified earlier are forgotten. .PP A filter chain is comparable to piping on the command line. When compressing, the uncompressed input goes to the first filter, @@ -934,6 +938,15 @@ Extra commas in are ignored. Every option has a default value, so you need to specify only those you want to change. +.PP +To see the whole filter chain and +.IR options , +use +.B "xz \-vv" +(that is, use +.B \-\-verbose +twice). +This works also for viewing the filter chain options used by presets. .TP \fB\-\-lzma1\fR[\fB=\fIoptions\fR] .PD 0 @@ -976,13 +989,12 @@ The only supported modifier is currently .BR e , which matches .BR \-\-extreme . -The default -.I preset -is -.BR 6 , -from which the default values for the rest of the LZMA1 or LZMA2 +If no +.B preset +is specified, the default values of LZMA1 or LZMA2 .I options -are taken. +are taken from the preset +.BR 6 . .TP .BI dict= size Dictionary (history buffer) @@ -1578,7 +1590,7 @@ is supported only together with .BR \-\-info\-memory , and .BR \-\-list . -It will be supported for normal compression and +It will be supported for compression and decompression in the future. . .SS Version @@ -1836,6 +1848,25 @@ headers. .PD .PP The columns of the +.B summary +lines: +.PD 0 +.RS +.IP 2. 4 +Amount of memory (in bytes) required to decompress +this file with this +.B xz +version +.IP 3. 4 +.B yes +or +.B no +indicating if all block headers have both compressed size and +uncompressed size stored in them +.RE +.PD +.PP +The columns of the .B totals line: .PD 0 @@ -2160,14 +2191,15 @@ The output can vary even between different builds of the same XZ Utils version, if different build options are used. .PP -The above means that implementing +The above means that once .B \-\-rsyncable -to create rsyncable -.B .xz -files is not going to happen without -freezing a part of the encoder -implementation, which can then be used with -.BR \-\-rsyncable . +has been implemented, +the resulting files won't necessarily be rsyncable +unless both old and new files have been compressed +with the same xz version. +This problem can be fixed if a part of the encoder +implementation is frozen to keep rsyncable output +stable across xz versions. . .SS "Embedded .xz decompressors" Embedded diff --git a/Build/source/extra/xz/src/xzdec/Makefile.in b/Build/source/extra/xz/src/xzdec/Makefile.in index d86e96751a9..3ebb121a37a 100644 --- a/Build/source/extra/xz/src/xzdec/Makefile.in +++ b/Build/source/extra/xz/src/xzdec/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -16,6 +15,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -41,18 +85,19 @@ bin_PROGRAMS = $(am__EXEEXT_1) $(am__EXEEXT_2) @COND_XZDEC_TRUE@am__append_4 = xzdec @COND_LZMADEC_TRUE@am__append_5 = lzmadec subdir = src/xzdec -DIST_COMMON = $(dist_man_MANS) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp $(dist_man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -81,9 +126,13 @@ am__DEPENDENCIES_1 = am__DEPENDENCIES_2 = $(top_builddir)/src/liblzma/liblzma.la \ $(am__append_2) $(am__DEPENDENCIES_1) lzmadec_DEPENDENCIES = $(am__DEPENDENCIES_2) -lzmadec_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(lzmadec_LDFLAGS) \ - $(LDFLAGS) -o $@ +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +lzmadec_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(lzmadec_LDFLAGS) $(LDFLAGS) -o $@ am__xzdec_SOURCES_DIST = xzdec.c \ $(top_srcdir)/src/common/tuklib_progname.c \ $(top_srcdir)/src/common/tuklib_exit.c xzdec_w32res.rc @@ -94,21 +143,47 @@ am_xzdec_OBJECTS = xzdec-xzdec.$(OBJEXT) \ xzdec_OBJECTS = $(am_xzdec_OBJECTS) xzdec_DEPENDENCIES = $(top_builddir)/src/liblzma/liblzma.la \ $(am__append_2) $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = SOURCES = $(lzmadec_SOURCES) $(xzdec_SOURCES) DIST_SOURCES = $(am__lzmadec_SOURCES_DIST) $(am__xzdec_SOURCES_DIST) +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; am__vpath_adj = case $$p in \ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ @@ -130,15 +205,39 @@ am__nobase_list = $(am__nobase_strip_setup); \ am__base_list = \ sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' +am__uninstall_files_from_dir = { \ + test -z "$$files" \ + || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \ + || { echo " ( cd '$$dir' && rm -f" $$files ")"; \ + $(am__cd) "$$dir" && rm -f $$files; }; \ + } man1dir = $(mandir)/man1 NROFF = nroff MANS = $(dist_man_MANS) +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -167,6 +266,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -227,6 +327,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -234,12 +335,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -333,14 +434,19 @@ $(ACLOCAL_M4): $(am__aclocal_m4_deps) $(am__aclocal_m4_deps): install-binPROGRAMS: $(bin_PROGRAMS) @$(NORMAL_INSTALL) - test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)" @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \ + fi; \ for p in $$list; do echo "$$p $$p"; done | \ sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ + while read p p1; do if test -f $$p \ + || test -f $$p1 \ + ; then echo "$$p"; echo "$$p"; else :; fi; \ done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ + sed -e 'p;s,.*/,,;n;h' \ + -e 's|.*|.|' \ -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ sed 'N;N;N;s,\n, ,g' | \ $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ @@ -361,7 +467,8 @@ uninstall-binPROGRAMS: @list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \ files=`for p in $$list; do echo "$$p"; done | \ sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ + -e 's/$$/$(EXEEXT)/' \ + `; \ test -n "$$list" || exit 0; \ echo " ( cd '$(DESTDIR)$(bindir)' && rm -f" $$files ")"; \ cd "$(DESTDIR)$(bindir)" && rm -f $$files @@ -374,12 +481,14 @@ clean-binPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -lzmadec$(EXEEXT): $(lzmadec_OBJECTS) $(lzmadec_DEPENDENCIES) + +lzmadec$(EXEEXT): $(lzmadec_OBJECTS) $(lzmadec_DEPENDENCIES) $(EXTRA_lzmadec_DEPENDENCIES) @rm -f lzmadec$(EXEEXT) - $(lzmadec_LINK) $(lzmadec_OBJECTS) $(lzmadec_LDADD) $(LIBS) -xzdec$(EXEEXT): $(xzdec_OBJECTS) $(xzdec_DEPENDENCIES) + $(AM_V_CCLD)$(lzmadec_LINK) $(lzmadec_OBJECTS) $(lzmadec_LDADD) $(LIBS) + +xzdec$(EXEEXT): $(xzdec_OBJECTS) $(xzdec_DEPENDENCIES) $(EXTRA_xzdec_DEPENDENCIES) @rm -f xzdec$(EXEEXT) - $(LINK) $(xzdec_OBJECTS) $(xzdec_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(xzdec_OBJECTS) $(xzdec_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -395,109 +504,109 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xzdec-xzdec.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< lzmadec-xzdec.o: xzdec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-xzdec.o -MD -MP -MF $(DEPDIR)/lzmadec-xzdec.Tpo -c -o lzmadec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmadec-xzdec.Tpo $(DEPDIR)/lzmadec-xzdec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xzdec.c' object='lzmadec-xzdec.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-xzdec.o -MD -MP -MF $(DEPDIR)/lzmadec-xzdec.Tpo -c -o lzmadec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmadec-xzdec.Tpo $(DEPDIR)/lzmadec-xzdec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xzdec.c' object='lzmadec-xzdec.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c lzmadec-xzdec.obj: xzdec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-xzdec.obj -MD -MP -MF $(DEPDIR)/lzmadec-xzdec.Tpo -c -o lzmadec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmadec-xzdec.Tpo $(DEPDIR)/lzmadec-xzdec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xzdec.c' object='lzmadec-xzdec.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-xzdec.obj -MD -MP -MF $(DEPDIR)/lzmadec-xzdec.Tpo -c -o lzmadec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmadec-xzdec.Tpo $(DEPDIR)/lzmadec-xzdec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xzdec.c' object='lzmadec-xzdec.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` lzmadec-tuklib_progname.o: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_progname.o -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_progname.Tpo -c -o lzmadec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmadec-tuklib_progname.Tpo $(DEPDIR)/lzmadec-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmadec-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_progname.o -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_progname.Tpo -c -o lzmadec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmadec-tuklib_progname.Tpo $(DEPDIR)/lzmadec-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmadec-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c lzmadec-tuklib_progname.obj: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_progname.Tpo -c -o lzmadec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmadec-tuklib_progname.Tpo $(DEPDIR)/lzmadec-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmadec-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_progname.Tpo -c -o lzmadec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmadec-tuklib_progname.Tpo $(DEPDIR)/lzmadec-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='lzmadec-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` lzmadec-tuklib_exit.o: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_exit.o -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_exit.Tpo -c -o lzmadec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmadec-tuklib_exit.Tpo $(DEPDIR)/lzmadec-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmadec-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_exit.o -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_exit.Tpo -c -o lzmadec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmadec-tuklib_exit.Tpo $(DEPDIR)/lzmadec-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmadec-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c lzmadec-tuklib_exit.obj: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_exit.Tpo -c -o lzmadec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/lzmadec-tuklib_exit.Tpo $(DEPDIR)/lzmadec-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmadec-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT lzmadec-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/lzmadec-tuklib_exit.Tpo -c -o lzmadec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/lzmadec-tuklib_exit.Tpo $(DEPDIR)/lzmadec-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='lzmadec-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(lzmadec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o lzmadec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` xzdec-xzdec.o: xzdec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-xzdec.o -MD -MP -MF $(DEPDIR)/xzdec-xzdec.Tpo -c -o xzdec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xzdec-xzdec.Tpo $(DEPDIR)/xzdec-xzdec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xzdec.c' object='xzdec-xzdec.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-xzdec.o -MD -MP -MF $(DEPDIR)/xzdec-xzdec.Tpo -c -o xzdec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzdec-xzdec.Tpo $(DEPDIR)/xzdec-xzdec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xzdec.c' object='xzdec-xzdec.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-xzdec.o `test -f 'xzdec.c' || echo '$(srcdir)/'`xzdec.c xzdec-xzdec.obj: xzdec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-xzdec.obj -MD -MP -MF $(DEPDIR)/xzdec-xzdec.Tpo -c -o xzdec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xzdec-xzdec.Tpo $(DEPDIR)/xzdec-xzdec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='xzdec.c' object='xzdec-xzdec.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-xzdec.obj -MD -MP -MF $(DEPDIR)/xzdec-xzdec.Tpo -c -o xzdec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzdec-xzdec.Tpo $(DEPDIR)/xzdec-xzdec.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='xzdec.c' object='xzdec-xzdec.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-xzdec.obj `if test -f 'xzdec.c'; then $(CYGPATH_W) 'xzdec.c'; else $(CYGPATH_W) '$(srcdir)/xzdec.c'; fi` xzdec-tuklib_progname.o: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_progname.o -MD -MP -MF $(DEPDIR)/xzdec-tuklib_progname.Tpo -c -o xzdec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xzdec-tuklib_progname.Tpo $(DEPDIR)/xzdec-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='xzdec-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_progname.o -MD -MP -MF $(DEPDIR)/xzdec-tuklib_progname.Tpo -c -o xzdec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzdec-tuklib_progname.Tpo $(DEPDIR)/xzdec-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='xzdec-tuklib_progname.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_progname.o `test -f '$(top_srcdir)/src/common/tuklib_progname.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_progname.c xzdec-tuklib_progname.obj: $(top_srcdir)/src/common/tuklib_progname.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/xzdec-tuklib_progname.Tpo -c -o xzdec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xzdec-tuklib_progname.Tpo $(DEPDIR)/xzdec-tuklib_progname.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_progname.c' object='xzdec-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_progname.obj -MD -MP -MF $(DEPDIR)/xzdec-tuklib_progname.Tpo -c -o xzdec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzdec-tuklib_progname.Tpo $(DEPDIR)/xzdec-tuklib_progname.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_progname.c' object='xzdec-tuklib_progname.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_progname.obj `if test -f '$(top_srcdir)/src/common/tuklib_progname.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_progname.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_progname.c'; fi` xzdec-tuklib_exit.o: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_exit.o -MD -MP -MF $(DEPDIR)/xzdec-tuklib_exit.Tpo -c -o xzdec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xzdec-tuklib_exit.Tpo $(DEPDIR)/xzdec-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='xzdec-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_exit.o -MD -MP -MF $(DEPDIR)/xzdec-tuklib_exit.Tpo -c -o xzdec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzdec-tuklib_exit.Tpo $(DEPDIR)/xzdec-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='xzdec-tuklib_exit.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_exit.o `test -f '$(top_srcdir)/src/common/tuklib_exit.c' || echo '$(srcdir)/'`$(top_srcdir)/src/common/tuklib_exit.c xzdec-tuklib_exit.obj: $(top_srcdir)/src/common/tuklib_exit.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/xzdec-tuklib_exit.Tpo -c -o xzdec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/xzdec-tuklib_exit.Tpo $(DEPDIR)/xzdec-tuklib_exit.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$(top_srcdir)/src/common/tuklib_exit.c' object='xzdec-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT xzdec-tuklib_exit.obj -MD -MP -MF $(DEPDIR)/xzdec-tuklib_exit.Tpo -c -o xzdec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/xzdec-tuklib_exit.Tpo $(DEPDIR)/xzdec-tuklib_exit.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$(top_srcdir)/src/common/tuklib_exit.c' object='xzdec-tuklib_exit.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(xzdec_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o xzdec-tuklib_exit.obj `if test -f '$(top_srcdir)/src/common/tuklib_exit.c'; then $(CYGPATH_W) '$(top_srcdir)/src/common/tuklib_exit.c'; else $(CYGPATH_W) '$(srcdir)/$(top_srcdir)/src/common/tuklib_exit.c'; fi` mostlyclean-libtool: -rm -f *.lo @@ -506,11 +615,18 @@ clean-libtool: -rm -rf .libs _libs install-man1: $(dist_man_MANS) @$(NORMAL_INSTALL) - test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)" - @list=''; test -n "$(man1dir)" || exit 0; \ - { for i in $$list; do echo "$$i"; done; \ - l2='$(dist_man_MANS)'; for i in $$l2; do echo "$$i"; done | \ - sed -n '/\.1[a-z]*$$/p'; \ + @list1=''; \ + list2='$(dist_man_MANS)'; \ + test -n "$(man1dir)" \ + && test -n "`echo $$list1$$list2`" \ + || exit 0; \ + echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \ + { for i in $$list1; do echo "$$i"; done; \ + if test -n "$$list2"; then \ + for i in $$list2; do echo "$$i"; done \ + | sed -n '/\.1[a-z]*$$/p'; \ + fi; \ } | while read p; do \ if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ echo "$$d$$p"; echo "$$p"; \ @@ -539,30 +655,17 @@ uninstall-man1: sed -n '/\.1[a-z]*$$/p'; \ } | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \ -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \ - test -z "$$files" || { \ - echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(man1dir)" && rm -f $$files; } - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) + dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir) + +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -574,15 +677,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -591,24 +690,26 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags distdir: $(DISTFILES) - @list='$(MANS)'; if test -n "$$list"; then \ - list=`for p in $$list; do \ - if test -f $$p; then d=; else d="$(srcdir)/"; fi; \ - if test -f "$$d$$p"; then echo "$$d$$p"; else :; fi; done`; \ - if test -n "$$list" && \ - grep 'ab help2man is required to generate this page' $$list >/dev/null; then \ - echo "error: found man pages containing the \`missing help2man' replacement text:" >&2; \ - grep -l 'ab help2man is required to generate this page' $$list | sed 's/^/ /' >&2; \ - echo " to fix them, install help2man, remove and regenerate the man pages;" >&2; \ - echo " typically \`make maintainer-clean' will remove them" >&2; \ - exit 1; \ - else :; fi; \ - else :; fi @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ list='$(DISTFILES)'; \ @@ -655,10 +756,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -748,20 +854,21 @@ uninstall-man: uninstall-man1 .MAKE: install-am install-data-am install-strip uninstall-am -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \ - clean-generic clean-libtool ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-binPROGRAMS install-data install-data-am \ - install-data-hook install-dvi install-dvi-am install-exec \ - install-exec-am install-html install-html-am install-info \ - install-info-am install-man install-man1 install-pdf \ - install-pdf-am install-ps install-ps-am install-strip \ - installcheck installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-binPROGRAMS \ - uninstall-hook uninstall-man uninstall-man1 +.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \ + clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \ + ctags ctags-am distclean distclean-compile distclean-generic \ + distclean-libtool distclean-tags distdir dvi dvi-am html \ + html-am info info-am install install-am install-binPROGRAMS \ + install-data install-data-am install-data-hook install-dvi \ + install-dvi-am install-exec install-exec-am install-html \ + install-html-am install-info install-info-am install-man \ + install-man1 install-pdf install-pdf-am install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \ + uninstall-am uninstall-binPROGRAMS uninstall-hook \ + uninstall-man uninstall-man1 # Windows resource compiler support. It's fine to use xz_CPPFLAGS @@ -786,4 +893,3 @@ uninstall-man: uninstall-man1 # 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: - diff --git a/Build/source/extra/xz/src/xzdec/xzdec.1 b/Build/source/extra/xz/src/xzdec/xzdec.1 index 7cc9be5de08..1e5ced945aa 100644 --- a/Build/source/extra/xz/src/xzdec/xzdec.1 +++ b/Build/source/extra/xz/src/xzdec/xzdec.1 @@ -4,17 +4,17 @@ .\" This file has been put into the public domain. .\" You can do whatever you want with this file. .\" -.TH XZDEC 1 "2010-09-27" "Tukaani" "XZ Utils" +.TH XZDEC 1 "2013-06-30" "Tukaani" "XZ Utils" .SH NAME xzdec, lzmadec \- Small .xz and .lzma decompressors .SH SYNOPSIS .B xzdec -.RI [ option ]... -.RI [ file ]... +.RI [ option... ] +.RI [ file... ] .br .B lzmadec -.RI [ option ]... -.RI [ file ]... +.RI [ option... ] +.RI [ file... ] .SH DESCRIPTION .B xzdec is a liblzma-based decompression-only tool for diff --git a/Build/source/extra/xz/src/xzdec/xzdec.c b/Build/source/extra/xz/src/xzdec/xzdec.c index b7830db4b52..5cb7530afce 100644 --- a/Build/source/extra/xz/src/xzdec/xzdec.c +++ b/Build/source/extra/xz/src/xzdec/xzdec.c @@ -62,13 +62,13 @@ help(void) { printf( "Usage: %s [OPTION]... [FILE]...\n" -"Uncompress files in the ." TOOL_FORMAT " format to the standard output.\n" +"Decompress files in the ." TOOL_FORMAT " format to standard output.\n" "\n" -" -c, --stdout (ignored)\n" -" -d, --decompress (ignored)\n" -" -k, --keep (ignored)\n" +" -d, --decompress (ignored, only decompression is supported)\n" +" -k, --keep (ignored, files are never deleted)\n" +" -c, --stdout (ignored, output is always written to standard output)\n" " -q, --quiet specify *twice* to suppress errors\n" -" -Q, --no-warn (ignored)\n" +" -Q, --no-warn (ignored, the exit status 2 is never used)\n" " -h, --help display this help and exit\n" " -V, --version display the version number and exit\n" "\n" diff --git a/Build/source/extra/xz/tests/Makefile.am b/Build/source/extra/xz/tests/Makefile.am index d0807ae4a15..c4e17ed1dd7 100644 --- a/Build/source/extra/xz/tests/Makefile.am +++ b/Build/source/extra/xz/tests/Makefile.am @@ -10,6 +10,7 @@ EXTRA_DIST = \ tests.h \ test_files.sh \ test_compress.sh \ + test_scripts.sh \ bcj_test.c \ compress_prepared_bcj_sparc \ compress_prepared_bcj_x86 @@ -33,7 +34,8 @@ check_PROGRAMS = \ test_stream_flags \ test_filter_flags \ test_block_header \ - test_index + test_index \ + test_bcj_exact_size TESTS = \ test_check \ @@ -41,8 +43,13 @@ TESTS = \ test_filter_flags \ test_block_header \ test_index \ + test_bcj_exact_size \ test_files.sh \ test_compress.sh +if COND_SCRIPTS +TESTS += test_scripts.sh +endif + clean-local: -rm -f compress_generated_* diff --git a/Build/source/extra/xz/tests/Makefile.in b/Build/source/extra/xz/tests/Makefile.in index 5e57c057afe..19c49f3f414 100644 --- a/Build/source/extra/xz/tests/Makefile.in +++ b/Build/source/extra/xz/tests/Makefile.in @@ -1,9 +1,8 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. +# Makefile.in generated by automake 1.14 from Makefile.am. # @configure_input@ -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. +# Copyright (C) 1994-2013 Free Software Foundation, Inc. + # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -15,6 +14,51 @@ @SET_MAKE@ VPATH = @srcdir@ +am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__make_running_with_option = \ + case $${target_option-} in \ + ?) ;; \ + *) echo "am__make_running_with_option: internal error: invalid" \ + "target option '$${target_option-}' specified" >&2; \ + exit 1;; \ + esac; \ + has_opt=no; \ + sane_makeflags=$$MAKEFLAGS; \ + if $(am__is_gnu_make); then \ + sane_makeflags=$$MFLAGS; \ + else \ + case $$MAKEFLAGS in \ + *\\[\ \ ]*) \ + bs=\\; \ + sane_makeflags=`printf '%s\n' "$$MAKEFLAGS" \ + | sed "s/$$bs$$bs[$$bs $$bs ]*//g"`;; \ + esac; \ + fi; \ + skip_next=no; \ + strip_trailopt () \ + { \ + flg=`printf '%s\n' "$$flg" | sed "s/$$1.*$$//"`; \ + }; \ + for flg in $$sane_makeflags; do \ + test $$skip_next = yes && { skip_next=no; continue; }; \ + case $$flg in \ + *=*|--*) continue;; \ + -*I) strip_trailopt 'I'; skip_next=yes;; \ + -*I?*) strip_trailopt 'I';; \ + -*O) strip_trailopt 'O'; skip_next=yes;; \ + -*O?*) strip_trailopt 'O';; \ + -*l) strip_trailopt 'l'; skip_next=yes;; \ + -*l?*) strip_trailopt 'l';; \ + -[dEDm]) skip_next=yes;; \ + -[JT]) skip_next=yes;; \ + esac; \ + case $$flg in \ + *$$target_option*) has_opt=yes; break;; \ + esac; \ + done; \ + test $$has_opt = yes +am__make_dryrun = (target_option=n; $(am__make_running_with_option)) +am__make_keepgoing = (target_option=k; $(am__make_running_with_option)) pkgdatadir = $(datadir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ @@ -36,22 +80,27 @@ host_triplet = @host@ @COND_GNULIB_TRUE@am__append_1 = $(top_builddir)/lib/libgnu.a check_PROGRAMS = create_compress_files$(EXEEXT) test_check$(EXEEXT) \ test_stream_flags$(EXEEXT) test_filter_flags$(EXEEXT) \ - test_block_header$(EXEEXT) test_index$(EXEEXT) + test_block_header$(EXEEXT) test_index$(EXEEXT) \ + test_bcj_exact_size$(EXEEXT) TESTS = test_check$(EXEEXT) test_stream_flags$(EXEEXT) \ test_filter_flags$(EXEEXT) test_block_header$(EXEEXT) \ - test_index$(EXEEXT) test_files.sh test_compress.sh + test_index$(EXEEXT) test_bcj_exact_size$(EXEEXT) test_files.sh \ + test_compress.sh $(am__append_2) +@COND_SCRIPTS_TRUE@am__append_2 = test_scripts.sh subdir = tests -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in +DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/m4/acx_pthread.m4 \ +am__aclocal_m4_deps = $(top_srcdir)/m4/ax_pthread.m4 \ $(top_srcdir)/m4/getopt.m4 $(top_srcdir)/m4/gettext.m4 \ - $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ - $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ - $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \ - $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \ - $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/m4/nls.m4 \ - $(top_srcdir)/m4/po.m4 $(top_srcdir)/m4/posix-shell.m4 \ - $(top_srcdir)/m4/progtest.m4 $(top_srcdir)/m4/tuklib_common.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/intlmacosx.m4 \ + $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ + $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/libtool.m4 \ + $(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \ + $(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \ + $(top_srcdir)/m4/nls.m4 $(top_srcdir)/m4/po.m4 \ + $(top_srcdir)/m4/posix-shell.m4 $(top_srcdir)/m4/progtest.m4 \ + $(top_srcdir)/m4/tuklib_common.m4 \ $(top_srcdir)/m4/tuklib_cpucores.m4 \ $(top_srcdir)/m4/tuklib_integer.m4 \ $(top_srcdir)/m4/tuklib_mbstr.m4 \ @@ -71,6 +120,16 @@ am__DEPENDENCIES_1 = create_compress_files_DEPENDENCIES = \ $(top_builddir)/src/liblzma/liblzma.la $(am__append_1) \ $(am__DEPENDENCIES_1) +AM_V_lt = $(am__v_lt_@AM_V@) +am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) +am__v_lt_0 = --silent +am__v_lt_1 = +test_bcj_exact_size_SOURCES = test_bcj_exact_size.c +test_bcj_exact_size_OBJECTS = test_bcj_exact_size.$(OBJEXT) +test_bcj_exact_size_LDADD = $(LDADD) +test_bcj_exact_size_DEPENDENCIES = \ + $(top_builddir)/src/liblzma/liblzma.la $(am__append_1) \ + $(am__DEPENDENCIES_1) test_block_header_SOURCES = test_block_header.c test_block_header_OBJECTS = test_block_header.$(OBJEXT) test_block_header_LDADD = $(LDADD) @@ -99,32 +158,97 @@ test_stream_flags_LDADD = $(LDADD) test_stream_flags_DEPENDENCIES = \ $(top_builddir)/src/liblzma/liblzma.la $(am__append_1) \ $(am__DEPENDENCIES_1) +AM_V_P = $(am__v_P_@AM_V@) +am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) +am__v_P_0 = false +am__v_P_1 = : +AM_V_GEN = $(am__v_GEN_@AM_V@) +am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@) +am__v_GEN_0 = @echo " GEN " $@; +am__v_GEN_1 = +AM_V_at = $(am__v_at_@AM_V@) +am__v_at_ = $(am__v_at_@AM_DEFAULT_V@) +am__v_at_0 = @ +am__v_at_1 = DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/build-aux/depcomp am__depfiles_maybe = depfiles am__mv = mv -f COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) +LTCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) \ + $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \ + $(AM_CFLAGS) $(CFLAGS) +AM_V_CC = $(am__v_CC_@AM_V@) +am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@) +am__v_CC_0 = @echo " CC " $@; +am__v_CC_1 = CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = create_compress_files.c test_block_header.c test_check.c \ - test_filter_flags.c test_index.c test_stream_flags.c -DIST_SOURCES = create_compress_files.c test_block_header.c \ - test_check.c test_filter_flags.c test_index.c \ - test_stream_flags.c +LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(AM_LDFLAGS) $(LDFLAGS) -o $@ +AM_V_CCLD = $(am__v_CCLD_@AM_V@) +am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@) +am__v_CCLD_0 = @echo " CCLD " $@; +am__v_CCLD_1 = +SOURCES = create_compress_files.c test_bcj_exact_size.c \ + test_block_header.c test_check.c test_filter_flags.c \ + test_index.c test_stream_flags.c +DIST_SOURCES = create_compress_files.c test_bcj_exact_size.c \ + test_block_header.c test_check.c test_filter_flags.c \ + test_index.c test_stream_flags.c +am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ + *) (install-info --version) >/dev/null 2>&1;; \ + esac +am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP) +# Read a list of newline-separated strings from the standard input, +# and print each of them once, without duplicates. Input order is +# *not* preserved. +am__uniquify_input = $(AWK) '\ + BEGIN { nonempty = 0; } \ + { items[$$0] = 1; nonempty = 1; } \ + END { if (nonempty) { for (i in items) print i; }; } \ +' +# Make sure the list of sources is unique. This is necessary because, +# e.g., the same source file might be shared among _SOURCES variables +# for different programs/libraries. +am__define_uniq_tagged_files = \ + list='$(am__tagged_files)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= +am__tty_colors_dummy = \ + mgn= red= grn= lgn= blu= brg= std=; \ + am__color_tests=no +am__tty_colors = { \ + $(am__tty_colors_dummy); \ + if test "X$(AM_COLOR_TESTS)" = Xno; then \ + am__color_tests=no; \ + elif test "X$(AM_COLOR_TESTS)" = Xalways; then \ + am__color_tests=yes; \ + elif test "X$$TERM" != Xdumb && { test -t 1; } 2>/dev/null; then \ + am__color_tests=yes; \ + fi; \ + if test $$am__color_tests = yes; then \ + red='[0;31m'; \ + grn='[0;32m'; \ + lgn='[1;32m'; \ + blu='[1;34m'; \ + mgn='[0;35m'; \ + brg='[1m'; \ + std='[m'; \ + fi; \ +} DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ AMTAR = @AMTAR@ AM_CFLAGS = @AM_CFLAGS@ +AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@ AR = @AR@ AS = @AS@ AUTOCONF = @AUTOCONF@ @@ -153,6 +277,7 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ FGREP = @FGREP@ GETOPT_H = @GETOPT_H@ +GETTEXT_MACRO_VERSION = @GETTEXT_MACRO_VERSION@ GMSGFMT = @GMSGFMT@ GMSGFMT_015 = @GMSGFMT_015@ GREP = @GREP@ @@ -213,6 +338,7 @@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ XGETTEXT = @XGETTEXT@ XGETTEXT_015 = @XGETTEXT_015@ +XGETTEXT_EXTRA_OPTIONS = @XGETTEXT_EXTRA_OPTIONS@ abs_builddir = @abs_builddir@ abs_srcdir = @abs_srcdir@ abs_top_builddir = @abs_top_builddir@ @@ -220,12 +346,12 @@ abs_top_srcdir = @abs_top_srcdir@ ac_ct_AR = @ac_ct_AR@ ac_ct_CC = @ac_ct_CC@ ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -acx_pthread_config = @acx_pthread_config@ am__include = @am__include@ am__leading_dot = @am__leading_dot@ am__quote = @am__quote@ am__tar = @am__tar@ am__untar = @am__untar@ +ax_pthread_config = @ax_pthread_config@ bindir = @bindir@ build = @build@ build_alias = @build_alias@ @@ -272,6 +398,7 @@ EXTRA_DIST = \ tests.h \ test_files.sh \ test_compress.sh \ + test_scripts.sh \ bcj_test.c \ compress_prepared_bcj_sparc \ compress_prepared_bcj_x86 @@ -326,24 +453,34 @@ clean-checkPROGRAMS: list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ echo " rm -f" $$list; \ rm -f $$list -create_compress_files$(EXEEXT): $(create_compress_files_OBJECTS) $(create_compress_files_DEPENDENCIES) + +create_compress_files$(EXEEXT): $(create_compress_files_OBJECTS) $(create_compress_files_DEPENDENCIES) $(EXTRA_create_compress_files_DEPENDENCIES) @rm -f create_compress_files$(EXEEXT) - $(LINK) $(create_compress_files_OBJECTS) $(create_compress_files_LDADD) $(LIBS) -test_block_header$(EXEEXT): $(test_block_header_OBJECTS) $(test_block_header_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(create_compress_files_OBJECTS) $(create_compress_files_LDADD) $(LIBS) + +test_bcj_exact_size$(EXEEXT): $(test_bcj_exact_size_OBJECTS) $(test_bcj_exact_size_DEPENDENCIES) $(EXTRA_test_bcj_exact_size_DEPENDENCIES) + @rm -f test_bcj_exact_size$(EXEEXT) + $(AM_V_CCLD)$(LINK) $(test_bcj_exact_size_OBJECTS) $(test_bcj_exact_size_LDADD) $(LIBS) + +test_block_header$(EXEEXT): $(test_block_header_OBJECTS) $(test_block_header_DEPENDENCIES) $(EXTRA_test_block_header_DEPENDENCIES) @rm -f test_block_header$(EXEEXT) - $(LINK) $(test_block_header_OBJECTS) $(test_block_header_LDADD) $(LIBS) -test_check$(EXEEXT): $(test_check_OBJECTS) $(test_check_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(test_block_header_OBJECTS) $(test_block_header_LDADD) $(LIBS) + +test_check$(EXEEXT): $(test_check_OBJECTS) $(test_check_DEPENDENCIES) $(EXTRA_test_check_DEPENDENCIES) @rm -f test_check$(EXEEXT) - $(LINK) $(test_check_OBJECTS) $(test_check_LDADD) $(LIBS) -test_filter_flags$(EXEEXT): $(test_filter_flags_OBJECTS) $(test_filter_flags_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(test_check_OBJECTS) $(test_check_LDADD) $(LIBS) + +test_filter_flags$(EXEEXT): $(test_filter_flags_OBJECTS) $(test_filter_flags_DEPENDENCIES) $(EXTRA_test_filter_flags_DEPENDENCIES) @rm -f test_filter_flags$(EXEEXT) - $(LINK) $(test_filter_flags_OBJECTS) $(test_filter_flags_LDADD) $(LIBS) -test_index$(EXEEXT): $(test_index_OBJECTS) $(test_index_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(test_filter_flags_OBJECTS) $(test_filter_flags_LDADD) $(LIBS) + +test_index$(EXEEXT): $(test_index_OBJECTS) $(test_index_DEPENDENCIES) $(EXTRA_test_index_DEPENDENCIES) @rm -f test_index$(EXEEXT) - $(LINK) $(test_index_OBJECTS) $(test_index_LDADD) $(LIBS) -test_stream_flags$(EXEEXT): $(test_stream_flags_OBJECTS) $(test_stream_flags_DEPENDENCIES) + $(AM_V_CCLD)$(LINK) $(test_index_OBJECTS) $(test_index_LDADD) $(LIBS) + +test_stream_flags$(EXEEXT): $(test_stream_flags_OBJECTS) $(test_stream_flags_DEPENDENCIES) $(EXTRA_test_stream_flags_DEPENDENCIES) @rm -f test_stream_flags$(EXEEXT) - $(LINK) $(test_stream_flags_OBJECTS) $(test_stream_flags_LDADD) $(LIBS) + $(AM_V_CCLD)$(LINK) $(test_stream_flags_OBJECTS) $(test_stream_flags_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -352,6 +489,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/create_compress_files.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_bcj_exact_size.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_block_header.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_check.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_filter_flags.Po@am__quote@ @@ -359,25 +497,25 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/test_stream_flags.Po@am__quote@ .c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $< .c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'` .c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ +@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< +@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< +@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $< mostlyclean-libtool: -rm -f *.lo @@ -385,26 +523,15 @@ mostlyclean-libtool: clean-libtool: -rm -rf .libs _libs -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) +ID: $(am__tagged_files) + $(am__define_uniq_tagged_files); mkid -fID $$unique +tags: tags-am +TAGS: tags + +tags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) set x; \ here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ + $(am__define_uniq_tagged_files); \ shift; \ if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ test -n "$$unique" || unique=$$empty_fix; \ @@ -416,15 +543,11 @@ TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ $$unique; \ fi; \ fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ +ctags: ctags-am + +CTAGS: ctags +ctags-am: $(TAGS_DEPENDENCIES) $(am__tagged_files) + $(am__define_uniq_tagged_files); \ test -z "$(CTAGS_ARGS)$$unique" \ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ $$unique @@ -433,6 +556,21 @@ GTAGS: here=`$(am__cd) $(top_builddir) && pwd` \ && $(am__cd) $(top_srcdir) \ && gtags -i $(GTAGS_ARGS) "$$here" +cscopelist: cscopelist-am + +cscopelist-am: $(am__tagged_files) + list='$(am__tagged_files)'; \ + case "$(srcdir)" in \ + [\\/]* | ?:[\\/]*) sdir="$(srcdir)" ;; \ + *) sdir=$(subdir)/$(srcdir) ;; \ + esac; \ + for i in $$list; do \ + if test -f "$$i"; then \ + echo "$(subdir)/$$i"; \ + else \ + echo "$$sdir/$$i"; \ + fi; \ + done >> $(top_builddir)/cscope.files distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags @@ -447,7 +585,7 @@ check-TESTS: $(TESTS) if test -f ./$$tst; then dir=./; \ elif test -f $$tst; then dir=; \ else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst $(AM_TESTS_FD_REDIRECT); then \ all=`expr $$all + 1`; \ case " $(XFAIL_TESTS) " in \ *[\ \ ]$$tst[\ \ ]*) \ @@ -518,14 +656,15 @@ check-TESTS: $(TESTS) fi; \ dashes=`echo "$$dashes" | sed s/./=/g`; \ if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ + col="$$grn"; \ else \ - echo "$$red$$dashes"; \ + col="$$red"; \ fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ + echo "$${col}$$dashes$${std}"; \ + echo "$${col}$$banner$${std}"; \ + test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \ + test -z "$$report" || echo "$${col}$$report$${std}"; \ + echo "$${col}$$dashes$${std}"; \ test "$$failed" -eq 0; \ else :; fi @@ -575,10 +714,15 @@ install-am: all-am installcheck: installcheck-am install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install + if test -z '$(STRIP)'; then \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + install; \ + else \ + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \ + fi mostlyclean-generic: clean-generic: @@ -663,19 +807,19 @@ uninstall-am: .MAKE: check-am install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ +.PHONY: CTAGS GTAGS TAGS all all-am check check-TESTS check-am clean \ clean-checkPROGRAMS clean-generic clean-libtool clean-local \ - ctags distclean distclean-compile distclean-generic \ - distclean-libtool distclean-tags distdir dvi dvi-am html \ - html-am info info-am install install-am install-data \ - install-data-am 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 maintainer-clean \ + cscopelist-am ctags ctags-am distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am 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 maintainer-clean \ maintainer-clean-generic mostlyclean mostlyclean-compile \ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am + tags tags-am uninstall uninstall-am clean-local: @@ -684,4 +828,3 @@ clean-local: # 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: - diff --git a/Build/source/extra/xz/tests/create_compress_files.c b/Build/source/extra/xz/tests/create_compress_files.c index 44367d8f18e..bd5b4ef40d4 100644 --- a/Build/source/extra/xz/tests/create_compress_files.c +++ b/Build/source/extra/xz/tests/create_compress_files.c @@ -79,7 +79,8 @@ static void write_abc(FILE *file) { for (size_t i = 0; i < 12345; ++i) - fwrite("abc\n", 4, 1, file); + if (fwrite("abc\n", 4, 1, file) != 1) + exit(1); } diff --git a/Build/source/extra/xz/tests/files/README b/Build/source/extra/xz/tests/files/README index 2f74cef2fa0..53950edb491 100644 --- a/Build/source/extra/xz/tests/files/README +++ b/Build/source/extra/xz/tests/files/README @@ -188,6 +188,10 @@ bad-1-block_header-5.xz has zero as Compressed Size in Block Header. + bad-1-block_header-6.xz has corrupt Block Header which may crash + xz -lvv in XZ Utils 5.0.3 and earlier. It was fixed in the commit + c0297445064951807803457dca1611b3c47e7f0f. + bad-2-index-1.xz has wrong Unpadded Sizes in Index. bad-2-index-2.xz has wrong Uncompressed Sizes in Index. diff --git a/Build/source/extra/xz/tests/files/bad-1-block_header-6.xz b/Build/source/extra/xz/tests/files/bad-1-block_header-6.xz Binary files differnew file mode 100644 index 00000000000..ecf0ff09c11 --- /dev/null +++ b/Build/source/extra/xz/tests/files/bad-1-block_header-6.xz diff --git a/Build/source/extra/xz/tests/test_bcj_exact_size.c b/Build/source/extra/xz/tests/test_bcj_exact_size.c new file mode 100644 index 00000000000..cbd93405cd1 --- /dev/null +++ b/Build/source/extra/xz/tests/test_bcj_exact_size.c @@ -0,0 +1,112 @@ +/////////////////////////////////////////////////////////////////////////////// +// +/// \file test_bcj_exact_size.c +/// \brief Tests BCJ decoding when the output size is known +/// +/// These tests fail with XZ Utils 5.0.3 and earlier. +// +// Author: Lasse Collin +// +// This file has been put into the public domain. +// You can do whatever you want with this file. +// +/////////////////////////////////////////////////////////////////////////////// + +#include "tests.h" + + +/// Something to be compressed +static const uint8_t in[16] = "0123456789ABCDEF"; + +/// in[] after compression +static uint8_t compressed[1024]; +static size_t compressed_size = 0; + +/// Output buffer for decompressing compressed[] +static uint8_t out[sizeof(in)]; + + +static void +compress(void) +{ + // Compress with PowerPC BCJ and LZMA2. PowerPC BCJ is used because + // it has fixed 4-byte alignment which makes triggering the potential + // bug easy. + lzma_options_lzma opt_lzma2; + succeed(lzma_lzma_preset(&opt_lzma2, 0)); + + lzma_filter filters[3] = { + { .id = LZMA_FILTER_POWERPC, .options = NULL }, + { .id = LZMA_FILTER_LZMA2, .options = &opt_lzma2 }, + { .id = LZMA_VLI_UNKNOWN, .options = NULL }, + }; + + expect(lzma_stream_buffer_encode(filters, LZMA_CHECK_CRC32, NULL, + in, sizeof(in), + compressed, &compressed_size, sizeof(compressed)) + == LZMA_OK); +} + + +static void +decompress(void) +{ + lzma_stream strm = LZMA_STREAM_INIT; + expect(lzma_stream_decoder(&strm, 10 << 20, 0) == LZMA_OK); + + strm.next_in = compressed; + strm.next_out = out; + + while (true) { + if (strm.total_in < compressed_size) + strm.avail_in = 1; + + const lzma_ret ret = lzma_code(&strm, LZMA_RUN); + if (ret == LZMA_STREAM_END) { + expect(strm.total_in == compressed_size); + expect(strm.total_out == sizeof(in)); + return; + } + + expect(ret == LZMA_OK); + + if (strm.total_out < sizeof(in)) + strm.avail_out = 1; + } +} + + +static void +decompress_empty(void) +{ + // An empty file with one Block using PowerPC BCJ and LZMA2. + static const uint8_t empty_bcj_lzma2[] = { + 0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00, 0x00, 0x01, + 0x69, 0x22, 0xDE, 0x36, 0x02, 0x01, 0x05, 0x00, + 0x21, 0x01, 0x00, 0x00, 0x7F, 0xE0, 0xF1, 0xC8, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x11, 0x00, 0x3B, 0x96, 0x5F, 0x73, + 0x90, 0x42, 0x99, 0x0D, 0x01, 0x00, 0x00, 0x00, + 0x00, 0x01, 0x59, 0x5A + }; + + // Decompress without giving any output space. + uint64_t memlimit = 1 << 20; + size_t in_pos = 0; + size_t out_pos = 0; + expect(lzma_stream_buffer_decode(&memlimit, 0, NULL, + empty_bcj_lzma2, &in_pos, sizeof(empty_bcj_lzma2), + out, &out_pos, 0) == LZMA_OK); + expect(in_pos == sizeof(empty_bcj_lzma2)); + expect(out_pos == 0); +} + + +extern int +main(void) +{ + compress(); + decompress(); + decompress_empty(); + return 0; +} diff --git a/Build/source/extra/xz/tests/test_scripts.sh b/Build/source/extra/xz/tests/test_scripts.sh new file mode 100755 index 00000000000..293929e6195 --- /dev/null +++ b/Build/source/extra/xz/tests/test_scripts.sh @@ -0,0 +1,54 @@ +#!/bin/sh + +############################################################################### +# +# Author: Jonathan Nieder +# +# This file has been put into the public domain. +# You can do whatever you want with this file. +# +############################################################################### + +# If scripts weren't built, this test is skipped. +XZ=../src/xz/xz +XZDIFF=../src/scripts/xzdiff +test -x "$XZ" || XZ= +test -x "$XZDIFF" || XZDIFF= +if test -z "$XZ" || test -z "$XZDIFF"; then + (exit 77) + exit 77 +fi + +PATH=`pwd`/../src/xz:$PATH +export PATH + +preimage=$srcdir/files/good-1-check-crc32.xz +samepostimage=$srcdir/files/good-1-check-crc64.xz +otherpostimage=$srcdir/files/good-1-lzma2-1.xz + +"$XZDIFF" "$preimage" "$samepostimage" >/dev/null +status=$? +if test "$status" != 0 ; then + echo "xzdiff with no changes exited with status $status != 0" + (exit 1) + exit 1 +fi + +"$XZDIFF" "$preimage" "$otherpostimage" >/dev/null +status=$? +if test "$status" != 1 ; then + echo "xzdiff with changes exited with status $status != 1" + (exit 1) + exit 1 +fi + +"$XZDIFF" "$preimage" "$srcdir/files/missing.xz" >/dev/null 2>&1 +status=$? +if test "$status" != 2 ; then + echo "xzdiff with missing operand exited with status $status != 2" + (exit 1) + exit 1 +fi + +(exit 0) +exit 0 diff --git a/Build/source/extra/xz/windows/README-Windows.txt b/Build/source/extra/xz/windows/README-Windows.txt index 786d66bdf73..72c5a988bbc 100644 --- a/Build/source/extra/xz/windows/README-Windows.txt +++ b/Build/source/extra/xz/windows/README-Windows.txt @@ -90,10 +90,15 @@ Microsoft Visual C++ lib /def:liblzma.def /out:liblzma.lib /machine:x64 - Linking against static liblzma should work too. Rename liblzma.a - to e.g. liblzma_static.lib and tell MSVC to link against it. You - also need to tell lzma.h to not use __declspec(dllimport) by defining - the macro LZMA_API_STATIC. You can do it either in the C/C++ code + Linking against static liblzma might work too, but usually you + should use liblzma.dll if possible. (Or, if having a decompressor + is enough, consider using XZ Embedded or LZMA SDK which can be + compiled with MSVC.) + + To try linking against static liblzma, rename liblzma.a to e.g. + liblzma_static.lib and tell MSVC to link against it. You also need + to tell lzma.h to not use __declspec(dllimport) by defining the + macro LZMA_API_STATIC. You can do it either in the C/C++ code #define LZMA_API_STATIC #include <lzma.h> diff --git a/Build/source/extra/xz/windows/build.bash b/Build/source/extra/xz/windows/build.bash index faec83b3ede..c5cf2b31242 100644 --- a/Build/source/extra/xz/windows/build.bash +++ b/Build/source/extra/xz/windows/build.bash @@ -77,6 +77,7 @@ buildit() ./configure \ --prefix= \ --disable-nls \ + --disable-scripts \ --disable-threads \ --disable-shared \ --enable-small \ @@ -97,6 +98,7 @@ buildit() ./configure \ --prefix= \ --disable-nls \ + --disable-scripts \ --disable-threads \ --build="$BUILD" \ CFLAGS="$CFLAGS -O2" |