Install into /usr/lib64 where appropriate.

CVS patchset: 7393
CVS date: 2004/08/03 21:51:05

diff --git a/file/doc/.cvsignore b/file/doc/.cvsignore
index 90b915b..313f462 100644 (file)
--- a/file/doc/.cvsignore
+++ b/file/doc/.cvsignore
@@ -1,4 +1,5 @@
 Makefile
 Makefile.in
 file.1
+libmagic.3
 magic.4

diff --git a/file/src/Makefile.am b/file/src/Makefile.am
index 4b92388..9979378 100644 (file)
--- a/file/src/Makefile.am
+++ b/file/src/Makefile.am
@@ -1,15 +1,33 @@
+LINT = splint
+BUILT_SOURCES = listobjs
+
 MAGIC   = $(pkgdatadir)/magic
-lib_LTLIBRARIES = libmagic.la
+AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+
 include_HEADERS = magic.h
+noinst_HEADERS = file.h names.h patchlevel.h readelf.h tar.h
 
-bin_PROGRAMS = file
-
-AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"'
+#lib_LTLIBRARIES = libmagic.la
+usrlibdir = $(libdir)@MARK64@
+usrlib_LTLIBRARIES = libmagic.la
 
 libmagic_la_SOURCES = magic.c apprentice.c softmagic.c ascmagic.c \
        compress.c is_tar.c readelf.c print.c fsmagic.c \
        funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c
 libmagic_la_LDFLAGS = -version-info 1:0:0
 
+bin_PROGRAMS = file
 file_SOURCES = file.c
 file_LDADD = libmagic.la
+
+listobjs:
+       @echo $(libmagic_la_SOURCES:.c=.lo) > $@
+                                                                                
+.PHONY: lint
+lint:
+       $(LINT)  $(DEFS) $(INCLUDES) $(file_SOURCES) $(libmagic_la_SOURCES) $(include_HEADERS) $(noinst_HEADERS)
+                                                                                
+.PHONY: sources
+sources:
+       @echo $(libmagic_la_SOURCES:%=file/src/%)
+

diff --git a/file/src/acconfig.h b/file/src/acconfig.h
deleted file mode 100644 (file)
index e6293da..0000000
--- a/file/src/acconfig.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Autoheader needs me */
-#undef PACKAGE
-
-/* Autoheader needs me */
-#undef VERSION
-
-/* Define if builtin ELF support is enabled.  */
-#undef BUILTIN_ELF
-
-/* Define if ELF core file support is enabled.  */
-#undef ELFCORE
-
-/* Define if the `long long' type works.  */
-#undef HAVE_LONG_LONG
-
-/* Define if we have "tm_zone" in "struct tm".  */
-#undef HAVE_TM_ZONE
-
-/* Define if we have a global "char * []" "tzname" variable.  */
-#undef HAVE_TZNAME
-
-/* Define if we have "tm_isdst" in "struct tm".  */
-#undef HAVE_TM_ISDST
-
-/* Define if we have a global "int" variable "daylight".  */
-#undef HAVE_DAYLIGHT
-
-/* Define if we have a mkstemp */
-#undef HAVE_MKSTEMP
-
-/* Define to `unsigned char' if standard headers don't define.  */
-#undef uint8_t
-
-/* Define to `unsigned short' if standard headers don't define.  */
-#undef uint16_t
-
-/* Define to `unsigned int' if standard headers don't define.  */
-#undef uint32_t
-
-/* Define to `unsigned long long', if available, or `unsigned long', if
-   standard headers don't define.  */
-#undef uint64_t
-
-/* Define to `int' if standard headers don't define.  */
-#undef int32_t
-
-/* FIXME: These have to be added manually because autoheader doesn't know
-   about AC_CHECK_SIZEOF_INCLUDES.  */
-
-/* The number of bytes in a uint8_t.  */
-#define SIZEOF_UINT8_T 0
-
-/* The number of bytes in a uint16_t.  */
-#define SIZEOF_UINT16_T 0
-
-/* The number of bytes in a uint32_t.  */
-#define SIZEOF_UINT32_T 0
-
-/* The number of bytes in a uint64_t.  */
-#define SIZEOF_UINT64_T 0