svn commit: r276416 - in stable/9: contrib/file contrib/file/Magdir contrib/file/doc contrib/file/m4 contrib/file/magic contrib/file/magic/Magdir contrib/file/python contrib/file/src contrib/file/t...
Xin LI
delphij at FreeBSD.org
Tue Dec 30 19:51:32 UTC 2014
Author: delphij
Date: Tue Dec 30 19:51:30 2014
New Revision: 276416
URL: https://svnweb.freebsd.org/changeset/base/276416
Log:
MFC: file 5.21
Added:
stable/9/contrib/file/config.guess
- copied unchanged from r267897, head/contrib/file/config.guess
stable/9/contrib/file/config.sub
- copied unchanged from r267897, head/contrib/file/config.sub
stable/9/contrib/file/depcomp
- copied unchanged from r267897, head/contrib/file/depcomp
stable/9/contrib/file/doc/
- copied from r267897, head/contrib/file/doc/
stable/9/contrib/file/ltmain.sh
- copied unchanged from r267897, head/contrib/file/ltmain.sh
stable/9/contrib/file/m4/
- copied from r267897, head/contrib/file/m4/
stable/9/contrib/file/magic/
- copied from r267897, head/contrib/file/magic/
stable/9/contrib/file/magic/Magdir/kerberos
- copied unchanged from r275698, head/contrib/file/magic/Magdir/kerberos
stable/9/contrib/file/magic/Magdir/meteorological
- copied unchanged from r275698, head/contrib/file/magic/Magdir/meteorological
stable/9/contrib/file/missing
- copied, changed from r267897, head/contrib/file/missing
stable/9/contrib/file/python/
- copied from r267897, head/contrib/file/python/
stable/9/contrib/file/src/
- copied from r267897, head/contrib/file/src/
stable/9/contrib/file/tests/escapevel.result
- copied unchanged from r267897, head/contrib/file/tests/escapevel.result
stable/9/contrib/file/tests/escapevel.testfile
- copied unchanged from r267897, head/contrib/file/tests/escapevel.testfile
stable/9/contrib/file/tests/issue311docx.result
- copied unchanged from r267897, head/contrib/file/tests/issue311docx.result
stable/9/contrib/file/tests/issue311docx.testfile
- copied unchanged from r267897, head/contrib/file/tests/issue311docx.testfile
Deleted:
stable/9/contrib/file/Header
stable/9/contrib/file/Localstuff
stable/9/contrib/file/Magdir/
stable/9/contrib/file/Makefile.am-src
stable/9/contrib/file/apprentice.c
stable/9/contrib/file/apptype.c
stable/9/contrib/file/ascmagic.c
stable/9/contrib/file/asprintf.c
stable/9/contrib/file/cdf.c
stable/9/contrib/file/cdf.h
stable/9/contrib/file/cdf_time.c
stable/9/contrib/file/compress.c
stable/9/contrib/file/elfclass.h
stable/9/contrib/file/encoding.c
stable/9/contrib/file/file.c
stable/9/contrib/file/file.h
stable/9/contrib/file/file.man
stable/9/contrib/file/file_opts.h
stable/9/contrib/file/fsmagic.c
stable/9/contrib/file/funcs.c
stable/9/contrib/file/getline.c
stable/9/contrib/file/getopt_long.c
stable/9/contrib/file/is_tar.c
stable/9/contrib/file/libmagic.man
stable/9/contrib/file/magic.c
stable/9/contrib/file/magic.h
stable/9/contrib/file/magic.man
stable/9/contrib/file/magic/Magdir/rinex
stable/9/contrib/file/magic2mime
stable/9/contrib/file/mygetopt.h
stable/9/contrib/file/names.h
stable/9/contrib/file/print.c
stable/9/contrib/file/readcdf.c
stable/9/contrib/file/readelf.c
stable/9/contrib/file/readelf.h
stable/9/contrib/file/softmagic.c
stable/9/contrib/file/strlcat.c
stable/9/contrib/file/strlcpy.c
stable/9/contrib/file/tar.h
stable/9/contrib/file/tests/gedcom.magic
stable/9/contrib/file/vasprintf.c
Modified:
stable/9/contrib/file/ChangeLog
stable/9/contrib/file/Makefile.am
stable/9/contrib/file/Makefile.in
stable/9/contrib/file/README
stable/9/contrib/file/TODO
stable/9/contrib/file/aclocal.m4
stable/9/contrib/file/compile
stable/9/contrib/file/config.h.in
stable/9/contrib/file/configure
stable/9/contrib/file/configure.ac
stable/9/contrib/file/doc/Makefile.in
stable/9/contrib/file/doc/file.man
stable/9/contrib/file/doc/libmagic.man
stable/9/contrib/file/install-sh
stable/9/contrib/file/magic/Localstuff
stable/9/contrib/file/magic/Magdir/android
stable/9/contrib/file/magic/Magdir/animation
stable/9/contrib/file/magic/Magdir/archive
stable/9/contrib/file/magic/Magdir/blender
stable/9/contrib/file/magic/Magdir/commands
stable/9/contrib/file/magic/Magdir/compress
stable/9/contrib/file/magic/Magdir/database
stable/9/contrib/file/magic/Magdir/elf
stable/9/contrib/file/magic/Magdir/filesystems
stable/9/contrib/file/magic/Magdir/images
stable/9/contrib/file/magic/Magdir/jpeg
stable/9/contrib/file/magic/Magdir/linux
stable/9/contrib/file/magic/Magdir/macintosh
stable/9/contrib/file/magic/Magdir/msooxml
stable/9/contrib/file/magic/Magdir/netbsd
stable/9/contrib/file/magic/Magdir/pascal
stable/9/contrib/file/magic/Magdir/pgp
stable/9/contrib/file/magic/Magdir/python
stable/9/contrib/file/magic/Magdir/riff
stable/9/contrib/file/magic/Magdir/sequent
stable/9/contrib/file/magic/Magdir/sereal
stable/9/contrib/file/magic/Magdir/ssh
stable/9/contrib/file/magic/Magdir/vms
stable/9/contrib/file/magic/Magdir/vorbis
stable/9/contrib/file/magic/Magdir/windows
stable/9/contrib/file/magic/Makefile.am
stable/9/contrib/file/magic/Makefile.in
stable/9/contrib/file/python/Makefile.in
stable/9/contrib/file/src/Makefile.in
stable/9/contrib/file/src/apprentice.c
stable/9/contrib/file/src/ascmagic.c
stable/9/contrib/file/src/cdf.c
stable/9/contrib/file/src/cdf.h
stable/9/contrib/file/src/compress.c
stable/9/contrib/file/src/elfclass.h
stable/9/contrib/file/src/encoding.c
stable/9/contrib/file/src/file.c
stable/9/contrib/file/src/file.h
stable/9/contrib/file/src/file_opts.h
stable/9/contrib/file/src/fsmagic.c
stable/9/contrib/file/src/funcs.c
stable/9/contrib/file/src/getline.c
stable/9/contrib/file/src/magic.c
stable/9/contrib/file/src/magic.h
stable/9/contrib/file/src/magic.h.in
stable/9/contrib/file/src/pread.c
stable/9/contrib/file/src/readcdf.c
stable/9/contrib/file/src/readelf.c
stable/9/contrib/file/src/softmagic.c
stable/9/contrib/file/src/vasprintf.c
stable/9/contrib/file/tests/Makefile.am
stable/9/contrib/file/tests/Makefile.in
stable/9/contrib/file/tests/README
stable/9/contrib/file/tests/gedcom.result
stable/9/lib/libmagic/Makefile
stable/9/lib/libmagic/config.h
Directory Properties:
stable/9/contrib/file/ (props changed)
stable/9/lib/libmagic/ (props changed)
Modified: stable/9/contrib/file/ChangeLog
==============================================================================
--- stable/9/contrib/file/ChangeLog Tue Dec 30 19:39:31 2014 (r276415)
+++ stable/9/contrib/file/ChangeLog Tue Dec 30 19:51:30 2014 (r276416)
@@ -1,3 +1,311 @@
+2014-12-10 20:01 Christos Zoulas <christos at zoulas.com>
+
+ * release 5.21
+
+2014-11-27 18:40 Christos Zoulas <christos at zoulas.com>
+
+ * Allow setting more parameters from the command line.
+ * Split name/use and indirect magic recursion limits.
+
+2014-11-27 11:12 Christos Zoulas <christos at zoulas.com>
+
+ * Adjust ELF parameters and the default recursion
+ level.
+ * Allow setting the recursion level dynamically.
+
+2014-11-24 8:55 Christos Zoulas <christos at zoulas.com>
+
+ * The following fixes resulted from Thomas Jarosch's fuzzing
+ tests that revealed severe performance issues on pathological
+ input:
+ - limit number of elf program and sections processing
+ - abort elf note processing quickly
+ - reduce the number of recursion levels from 20 to 10
+ - preserve error messages in indirect magic handling
+
+2014-11-12 10:30 Christos Zoulas <christos at zoulas.com>
+
+ * fix bogus free in the user buffer case.
+
+2014-11-11 12:35 Christos Zoulas <christos at zoulas.com>
+
+ * fix out of bounds read for pascal strings
+ * fix memory leak (not freeing the head of each mlist)
+
+2014-11-07 10:25 Christos Zoulas <christos at zoulas.com>
+
+ * When printing strings from a file, convert them to printable
+ on a byte by byte basis, so that we don't get issues with
+ locale's trying to interpret random byte streams as UTF-8 and
+ having printf error out with EILSEQ.
+
+2014-10-17 11:48 Christos Zoulas <christos at zoulas.com>
+
+ * fix bounds in note reading (Francisco Alonso / Red Hat)
+
+2014-10-11 15:02 Christos Zoulas <christos at zoulas.com>
+
+ * fix autoconf glue for setlocale and locale_t; some OS's
+ have locale_t in xlocale.h
+
+2014-10-10 15:01 Christos Zoulas <christos at zoulas.com>
+
+ * release 5.20
+
+2014-08-17 10:01 Christos Zoulas <christos at zoulas.com>
+
+ * recognize encrypted CDF documents
+
+2014-08-04 9:18 Christos Zoulas <christos at zoulas.com>
+
+ * add magic_load_buffers from Brooks Davis
+
+2014-07-24 16:40 Christos Zoulas <christos at zoulas.com>
+
+ * add thumbs.db support
+
+2014-06-12 12:28 Christos Zoulas <christos at zoulas.com>
+
+ * release 5.19
+
+2014-06-09 9:04 Christos Zoulas <christos at zoulas.com>
+
+ * Misc buffer overruns and missing buffer size tests in cdf parsing
+ (Francisco Alonso, Jan Kaluza)
+
+2014-06-02 14:50 Christos Zoulas <christos at zoulas.com>
+
+ * Enforce limit of 8K on regex searches that have no limits
+ * Allow the l modifier for regex to mean line count. Default
+ to byte count. If line count is specified, assume a max
+ of 80 characters per line to limit the byte count.
+ * Don't allow conversions to be used for dates, allowing
+ the mask field to be used as an offset.
+
+2014-05-30 12:51 Christos Zoulas <christos at zoulas.com>
+
+ * Make the range operator limit the length of the
+ regex search.
+
+2014-05-14 19:23 Christos Zoulas <christos at zoulas.com>
+
+ * PR/347: Windows fixes
+ * PR/352: Hangul word processor recognition
+ * PR/354: Encoding irregularities in text files
+
+2014-05-06 6:12 Christos Zoulas <christos at zoulas.com>
+
+ * Fix uninitialized title in CDF files (Jan Kaluza)
+
+2014-05-04 14:55 Christos Zoulas <christos at zoulas.com>
+
+ * PR/351: Fix compilation of empty files
+
+2014-04-30 17:39 Christos Zoulas <christos at zoulas.com>
+
+ * Fix integer formats: We don't specify 'l' or
+ 'h' and 'hh' specifiers anymore, only 'll' for
+ quads and nothing for the rest. This is so that
+ magic writing is simpler.
+
+2014-04-01 15:25 Christos Zoulas <christos at zoulas.com>
+
+ * PR/341: Jan Kaluza, fix memory leak
+ * PR/342: Jan Kaluza, fix out of bounds read
+
+2014-03-28 15:25 Christos Zoulas <christos at zoulas.com>
+
+ * Fix issue with long formats not matching fmtcheck
+
+2014-03-26 11:25 Christos Zoulas <christos at zoulas.com>
+
+ * release 5.18
+
+2014-03-15 17:45 Christos Zoulas <christos at zoulas.com>
+
+ * add fmtcheck(3) for those who don't have it
+
+2014-03-14 15:12 Christos Zoulas <christos at zoulas.com>
+
+ * prevent mime entries from being attached to magic
+ entries with no descriptions
+
+ * adjust magic strength for regex type
+
+ * remove superfluous ascmagic with encoding test
+
+2014-03-06 12:01 Christos Zoulas <christos at zoulas.com>
+
+ * fix regression fix echo -ne "\012\013\014" | file -i -
+ which printed "binary" instead of "application/octet-stream"
+
+ * add size_t overflow check for magic file size
+
+2014-02-27 16:01 Christos Zoulas <christos at zoulas.com>
+
+ * experimental support for matching with CFD CLSID
+
+2014-02-18 13:04 Kimmo Suominen (kimmo at suominen.com)
+
+ * Cache old LC_CTYPE locale before setting it to "C", so
+ we can use it to restore LC_CTYPE instead of asking
+ setlocale() to scan the environment variables.
+
+2014-02-12 18:21 Christos Zoulas <christos at zoulas.com>
+
+ * Count recursion levels through indirect magic
+
+2014-02-11 10:40 Christos Zoulas <christos at zoulas.com>
+
+ * Prevent infinite recursion on files with indirect offsets of 0
+
+2014-01-30 21:00 Christos Zoulas <christos at zoulas.com>
+
+ * Add -E flag that makes file print filesystem errors to stderr
+ and exit.
+
+2014-01-08 17:20 Christos Zoulas <christos at zoulas.com>
+
+ * mime printing could print results from multiple magic entries
+ if there were multiple matches.
+ * in some cases overflow was not detected when computing offsets
+ in softmagic.
+
+2013-12-05 12:00 Christos Zoulas <christos at zoulas.com>
+
+ * use strcasestr() to for cdf strings
+ * reset to the "C" locale while doing regex operations, or case
+ insensitive comparisons; this is provisional
+
+2013-11-19 20:10 Christos Zoulas <christos at zoulas.com>
+
+ * always leave magic file loaded, don't unload for magic_check, etc.
+ * fix default encoding to binary instead of unknown which broke recently
+ * handle empty and one byte files, less specially so that
+ --mime-encoding does not break completely.
+ `
+2013-11-06 14:40 Christos Zoulas <christos at zoulas.com>
+
+ * fix erroneous non-zero exit code from non-existant file and message
+
+2013-10-29 14:25 Christos Zoulas <christos at zoulas.com>
+
+ * add CDF MSI file detection (Guy Helmer)
+
+2013-09-03 11:56 Christos Zoulas <christos at zoulas.com>
+
+ * Don't mix errors and regular output if there was an error
+ * in magic_descriptor() don't close the file and try to restore
+ its position
+
+2013-05-30 17:25 Christos Zoulas <christos at zoulas.com>
+
+ * Don't treat magic as an error if offset was past EOF (Christoph Biedl)
+
+2013-05-28 17:25 Christos Zoulas <christos at zoulas.com>
+
+ * Fix spacing issues in softmagic and elf (Jan Kaluza)
+
+2013-05-02 18:00 Christos Zoulas <christos at zoulas.com>
+
+ * Fix segmentation fault with multiple magic_load commands.
+
+2013-04-22 11:20 Christos Zoulas <christos at zoulas.com>
+
+ * The way "default" was implemented was not very useful
+ because the "if something was printed at that level"
+ was not easily controlled by the user, and the format
+ was bound to a string which is too restrictive. Add
+ a "clear" for that level keyword and make "default"
+ void. This way one can do:
+
+ >>13 clear x
+ >>13 lelong 1 foo
+ >>13 lelong 2 bar
+ >>13 default x
+ >>>13 lelong x unknown %x
+
+2013-03-25 13:20 Christos Zoulas <christos at zoulas.com>
+
+ * disallow strength setting in "name" entries
+
+2013-03-06 21:24 Christos Zoulas <christos at zoulas.com>
+
+ * fix recursive magic separator printing
+
+2013-02-26 19:28 Christos Zoulas <christos at zoulas.com>
+
+ * limit recursion level for mget
+ * fix pread() related breakage in cdf
+ * handle offsets properly in recursive "use"
+
+2013-02-18 10:39 Christos Zoulas <christos at zoulas.com>
+
+ * add elf reading of debug info to determine if file is stripped
+ (Jan Kaluza)
+ * use pread()
+
+2013-01-25 18:05 Christos Zoulas <christos at zoulas.com>
+
+ * change mime description size from 64 to 80 to accommodate OOXML.
+
+2013-01-11 14:50 Christos Zoulas <christos at zoulas.com>
+
+ * Warn about inconsistent continuation levels.
+ * Change fsmagic to add a space after it prints.
+
+2013-01-10 21:00 Christos Zoulas <christos at zoulas.com>
+
+ * Make getline public so that file can link against it.
+ Perhaps it is better to rename it, or hide it differently.
+ Fixes builds on platforms that do not provide it.
+
+2013-01-07 16:30 Christos Zoulas <christos at zoulas.com>
+
+ * Add SuS d{,1,2,4,8}, u{,1,2,4,8} and document
+ what long, int, short, etc is (Guy Harris)
+
+2013-01-06 11:20 Christos Zoulas <christos at zoulas.com>
+
+ * add magic_version function and constant
+ * Redo memory allocation and de-allocation.
+ (prevents double frees on non mmap platforms)
+ * Fix bug with name/use having to do with passing
+ found state from the parent to the child and back.
+
+2012-12-19 8:47 Christos Zoulas <christos at zoulas.com>
+
+ * Only print elf capabilities for archs we know (Jan Kaluza)
+
+2012-10-30 19:14 Christos Zoulas <christos at zoulas.com>
+
+ * Add "name" and "use" file types in order to look
+ inside mach-o files.
+
+2012-09-06 10:40 Christos Zoulas <christos at zoulas.com>
+
+ * make --version exit 0 (Matthew Schultz)
+ * add string/T (Jan Kaluza)
+
+2012-08-09 2:15 Christos Zoulas <christos at zoulas.com>
+
+ * add z and t modifiers for our own vasprintf
+ * search for $HOME/.magic.mgc if it is there first
+ * fix reads from a pipe, and preserve errno
+
+2012-05-15 13:12 Christos Zoulas <christos at zoulas.com>
+
+ * use ctime_r, asctime_r
+
+2012-04-06 17:18 Christos Zoulas <christos at zoulas.com>
+
+ * Fixes for indirect offsets to handle apple disk formats
+
+2012-04-03 18:26 Christos Zoulas <christos at zoulas.com>
+
+ * Add windows date field types
+ * More info for windows shortcuts (incomplete)
+
2012-02-20 17:33 Christos Zoulas <christos at zoulas.com>
* Fix CDF parsing issues found by CERT's fuzzing tool (Will Dormann)
@@ -851,7 +1159,7 @@
* Identify gnu tar vs. posix tar
- * When keep going, don't print spurious newlines (Radek Vokál)
+ * When keep going, don't print spurious newlines (Radek Vokal)
2006-04-01 12:02 Christos Zoulas <christos at astron.com>
@@ -875,7 +1183,7 @@
2005-10-31 8:54 Christos Zoulas <christos at astron.com>
* Fix regression where the core info was not completely processed
- (Radek Vokál)
+ (Radek Vokal)
2005-10-20 11:15 Christos Zoulas <christos at astron.com>
@@ -892,7 +1200,7 @@
2005-09-20 13:33 Christos Zoulas <christos at astron.com>
* Don't print SVR4 Style in core files multiple times
- (Radek Vokál)
+ (Radek Vokal)
2005-08-27 04:09 Christos Zoulas <christos at astron.com>
Modified: stable/9/contrib/file/Makefile.am
==============================================================================
--- stable/9/contrib/file/Makefile.am Tue Dec 30 19:39:31 2014 (r276415)
+++ stable/9/contrib/file/Makefile.am Tue Dec 30 19:51:30 2014 (r276416)
@@ -1,280 +1,5 @@
-#
-# $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
-#
-MAGIC_FRAGMENT_BASE = Magdir
-MAGIC_DIR = $(top_srcdir)/magic
-MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
+ACLOCAL_AMFLAGS = -I m4
-pkgdata_DATA = magic.mgc
+EXTRA_DIST = MAINT
-EXTRA_DIST = \
-$(MAGIC_DIR)/Header \
-$(MAGIC_DIR)/Localstuff \
-$(MAGIC_FRAGMENT_DIR)/acorn \
-$(MAGIC_FRAGMENT_DIR)/adi \
-$(MAGIC_FRAGMENT_DIR)/adventure \
-$(MAGIC_FRAGMENT_DIR)/allegro \
-$(MAGIC_FRAGMENT_DIR)/alliant \
-$(MAGIC_FRAGMENT_DIR)/amanda \
-$(MAGIC_FRAGMENT_DIR)/amigaos \
-$(MAGIC_FRAGMENT_DIR)/animation \
-$(MAGIC_FRAGMENT_DIR)/apl \
-$(MAGIC_FRAGMENT_DIR)/apple \
-$(MAGIC_FRAGMENT_DIR)/applix \
-$(MAGIC_FRAGMENT_DIR)/archive \
-$(MAGIC_FRAGMENT_DIR)/assembler \
-$(MAGIC_FRAGMENT_DIR)/asterix \
-$(MAGIC_FRAGMENT_DIR)/att3b \
-$(MAGIC_FRAGMENT_DIR)/audio \
-$(MAGIC_FRAGMENT_DIR)/basis \
-$(MAGIC_FRAGMENT_DIR)/bflt \
-$(MAGIC_FRAGMENT_DIR)/blcr \
-$(MAGIC_FRAGMENT_DIR)/blender \
-$(MAGIC_FRAGMENT_DIR)/blit \
-$(MAGIC_FRAGMENT_DIR)/bout \
-$(MAGIC_FRAGMENT_DIR)/bsdi \
-$(MAGIC_FRAGMENT_DIR)/bsi \
-$(MAGIC_FRAGMENT_DIR)/btsnoop \
-$(MAGIC_FRAGMENT_DIR)/c-lang \
-$(MAGIC_FRAGMENT_DIR)/c64 \
-$(MAGIC_FRAGMENT_DIR)/cad \
-$(MAGIC_FRAGMENT_DIR)/cafebabe \
-$(MAGIC_FRAGMENT_DIR)/cddb \
-$(MAGIC_FRAGMENT_DIR)/chord \
-$(MAGIC_FRAGMENT_DIR)/cisco \
-$(MAGIC_FRAGMENT_DIR)/citrus \
-$(MAGIC_FRAGMENT_DIR)/clarion \
-$(MAGIC_FRAGMENT_DIR)/claris \
-$(MAGIC_FRAGMENT_DIR)/clipper \
-$(MAGIC_FRAGMENT_DIR)/commands \
-$(MAGIC_FRAGMENT_DIR)/communications \
-$(MAGIC_FRAGMENT_DIR)/compress \
-$(MAGIC_FRAGMENT_DIR)/console \
-$(MAGIC_FRAGMENT_DIR)/convex \
-$(MAGIC_FRAGMENT_DIR)/cracklib \
-$(MAGIC_FRAGMENT_DIR)/ctags \
-$(MAGIC_FRAGMENT_DIR)/cups \
-$(MAGIC_FRAGMENT_DIR)/dact \
-$(MAGIC_FRAGMENT_DIR)/database \
-$(MAGIC_FRAGMENT_DIR)/diamond \
-$(MAGIC_FRAGMENT_DIR)/diff \
-$(MAGIC_FRAGMENT_DIR)/digital \
-$(MAGIC_FRAGMENT_DIR)/dolby \
-$(MAGIC_FRAGMENT_DIR)/dump \
-$(MAGIC_FRAGMENT_DIR)/dyadic \
-$(MAGIC_FRAGMENT_DIR)/ebml \
-$(MAGIC_FRAGMENT_DIR)/editors \
-$(MAGIC_FRAGMENT_DIR)/efi \
-$(MAGIC_FRAGMENT_DIR)/elf \
-$(MAGIC_FRAGMENT_DIR)/encore \
-$(MAGIC_FRAGMENT_DIR)/epoc \
-$(MAGIC_FRAGMENT_DIR)/erlang \
-$(MAGIC_FRAGMENT_DIR)/esri \
-$(MAGIC_FRAGMENT_DIR)/fcs \
-$(MAGIC_FRAGMENT_DIR)/filesystems \
-$(MAGIC_FRAGMENT_DIR)/flash \
-$(MAGIC_FRAGMENT_DIR)/fonts \
-$(MAGIC_FRAGMENT_DIR)/fortran \
-$(MAGIC_FRAGMENT_DIR)/frame \
-$(MAGIC_FRAGMENT_DIR)/freebsd \
-$(MAGIC_FRAGMENT_DIR)/fsav \
-$(MAGIC_FRAGMENT_DIR)/fusecompress \
-$(MAGIC_FRAGMENT_DIR)/games \
-$(MAGIC_FRAGMENT_DIR)/gcc \
-$(MAGIC_FRAGMENT_DIR)/geo \
-$(MAGIC_FRAGMENT_DIR)/geos \
-$(MAGIC_FRAGMENT_DIR)/gimp \
-$(MAGIC_FRAGMENT_DIR)/gnome-keyring \
-$(MAGIC_FRAGMENT_DIR)/gnu \
-$(MAGIC_FRAGMENT_DIR)/gnumeric \
-$(MAGIC_FRAGMENT_DIR)/grace \
-$(MAGIC_FRAGMENT_DIR)/graphviz \
-$(MAGIC_FRAGMENT_DIR)/gringotts \
-$(MAGIC_FRAGMENT_DIR)/guile \
-$(MAGIC_FRAGMENT_DIR)/hitachi-sh \
-$(MAGIC_FRAGMENT_DIR)/hp \
-$(MAGIC_FRAGMENT_DIR)/human68k \
-$(MAGIC_FRAGMENT_DIR)/ibm370 \
-$(MAGIC_FRAGMENT_DIR)/ibm6000 \
-$(MAGIC_FRAGMENT_DIR)/iff \
-$(MAGIC_FRAGMENT_DIR)/images \
-$(MAGIC_FRAGMENT_DIR)/inform \
-$(MAGIC_FRAGMENT_DIR)/intel \
-$(MAGIC_FRAGMENT_DIR)/interleaf \
-$(MAGIC_FRAGMENT_DIR)/island \
-$(MAGIC_FRAGMENT_DIR)/ispell \
-$(MAGIC_FRAGMENT_DIR)/isz \
-$(MAGIC_FRAGMENT_DIR)/java \
-$(MAGIC_FRAGMENT_DIR)/jpeg \
-$(MAGIC_FRAGMENT_DIR)/karma \
-$(MAGIC_FRAGMENT_DIR)/kde \
-$(MAGIC_FRAGMENT_DIR)/kml \
-$(MAGIC_FRAGMENT_DIR)/lecter \
-$(MAGIC_FRAGMENT_DIR)/lex \
-$(MAGIC_FRAGMENT_DIR)/lif \
-$(MAGIC_FRAGMENT_DIR)/linux \
-$(MAGIC_FRAGMENT_DIR)/lisp \
-$(MAGIC_FRAGMENT_DIR)/llvm \
-$(MAGIC_FRAGMENT_DIR)/lua \
-$(MAGIC_FRAGMENT_DIR)/luks \
-$(MAGIC_FRAGMENT_DIR)/m4 \
-$(MAGIC_FRAGMENT_DIR)/mach \
-$(MAGIC_FRAGMENT_DIR)/macintosh \
-$(MAGIC_FRAGMENT_DIR)/magic \
-$(MAGIC_FRAGMENT_DIR)/mail.news \
-$(MAGIC_FRAGMENT_DIR)/make \
-$(MAGIC_FRAGMENT_DIR)/maple \
-$(MAGIC_FRAGMENT_DIR)/marc21 \
-$(MAGIC_FRAGMENT_DIR)/mathcad \
-$(MAGIC_FRAGMENT_DIR)/mathematica \
-$(MAGIC_FRAGMENT_DIR)/matroska \
-$(MAGIC_FRAGMENT_DIR)/mcrypt \
-$(MAGIC_FRAGMENT_DIR)/mercurial \
-$(MAGIC_FRAGMENT_DIR)/metastore \
-$(MAGIC_FRAGMENT_DIR)/mime \
-$(MAGIC_FRAGMENT_DIR)/mips \
-$(MAGIC_FRAGMENT_DIR)/mirage \
-$(MAGIC_FRAGMENT_DIR)/misctools \
-$(MAGIC_FRAGMENT_DIR)/mkid \
-$(MAGIC_FRAGMENT_DIR)/mlssa \
-$(MAGIC_FRAGMENT_DIR)/mmdf \
-$(MAGIC_FRAGMENT_DIR)/modem \
-$(MAGIC_FRAGMENT_DIR)/motorola \
-$(MAGIC_FRAGMENT_DIR)/mozilla \
-$(MAGIC_FRAGMENT_DIR)/msdos \
-$(MAGIC_FRAGMENT_DIR)/msooxml \
-$(MAGIC_FRAGMENT_DIR)/msvc \
-$(MAGIC_FRAGMENT_DIR)/mup \
-$(MAGIC_FRAGMENT_DIR)/music \
-$(MAGIC_FRAGMENT_DIR)/natinst \
-$(MAGIC_FRAGMENT_DIR)/ncr \
-$(MAGIC_FRAGMENT_DIR)/netbsd \
-$(MAGIC_FRAGMENT_DIR)/netscape \
-$(MAGIC_FRAGMENT_DIR)/netware \
-$(MAGIC_FRAGMENT_DIR)/news \
-$(MAGIC_FRAGMENT_DIR)/nitpicker \
-$(MAGIC_FRAGMENT_DIR)/oasis \
-$(MAGIC_FRAGMENT_DIR)/ocaml \
-$(MAGIC_FRAGMENT_DIR)/octave \
-$(MAGIC_FRAGMENT_DIR)/ole2compounddocs \
-$(MAGIC_FRAGMENT_DIR)/olf \
-$(MAGIC_FRAGMENT_DIR)/os2 \
-$(MAGIC_FRAGMENT_DIR)/os400 \
-$(MAGIC_FRAGMENT_DIR)/os9 \
-$(MAGIC_FRAGMENT_DIR)/osf1 \
-$(MAGIC_FRAGMENT_DIR)/palm \
-$(MAGIC_FRAGMENT_DIR)/parix \
-$(MAGIC_FRAGMENT_DIR)/parrot \
-$(MAGIC_FRAGMENT_DIR)/pascal \
-$(MAGIC_FRAGMENT_DIR)/pbm \
-$(MAGIC_FRAGMENT_DIR)/pdf \
-$(MAGIC_FRAGMENT_DIR)/pdp \
-$(MAGIC_FRAGMENT_DIR)/perl \
-$(MAGIC_FRAGMENT_DIR)/pgp \
-$(MAGIC_FRAGMENT_DIR)/pkgadd \
-$(MAGIC_FRAGMENT_DIR)/plan9 \
-$(MAGIC_FRAGMENT_DIR)/plus5 \
-$(MAGIC_FRAGMENT_DIR)/printer \
-$(MAGIC_FRAGMENT_DIR)/project \
-$(MAGIC_FRAGMENT_DIR)/psdbms \
-$(MAGIC_FRAGMENT_DIR)/pulsar \
-$(MAGIC_FRAGMENT_DIR)/pyramid \
-$(MAGIC_FRAGMENT_DIR)/python \
-$(MAGIC_FRAGMENT_DIR)/revision \
-$(MAGIC_FRAGMENT_DIR)/riff \
-$(MAGIC_FRAGMENT_DIR)/rinex \
-$(MAGIC_FRAGMENT_DIR)/rpm \
-$(MAGIC_FRAGMENT_DIR)/rtf \
-$(MAGIC_FRAGMENT_DIR)/ruby \
-$(MAGIC_FRAGMENT_DIR)/sc \
-$(MAGIC_FRAGMENT_DIR)/sccs \
-$(MAGIC_FRAGMENT_DIR)/scientific \
-$(MAGIC_FRAGMENT_DIR)/securitycerts \
-$(MAGIC_FRAGMENT_DIR)/selinux \
-$(MAGIC_FRAGMENT_DIR)/sendmail \
-$(MAGIC_FRAGMENT_DIR)/sequent \
-$(MAGIC_FRAGMENT_DIR)/sgi \
-$(MAGIC_FRAGMENT_DIR)/sgml \
-$(MAGIC_FRAGMENT_DIR)/sharc \
-$(MAGIC_FRAGMENT_DIR)/sinclair \
-$(MAGIC_FRAGMENT_DIR)/sisu \
-$(MAGIC_FRAGMENT_DIR)/sketch \
-$(MAGIC_FRAGMENT_DIR)/smalltalk \
-$(MAGIC_FRAGMENT_DIR)/smile \
-$(MAGIC_FRAGMENT_DIR)/sniffer \
-$(MAGIC_FRAGMENT_DIR)/softquad \
-$(MAGIC_FRAGMENT_DIR)/spec \
-$(MAGIC_FRAGMENT_DIR)/spectrum \
-$(MAGIC_FRAGMENT_DIR)/sql \
-$(MAGIC_FRAGMENT_DIR)/ssh \
-$(MAGIC_FRAGMENT_DIR)/ssl \
-$(MAGIC_FRAGMENT_DIR)/sun \
-$(MAGIC_FRAGMENT_DIR)/sysex \
-$(MAGIC_FRAGMENT_DIR)/tcl \
-$(MAGIC_FRAGMENT_DIR)/teapot \
-$(MAGIC_FRAGMENT_DIR)/terminfo \
-$(MAGIC_FRAGMENT_DIR)/tex \
-$(MAGIC_FRAGMENT_DIR)/tgif \
-$(MAGIC_FRAGMENT_DIR)/ti-8x \
-$(MAGIC_FRAGMENT_DIR)/timezone \
-$(MAGIC_FRAGMENT_DIR)/troff \
-$(MAGIC_FRAGMENT_DIR)/tuxedo \
-$(MAGIC_FRAGMENT_DIR)/typeset \
-$(MAGIC_FRAGMENT_DIR)/unicode \
-$(MAGIC_FRAGMENT_DIR)/unknown \
-$(MAGIC_FRAGMENT_DIR)/uuencode \
-$(MAGIC_FRAGMENT_DIR)/varied.out \
-$(MAGIC_FRAGMENT_DIR)/varied.script \
-$(MAGIC_FRAGMENT_DIR)/vax \
-$(MAGIC_FRAGMENT_DIR)/vicar \
-$(MAGIC_FRAGMENT_DIR)/virtual \
-$(MAGIC_FRAGMENT_DIR)/virtutech \
-$(MAGIC_FRAGMENT_DIR)/visx \
-$(MAGIC_FRAGMENT_DIR)/vms \
-$(MAGIC_FRAGMENT_DIR)/vmware \
-$(MAGIC_FRAGMENT_DIR)/vorbis \
-$(MAGIC_FRAGMENT_DIR)/vxl \
-$(MAGIC_FRAGMENT_DIR)/warc \
-$(MAGIC_FRAGMENT_DIR)/weak \
-$(MAGIC_FRAGMENT_DIR)/windows \
-$(MAGIC_FRAGMENT_DIR)/wireless \
-$(MAGIC_FRAGMENT_DIR)/wordprocessors \
-$(MAGIC_FRAGMENT_DIR)/wsdl \
-$(MAGIC_FRAGMENT_DIR)/xdelta \
-$(MAGIC_FRAGMENT_DIR)/xenix \
-$(MAGIC_FRAGMENT_DIR)/xilinx \
-$(MAGIC_FRAGMENT_DIR)/xo65 \
-$(MAGIC_FRAGMENT_DIR)/xwindows \
-$(MAGIC_FRAGMENT_DIR)/zfs \
-$(MAGIC_FRAGMENT_DIR)/zilog \
-$(MAGIC_FRAGMENT_DIR)/zyxel
-
-MAGIC = magic.mgc
-CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
-
-# FIXME: Build file natively as well so that it can be used to compile
-# the target's magic file; for now we bail if the local version does not match
-if IS_CROSS_COMPILE
-FILE_COMPILE = file
-FILE_COMPILE_DEP =
-else
-FILE_COMPILE = $(top_builddir)/src/file
-FILE_COMPILE_DEP = $(FILE_COMPILE)
-endif
-
-${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
- @rm -fr magic
- @mkdir magic && cp -p $(EXTRA_DIST) magic
- @(if expr "${FILE_COMPILE}" : '.*/.*' > /dev/null; then \
- echo "Using ${FILE_COMPILE} to generate ${MAGIC}" > /dev/null; \
- else \
- v=$$(file --version | sed -e s/file-// -e q); \
- if [ "$$v" != "${PACKAGE_VERSION}" ]; then \
- echo "Cannot use the installed version of file ($$v) to"; \
- echo "cross-compile file ${PACKAGE_VERSION}"; \
- echo "Please install file ${PACKAGE_VERSION} locally first"; \
- exit 1; \
- fi; \
- fi)
- $(FILE_COMPILE) -C -m magic
- @rm -fr magic
+SUBDIRS = src magic tests doc python
Modified: stable/9/contrib/file/Makefile.in
==============================================================================
--- stable/9/contrib/file/Makefile.in Tue Dec 30 19:39:31 2014 (r276415)
+++ stable/9/contrib/file/Makefile.in Tue Dec 30 19:51:30 2014 (r276416)
@@ -1,9 +1,8 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 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.
@@ -14,8 +13,52 @@
# PARTICULAR PURPOSE.
@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))
pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@
pkglibexecdir = $(libexecdir)/@PACKAGE@
@@ -33,8 +76,12 @@ PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = @build@
host_triplet = @host@
-subdir = magic
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+subdir = .
+DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
+ $(top_srcdir)/configure $(am__configure_deps) \
+ $(srcdir)/config.h.in AUTHORS COPYING ChangeLog INSTALL NEWS \
+ README TODO compile config.guess config.sub depcomp install-sh \
+ missing ltmain.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/libtool.m4 \
$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -42,42 +89,111 @@ am__aclocal_m4_deps = $(top_srcdir)/m4/l
$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
+am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES =
-AM_V_GEN = $(am__v_GEN_$(V))
-am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
-am__v_GEN_0 = @echo " GEN " $@;
-AM_V_at = $(am__v_at_$(V))
-am__v_at_ = $(am__v_at_$(AM_DEFAULT_VERBOSITY))
+AM_V_P = $(am__v_P_ at AM_V@)
+am__v_P_ = $(am__v_P_ at AM_DEFAULT_V@)
+am__v_P_0 = false
+am__v_P_1 = :
+AM_V_GEN = $(am__v_GEN_ at AM_V@)
+am__v_GEN_ = $(am__v_GEN_ at AM_DEFAULT_V@)
+am__v_GEN_0 = @echo " GEN " $@;
+am__v_GEN_1 =
+AM_V_at = $(am__v_at_ at AM_V@)
+am__v_at_ = $(am__v_at_ at AM_DEFAULT_V@)
am__v_at_0 = @
+am__v_at_1 =
SOURCES =
DIST_SOURCES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
- *) f=$$p;; \
- esac;
-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
-am__install_max = 40
-am__nobase_strip_setup = \
- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
-am__nobase_strip = \
- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
-am__nobase_list = $(am__nobase_strip_setup); \
- for p in $$list; do echo "$$p $$p"; done | \
- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
- $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
- if (++n[$$2] == $(am__install_max)) \
- { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
- END { for (dir in files) print dir, files[dir] }'
-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)$(pkgdatadir)"
-DATA = $(pkgdata_DATA)
+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_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
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+am__remove_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,'; \
+ sed_rest='s,^[^/]*/*,,'; \
+ sed_last='s,^.*/\([^/]*\)$$,\1,'; \
+ sed_butlast='s,/*[^/]*$$,,'; \
+ while test -n "$$dir1"; do \
+ first=`echo "$$dir1" | sed -e "$$sed_first"`; \
+ if test "$$first" != "."; then \
+ if test "$$first" = ".."; then \
+ dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
+ dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
+ else \
+ first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
+ if test "$$first2" = "$$first"; then \
+ dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
+ else \
+ dir2="../$$dir2"; \
+ fi; \
+ dir0="$$dir0"/"$$first"; \
+ fi; \
+ fi; \
+ dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
+ 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
pkgdatadir = @pkgdatadir@
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -90,11 +206,13 @@ AWK = @AWK@
CC = @CC@
CCDEPMODE = @CCDEPMODE@
CFLAGS = @CFLAGS@
+CFLAG_VISIBILITY = @CFLAG_VISIBILITY@
CPP = @CPP@
CPPFLAGS = @CPPFLAGS@
CYGPATH_W = @CYGPATH_W@
DEFS = @DEFS@
DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
DSYMUTIL = @DSYMUTIL@
DUMPBIN = @DUMPBIN@
ECHO_C = @ECHO_C@
@@ -104,6 +222,7 @@ EGREP = @EGREP@
EXEEXT = @EXEEXT@
FGREP = @FGREP@
GREP = @GREP@
+HAVE_VISIBILITY = @HAVE_VISIBILITY@
INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -118,6 +237,7 @@ LIPO = @LIPO@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
MINGW = @MINGW@
MKDIR_P = @MKDIR_P@
NM = @NM@
@@ -145,6 +265,7 @@ abs_builddir = @abs_builddir@
abs_srcdir = @abs_srcdir@
abs_top_builddir = @abs_top_builddir@
abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
ac_ct_CC = @ac_ct_CC@
ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
am__include = @am__include@
@@ -178,7 +299,6 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
mandir = @mandir@
mkdir_p = @mkdir_p@
oldincludedir = @oldincludedir@
@@ -194,332 +314,181 @@ target_alias = @target_alias@
top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
-
-#
-# $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
-#
-MAGIC_FRAGMENT_BASE = Magdir
-MAGIC_DIR = $(top_srcdir)/magic
-MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
-pkgdata_DATA = magic.mgc
-EXTRA_DIST = \
-$(MAGIC_DIR)/Header \
-$(MAGIC_DIR)/Localstuff \
-$(MAGIC_FRAGMENT_DIR)/acorn \
-$(MAGIC_FRAGMENT_DIR)/adi \
-$(MAGIC_FRAGMENT_DIR)/adventure \
-$(MAGIC_FRAGMENT_DIR)/allegro \
-$(MAGIC_FRAGMENT_DIR)/alliant \
-$(MAGIC_FRAGMENT_DIR)/amanda \
-$(MAGIC_FRAGMENT_DIR)/amigaos \
-$(MAGIC_FRAGMENT_DIR)/animation \
-$(MAGIC_FRAGMENT_DIR)/apl \
-$(MAGIC_FRAGMENT_DIR)/apple \
-$(MAGIC_FRAGMENT_DIR)/applix \
-$(MAGIC_FRAGMENT_DIR)/archive \
-$(MAGIC_FRAGMENT_DIR)/assembler \
-$(MAGIC_FRAGMENT_DIR)/asterix \
-$(MAGIC_FRAGMENT_DIR)/att3b \
-$(MAGIC_FRAGMENT_DIR)/audio \
-$(MAGIC_FRAGMENT_DIR)/basis \
-$(MAGIC_FRAGMENT_DIR)/bflt \
-$(MAGIC_FRAGMENT_DIR)/blcr \
-$(MAGIC_FRAGMENT_DIR)/blender \
-$(MAGIC_FRAGMENT_DIR)/blit \
-$(MAGIC_FRAGMENT_DIR)/bout \
-$(MAGIC_FRAGMENT_DIR)/bsdi \
-$(MAGIC_FRAGMENT_DIR)/bsi \
-$(MAGIC_FRAGMENT_DIR)/btsnoop \
-$(MAGIC_FRAGMENT_DIR)/c-lang \
-$(MAGIC_FRAGMENT_DIR)/c64 \
-$(MAGIC_FRAGMENT_DIR)/cad \
-$(MAGIC_FRAGMENT_DIR)/cafebabe \
-$(MAGIC_FRAGMENT_DIR)/cddb \
-$(MAGIC_FRAGMENT_DIR)/chord \
-$(MAGIC_FRAGMENT_DIR)/cisco \
-$(MAGIC_FRAGMENT_DIR)/citrus \
-$(MAGIC_FRAGMENT_DIR)/clarion \
-$(MAGIC_FRAGMENT_DIR)/claris \
-$(MAGIC_FRAGMENT_DIR)/clipper \
-$(MAGIC_FRAGMENT_DIR)/commands \
-$(MAGIC_FRAGMENT_DIR)/communications \
-$(MAGIC_FRAGMENT_DIR)/compress \
-$(MAGIC_FRAGMENT_DIR)/console \
-$(MAGIC_FRAGMENT_DIR)/convex \
-$(MAGIC_FRAGMENT_DIR)/cracklib \
-$(MAGIC_FRAGMENT_DIR)/ctags \
-$(MAGIC_FRAGMENT_DIR)/cups \
-$(MAGIC_FRAGMENT_DIR)/dact \
-$(MAGIC_FRAGMENT_DIR)/database \
-$(MAGIC_FRAGMENT_DIR)/diamond \
-$(MAGIC_FRAGMENT_DIR)/diff \
-$(MAGIC_FRAGMENT_DIR)/digital \
-$(MAGIC_FRAGMENT_DIR)/dolby \
-$(MAGIC_FRAGMENT_DIR)/dump \
-$(MAGIC_FRAGMENT_DIR)/dyadic \
-$(MAGIC_FRAGMENT_DIR)/ebml \
-$(MAGIC_FRAGMENT_DIR)/editors \
-$(MAGIC_FRAGMENT_DIR)/efi \
-$(MAGIC_FRAGMENT_DIR)/elf \
-$(MAGIC_FRAGMENT_DIR)/encore \
-$(MAGIC_FRAGMENT_DIR)/epoc \
-$(MAGIC_FRAGMENT_DIR)/erlang \
-$(MAGIC_FRAGMENT_DIR)/esri \
-$(MAGIC_FRAGMENT_DIR)/fcs \
-$(MAGIC_FRAGMENT_DIR)/filesystems \
-$(MAGIC_FRAGMENT_DIR)/flash \
-$(MAGIC_FRAGMENT_DIR)/fonts \
-$(MAGIC_FRAGMENT_DIR)/fortran \
-$(MAGIC_FRAGMENT_DIR)/frame \
-$(MAGIC_FRAGMENT_DIR)/freebsd \
-$(MAGIC_FRAGMENT_DIR)/fsav \
-$(MAGIC_FRAGMENT_DIR)/fusecompress \
-$(MAGIC_FRAGMENT_DIR)/games \
-$(MAGIC_FRAGMENT_DIR)/gcc \
-$(MAGIC_FRAGMENT_DIR)/geo \
-$(MAGIC_FRAGMENT_DIR)/geos \
-$(MAGIC_FRAGMENT_DIR)/gimp \
-$(MAGIC_FRAGMENT_DIR)/gnome-keyring \
-$(MAGIC_FRAGMENT_DIR)/gnu \
-$(MAGIC_FRAGMENT_DIR)/gnumeric \
-$(MAGIC_FRAGMENT_DIR)/grace \
-$(MAGIC_FRAGMENT_DIR)/graphviz \
-$(MAGIC_FRAGMENT_DIR)/gringotts \
-$(MAGIC_FRAGMENT_DIR)/guile \
-$(MAGIC_FRAGMENT_DIR)/hitachi-sh \
-$(MAGIC_FRAGMENT_DIR)/hp \
-$(MAGIC_FRAGMENT_DIR)/human68k \
-$(MAGIC_FRAGMENT_DIR)/ibm370 \
-$(MAGIC_FRAGMENT_DIR)/ibm6000 \
-$(MAGIC_FRAGMENT_DIR)/iff \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-stable-9
mailing list