From: Christos Zoulas Date: Mon, 24 Mar 2003 14:51:57 +0000 (+0000) Subject: back to the previous X-Git-Tag: FILE4_00~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=baae79b5cfca29a8505390d47ea876a51952c428;p=file back to the previous --- diff --git a/doc/Makefile.am b/doc/Makefile.am index 4f72d6b9..4a78589c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,5 +1,4 @@ -include ../Makefile.inc - +MAGIC = $(pkgdatadir)/magic if FSECT5 man_MAGIC = magic.5 else diff --git a/doc/Makefile.in b/doc/Makefile.in index 8c693853..9d717125 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -119,8 +119,8 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ +MAGIC = $(pkgdatadir)/magic -MAGIC = $(datadir)/magic @FSECT5_TRUE@man_MAGIC = magic.5 @FSECT5_FALSE@man_MAGIC = magic.4 man_MANS = file.1 $(man_MAGIC) libmagic.3 @@ -135,11 +135,11 @@ DIST_SOURCES = NROFF = nroff MANS = $(man_MANS) -DIST_COMMON = Makefile.am Makefile.in +DIST_COMMON = $(srcdir)/../Makefile.inc Makefile.am Makefile.in all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(srcdir)/../Makefile.inc $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --gnu doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -354,6 +354,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) + $(mkinstalldirs) $(distdir)/./.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ diff --git a/magic/Makefile.in b/magic/Makefile.in index 7ff17db4..958ef241 100644 --- a/magic/Makefile.in +++ b/magic/Makefile.in @@ -121,7 +121,7 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ data_DATA = magic magic.mime magic.mgc magic.mime.mgc -EXTRA_DIST = magic2mime Localstuff Header $(magic_FRAGMENTS) +EXTRA_DIST = magic2mime Localstuff Header magic.mime $(magic_FRAGMENTS) CLEANFILES = magic magic.mgc magic.mime.mgc @@ -142,11 +142,15 @@ Magdir/archive \ Magdir/asterix \ Magdir/att3b \ Magdir/audio \ +Magdir/bFLT \ Magdir/blender \ Magdir/blit \ +Magdir/bout \ Magdir/bsdi \ Magdir/c-lang \ +Magdir/cddb \ Magdir/chi \ +Magdir/chord \ Magdir/cisco \ Magdir/citrus \ Magdir/claris \ @@ -178,8 +182,10 @@ Magdir/gimp \ Magdir/gnu \ Magdir/grace \ Magdir/gringotts \ +Magdir/hdf \ Magdir/hitachi-sh \ Magdir/hp \ +Magdir/human68k \ Magdir/ibm370 \ Magdir/ibm6000 \ Magdir/iff \ @@ -207,6 +213,7 @@ Magdir/mime \ Magdir/mips \ Magdir/mirage \ Magdir/mkid \ +Magdir/mlssa \ Magdir/mmdf \ Magdir/modem \ Magdir/motorola \ @@ -252,6 +259,7 @@ Magdir/smalltalk \ Magdir/sniffer \ Magdir/softquad \ Magdir/spectrum \ +Magdir/sql \ Magdir/sun \ Magdir/sysex \ Magdir/teapot \ diff --git a/src/Makefile.am b/src/Makefile.am index be077a84..a36da36b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -include "../Makefile.inc" +MAGIC = $(pkgdatadir)/magic lib_LTLIBRARIES = libmagic.la include_HEADERS = magic.h diff --git a/src/Makefile.in b/src/Makefile.in index 4d8bd2f5..7a594e41 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -124,12 +124,11 @@ include_HEADERS = magic.h bin_PROGRAMS = file -MAGIC = $(datadir)/magic AM_CPPFLAGS = -DMAGIC='"$(MAGIC)"' 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 + funcs.c file.h names.h patchlevel.h readelf.h tar.h apptype.c libmagic_la_LDFLAGS = -version-info 1:0:0 @@ -143,7 +142,8 @@ LTLIBRARIES = $(lib_LTLIBRARIES) libmagic_la_LIBADD = am_libmagic_la_OBJECTS = magic.lo apprentice.lo softmagic.lo ascmagic.lo \ - compress.lo is_tar.lo readelf.lo print.lo fsmagic.lo funcs.lo + compress.lo is_tar.lo readelf.lo print.lo fsmagic.lo funcs.lo \ + apptype.lo libmagic_la_OBJECTS = $(am_libmagic_la_OBJECTS) bin_PROGRAMS = file$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) @@ -157,11 +157,12 @@ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) depcomp = $(SHELL) $(top_srcdir)/depcomp am__depfiles_maybe = depfiles @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/apprentice.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/ascmagic.Plo ./$(DEPDIR)/compress.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/file.Po ./$(DEPDIR)/fsmagic.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/funcs.Plo ./$(DEPDIR)/is_tar.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/magic.Plo ./$(DEPDIR)/print.Plo \ -@AMDEP_TRUE@ ./$(DEPDIR)/readelf.Plo ./$(DEPDIR)/softmagic.Plo +@AMDEP_TRUE@ ./$(DEPDIR)/apptype.Plo ./$(DEPDIR)/ascmagic.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/compress.Plo ./$(DEPDIR)/file.Po \ +@AMDEP_TRUE@ ./$(DEPDIR)/fsmagic.Plo ./$(DEPDIR)/funcs.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/is_tar.Plo ./$(DEPDIR)/magic.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/print.Plo ./$(DEPDIR)/readelf.Plo \ +@AMDEP_TRUE@ ./$(DEPDIR)/softmagic.Plo COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) \ @@ -254,6 +255,7 @@ distclean-compile: -rm -f *.tab.c @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apprentice.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/apptype.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ascmagic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/compress.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/file.Po@am__quote@ @@ -510,6 +512,7 @@ uninstall-am: uninstall-binPROGRAMS uninstall-includeHEADERS \ uninstall-includeHEADERS uninstall-info-am \ uninstall-libLTLIBRARIES +include "../Makefile.inc" # 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: