Revert bogus ELF patch, enable automake dependencies.

CVS patchset: 5746
CVS date: 2002/10/02 13:47:39

diff --git a/file/.cvsignore b/file/.cvsignore
index 715ccae..7f278be 100644 (file)
--- a/file/.cvsignore
+++ b/file/.cvsignore
@@ -20,8 +20,7 @@ libtool
 ltconfig
 ltmain.sh
 missing
-stamp-h
-stamp-h.in
+stamp-h*
 file
 file.1
 magic.4

diff --git a/file/.lclintrc b/file/.lclintrc
index 7bba368..7cb34c9 100644 (file)
--- a/file/.lclintrc
+++ b/file/.lclintrc
@@ -1,4 +1,4 @@
--I. -DHAVE_CONFIG_H -DSTDC -D_GNU_SOURCE -D__GLIBC__ -D__STDC__=1 -DHAVE_STRUCT_STAT_ST_RDEV
+-I. -DHAVE_CONFIG_H -DSTDC -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGFILE_SOURCE -D__GLIBC__ -D__STDC__=1 -DHAVE_STRUCT_STAT_ST_RDEV
 
 #+partial
 +forcehints

diff --git a/file/Magdir/elf b/file/Magdir/elf
index 182ee85..4037add 100644 (file)
--- a/file/Magdir/elf
+++ b/file/Magdir/elf
@@ -101,23 +101,6 @@
 >>20   lelong          0               invalid version
 >>20   lelong          1               version 1
 >>36   lelong          1               MathCoPro/FPU/MAU Required
->8     string          >\0             (%s)
->8     string          \0
->>7    byte            0               (SYSV)
->>7    byte            1               (HP-UX)
->>7    byte            2               (NetBSD)
->>7    byte            3               (GNU/Linux)
->>7    byte            4               (GNU/Hurd)
->>7    byte            5               (86Open)
->>7    byte            6               (Solaris)
->>7    byte            7               (Monterey)
->>7    byte            8               (IRIX)
->>7    byte            9               (FreeBSD)
->>7    byte            10              (Tru64)
->>7    byte            11              (Novell Modesto)
->>7    byte            12              (OpenBSD)
->>7    byte            97              (ARM)
->>7    byte            255             (embedded)
 >5     byte            2               MSB
 # only for MIPS - see comment in little-endian section above.
 >>18    beshort                8

diff --git a/file/Makefile.am b/file/Makefile.am
index 04a9413..02482e6 100644 (file)
--- a/file/Makefile.am
+++ b/file/Makefile.am
@@ -1,5 +1,4 @@
-# don't enforce GNU packaging standards
-AUTOMAKE_OPTIONS = foreign no-dependencies
+AUTOMAKE_OPTIONS = 1.4 foreign
 
 noinst_HEADERS = debug.h system.h