1c1
< # Makefile.in generated by automake 1.10 from Makefile.am.
---
> # Makefile.in generated by automake 1.11.1 from Makefile.am.
5c5,6
< # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
---
> # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
> # Inc.
18d18
< pkglibdir = $(libdir)/@PACKAGE@
19a20,21
> pkglibdir = $(libdir)/@PACKAGE@
> pkglibexecdir = $(libexecdir)/@PACKAGE@
37,38c39,42
< am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
< $(top_srcdir)/configure.ac
---
> am__aclocal_m4_deps = $(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)/acinclude.m4 $(top_srcdir)/configure.ac
43a48,54
> 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_at_0 = @
51c62,77
< am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
---
> 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'
53d78
< pkgdataDATA_INSTALL = $(INSTALL_DATA)
58a84
> AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
69,72d94
< CXX = @CXX@
< CXXCPP = @CXXCPP@
< CXXDEPMODE = @CXXDEPMODE@
< CXXFLAGS = @CXXFLAGS@
77c99
< ECHO = @ECHO@
---
> DUMPBIN = @DUMPBIN@
83,84c105
< F77 = @F77@
< FFLAGS = @FFLAGS@
---
> FGREP = @FGREP@
90a112
> LD = @LD@
94a117
> LIPO = @LIPO@
97a121
> MINGW = @MINGW@
98a123
> NM = @NM@
99a125
> OBJDUMP = @OBJDUMP@
100a127,128
> OTOOL = @OTOOL@
> OTOOL64 = @OTOOL64@
105a134
> PACKAGE_URL = @PACKAGE_URL@
120,121c149
< ac_ct_CXX = @ac_ct_CXX@
< ac_ct_F77 = @ac_ct_F77@
---
> ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
152a181
> lt_ECHO = @lt_ECHO@
164a194
> top_build_prefix = @top_build_prefix@
169c199
< # $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $
---
> # $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
172c202,203
< MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
---
> MAGIC_DIR = $(top_srcdir)/magic
> MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
174c205,207
< EXTRA_DIST = Header Localstuff \
---
> EXTRA_DIST = \
> $(MAGIC_DIR)/Header \
> $(MAGIC_DIR)/Localstuff \
180d212
< $(MAGIC_FRAGMENT_DIR)/alpha \
187a220
> $(MAGIC_FRAGMENT_DIR)/assembler \
192a226
> $(MAGIC_FRAGMENT_DIR)/blcr \
196a231
> $(MAGIC_FRAGMENT_DIR)/bsi \
215a251
> $(MAGIC_FRAGMENT_DIR)/cups \
223a260
> $(MAGIC_FRAGMENT_DIR)/ebml \
238a276
> $(MAGIC_FRAGMENT_DIR)/fusecompress \
240a279
> $(MAGIC_FRAGMENT_DIR)/geo \
248a288
> $(MAGIC_FRAGMENT_DIR)/guile \
260a301
> $(MAGIC_FRAGMENT_DIR)/isz \
273a315
> $(MAGIC_FRAGMENT_DIR)/m4 \
277a320
> $(MAGIC_FRAGMENT_DIR)/make \
278a322
> $(MAGIC_FRAGMENT_DIR)/marc21 \
283a328
> $(MAGIC_FRAGMENT_DIR)/metastore \
294a340
> $(MAGIC_FRAGMENT_DIR)/msooxml \
296a343
> $(MAGIC_FRAGMENT_DIR)/music \
303a351
> $(MAGIC_FRAGMENT_DIR)/oasis \
313a362,363
> $(MAGIC_FRAGMENT_DIR)/parrot \
> $(MAGIC_FRAGMENT_DIR)/pascal \
325d374
< $(MAGIC_FRAGMENT_DIR)/psion \
330a380
> $(MAGIC_FRAGMENT_DIR)/rinex \
337a388
> $(MAGIC_FRAGMENT_DIR)/selinux \
343a395
> $(MAGIC_FRAGMENT_DIR)/sisu \
345a398
> $(MAGIC_FRAGMENT_DIR)/smile \
350a404,405
> $(MAGIC_FRAGMENT_DIR)/ssh \
> $(MAGIC_FRAGMENT_DIR)/ssl \
352a408
> $(MAGIC_FRAGMENT_DIR)/tcl \
368a425
> $(MAGIC_FRAGMENT_DIR)/virtual \
379a437
> $(MAGIC_FRAGMENT_DIR)/wsdl \
384a443
> $(MAGIC_FRAGMENT_DIR)/zfs \
389c448
< CLEANFILES = ${MAGIC}
---
> CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
393c452
< # the target's magic file
---
> # the target's magic file; for now we bail if the local version does not match
404,405c463,464
< cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
< && exit 0; \
---
> ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
> && { if test -f $@; then exit 0; else break; fi; }; \
409,411c468,470
< echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu magic/Makefile'; \
< cd $(top_srcdir) && \
< $(AUTOMAKE) --gnu magic/Makefile
---
> echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu magic/Makefile'; \
> $(am__cd) $(top_srcdir) && \
> $(AUTOMAKE) --gnu magic/Makefile
428a488
> $(am__aclocal_m4_deps):
438c498,499
< @list='$(pkgdata_DATA)'; for p in $$list; do \
---
> @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
> for p in $$list; do \
440,442c501,505
< f=$(am__strip_dir) \
< echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
< $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
---
> echo "$$d$$p"; \
> done | $(am__base_list) | \
> while read files; do \
> echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
> $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
447,451c510,514
< @list='$(pkgdata_DATA)'; for p in $$list; do \
< f=$(am__strip_dir) \
< echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
< rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
< done
---
> @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
> files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
> test -n "$$files" || exit 0; \
> echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
> cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
474a538,540
> if test -d "$(distdir)/$$file"; then \
> find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> fi; \
476c542,543
< cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
---
> cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
478c545
< cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
---
> cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
480,481c547,548
< test -f $(distdir)/$$file \
< || cp -p $$d/$$file $(distdir)/$$file \
---
> test -f "$(distdir)/$$file" \
> || cp -p $$d/$$file "$(distdir)/$$file" \
512a580
> -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
530a599,600
> html-am:
>
538a609,610
> install-dvi-am:
>
542a615,616
> install-html-am:
>
544a619,620
> install-info-am:
>
548a625,626
> install-pdf-am:
>
550a629,630
> install-ps-am:
>
587,588c667,682
< $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
< @mv $(MAGIC_FRAGMENT_BASE).mgc $@
---
> @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
>
< # Makefile.in generated by automake 1.10 from Makefile.am.
---
> # Makefile.in generated by automake 1.11.1 from Makefile.am.
5c5,6
< # 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
---
> # 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation,
> # Inc.
18d18
< pkglibdir = $(libdir)/@PACKAGE@
19a20,21
> pkglibdir = $(libdir)/@PACKAGE@
> pkglibexecdir = $(libexecdir)/@PACKAGE@
37,38c39,42
< am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
< $(top_srcdir)/configure.ac
---
> am__aclocal_m4_deps = $(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)/acinclude.m4 $(top_srcdir)/configure.ac
43a48,54
> 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_at_0 = @
51c62,77
< am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
---
> 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'
53d78
< pkgdataDATA_INSTALL = $(INSTALL_DATA)
58a84
> AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
69,72d94
< CXX = @CXX@
< CXXCPP = @CXXCPP@
< CXXDEPMODE = @CXXDEPMODE@
< CXXFLAGS = @CXXFLAGS@
77c99
< ECHO = @ECHO@
---
> DUMPBIN = @DUMPBIN@
83,84c105
< F77 = @F77@
< FFLAGS = @FFLAGS@
---
> FGREP = @FGREP@
90a112
> LD = @LD@
94a117
> LIPO = @LIPO@
97a121
> MINGW = @MINGW@
98a123
> NM = @NM@
99a125
> OBJDUMP = @OBJDUMP@
100a127,128
> OTOOL = @OTOOL@
> OTOOL64 = @OTOOL64@
105a134
> PACKAGE_URL = @PACKAGE_URL@
120,121c149
< ac_ct_CXX = @ac_ct_CXX@
< ac_ct_F77 = @ac_ct_F77@
---
> ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
152a181
> lt_ECHO = @lt_ECHO@
164a194
> top_build_prefix = @top_build_prefix@
169c199
< # $File: Makefile.am,v 1.45 2009/03/05 22:40:59 christos Exp $
---
> # $File: Makefile.am,v 1.78 2012/01/27 01:41:26 christos Exp $
172c202,203
< MAGIC_FRAGMENT_DIR = $(top_srcdir)/magic/$(MAGIC_FRAGMENT_BASE)
---
> MAGIC_DIR = $(top_srcdir)/magic
> MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
174c205,207
< EXTRA_DIST = Header Localstuff \
---
> EXTRA_DIST = \
> $(MAGIC_DIR)/Header \
> $(MAGIC_DIR)/Localstuff \
180d212
< $(MAGIC_FRAGMENT_DIR)/alpha \
187a220
> $(MAGIC_FRAGMENT_DIR)/assembler \
192a226
> $(MAGIC_FRAGMENT_DIR)/blcr \
196a231
> $(MAGIC_FRAGMENT_DIR)/bsi \
215a251
> $(MAGIC_FRAGMENT_DIR)/cups \
223a260
> $(MAGIC_FRAGMENT_DIR)/ebml \
238a276
> $(MAGIC_FRAGMENT_DIR)/fusecompress \
240a279
> $(MAGIC_FRAGMENT_DIR)/geo \
248a288
> $(MAGIC_FRAGMENT_DIR)/guile \
260a301
> $(MAGIC_FRAGMENT_DIR)/isz \
273a315
> $(MAGIC_FRAGMENT_DIR)/m4 \
277a320
> $(MAGIC_FRAGMENT_DIR)/make \
278a322
> $(MAGIC_FRAGMENT_DIR)/marc21 \
283a328
> $(MAGIC_FRAGMENT_DIR)/metastore \
294a340
> $(MAGIC_FRAGMENT_DIR)/msooxml \
296a343
> $(MAGIC_FRAGMENT_DIR)/music \
303a351
> $(MAGIC_FRAGMENT_DIR)/oasis \
313a362,363
> $(MAGIC_FRAGMENT_DIR)/parrot \
> $(MAGIC_FRAGMENT_DIR)/pascal \
325d374
< $(MAGIC_FRAGMENT_DIR)/psion \
330a380
> $(MAGIC_FRAGMENT_DIR)/rinex \
337a388
> $(MAGIC_FRAGMENT_DIR)/selinux \
343a395
> $(MAGIC_FRAGMENT_DIR)/sisu \
345a398
> $(MAGIC_FRAGMENT_DIR)/smile \
350a404,405
> $(MAGIC_FRAGMENT_DIR)/ssh \
> $(MAGIC_FRAGMENT_DIR)/ssl \
352a408
> $(MAGIC_FRAGMENT_DIR)/tcl \
368a425
> $(MAGIC_FRAGMENT_DIR)/virtual \
379a437
> $(MAGIC_FRAGMENT_DIR)/wsdl \
384a443
> $(MAGIC_FRAGMENT_DIR)/zfs \
389c448
< CLEANFILES = ${MAGIC}
---
> CLEANFILES = ${MAGIC} $(MAGIC_FRAGMENT_DIR)/Localstuff
393c452
< # the target's magic file
---
> # the target's magic file; for now we bail if the local version does not match
404,405c463,464
< cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
< && exit 0; \
---
> ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
> && { if test -f $@; then exit 0; else break; fi; }; \
409,411c468,470
< echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu magic/Makefile'; \
< cd $(top_srcdir) && \
< $(AUTOMAKE) --gnu magic/Makefile
---
> echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu magic/Makefile'; \
> $(am__cd) $(top_srcdir) && \
> $(AUTOMAKE) --gnu magic/Makefile
428a488
> $(am__aclocal_m4_deps):
438c498,499
< @list='$(pkgdata_DATA)'; for p in $$list; do \
---
> @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
> for p in $$list; do \
440,442c501,505
< f=$(am__strip_dir) \
< echo " $(pkgdataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgdatadir)/$$f'"; \
< $(pkgdataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
---
> echo "$$d$$p"; \
> done | $(am__base_list) | \
> while read files; do \
> echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(pkgdatadir)'"; \
> $(INSTALL_DATA) $$files "$(DESTDIR)$(pkgdatadir)" || exit $$?; \
447,451c510,514
< @list='$(pkgdata_DATA)'; for p in $$list; do \
< f=$(am__strip_dir) \
< echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
< rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
< done
---
> @list='$(pkgdata_DATA)'; test -n "$(pkgdatadir)" || list=; \
> files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
> test -n "$$files" || exit 0; \
> echo " ( cd '$(DESTDIR)$(pkgdatadir)' && rm -f" $$files ")"; \
> cd "$(DESTDIR)$(pkgdatadir)" && rm -f $$files
474a538,540
> if test -d "$(distdir)/$$file"; then \
> find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
> fi; \
476c542,543
< cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
---
> cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
> find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
478c545
< cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
---
> cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
480,481c547,548
< test -f $(distdir)/$$file \
< || cp -p $$d/$$file $(distdir)/$$file \
---
> test -f "$(distdir)/$$file" \
> || cp -p $$d/$$file "$(distdir)/$$file" \
512a580
> -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
530a599,600
> html-am:
>
538a609,610
> install-dvi-am:
>
542a615,616
> install-html-am:
>
544a619,620
> install-info-am:
>
548a625,626
> install-pdf-am:
>
550a629,630
> install-ps-am:
>
587,588c667,682
< $(FILE_COMPILE) -C -m $(MAGIC_FRAGMENT_DIR)
< @mv $(MAGIC_FRAGMENT_BASE).mgc $@
---
> @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
>