- Move lib to libmagic

diff --git a/ext/fileinfo/lib/apprentice.c b/ext/fileinfo/libmagic/apprentice.c
similarity index 100%
rename from ext/fileinfo/lib/apprentice.c
rename to ext/fileinfo/libmagic/apprentice.c

diff --git a/ext/fileinfo/lib/apptype.c b/ext/fileinfo/libmagic/apptype.c
similarity index 100%
rename from ext/fileinfo/lib/apptype.c
rename to ext/fileinfo/libmagic/apptype.c

diff --git a/ext/fileinfo/lib/ascmagic.c b/ext/fileinfo/libmagic/ascmagic.c
similarity index 100%
rename from ext/fileinfo/lib/ascmagic.c
rename to ext/fileinfo/libmagic/ascmagic.c

diff --git a/ext/fileinfo/lib/compress.c b/ext/fileinfo/libmagic/compress.c
similarity index 100%
rename from ext/fileinfo/lib/compress.c
rename to ext/fileinfo/libmagic/compress.c

diff --git a/ext/fileinfo/libmagic/config.h b/ext/fileinfo/libmagic/config.h
new file mode 100644 (file)
index 0000000..d685611
--- /dev/null
+++ b/ext/fileinfo/libmagic/config.h
@@ -0,0 +1 @@
+#include <php_config.h>

diff --git a/ext/fileinfo/lib/elfclass.h b/ext/fileinfo/libmagic/elfclass.h
similarity index 100%
rename from ext/fileinfo/lib/elfclass.h
rename to ext/fileinfo/libmagic/elfclass.h

diff --git a/ext/fileinfo/lib/file.c b/ext/fileinfo/libmagic/file.c
similarity index 100%
rename from ext/fileinfo/lib/file.c
rename to ext/fileinfo/libmagic/file.c

diff --git a/ext/fileinfo/lib/file.h b/ext/fileinfo/libmagic/file.h
similarity index 100%
rename from ext/fileinfo/lib/file.h
rename to ext/fileinfo/libmagic/file.h

diff --git a/ext/fileinfo/lib/file_opts.h b/ext/fileinfo/libmagic/file_opts.h
similarity index 100%
rename from ext/fileinfo/lib/file_opts.h
rename to ext/fileinfo/libmagic/file_opts.h

diff --git a/ext/fileinfo/lib/fsmagic.c b/ext/fileinfo/libmagic/fsmagic.c
similarity index 100%
rename from ext/fileinfo/lib/fsmagic.c
rename to ext/fileinfo/libmagic/fsmagic.c

diff --git a/ext/fileinfo/lib/funcs.c b/ext/fileinfo/libmagic/funcs.c
similarity index 100%
rename from ext/fileinfo/lib/funcs.c
rename to ext/fileinfo/libmagic/funcs.c

diff --git a/ext/fileinfo/lib/getopt_long.c b/ext/fileinfo/libmagic/getopt_long.c
similarity index 100%
rename from ext/fileinfo/lib/getopt_long.c
rename to ext/fileinfo/libmagic/getopt_long.c

diff --git a/ext/fileinfo/lib/is_tar.c b/ext/fileinfo/libmagic/is_tar.c
similarity index 100%
rename from ext/fileinfo/lib/is_tar.c
rename to ext/fileinfo/libmagic/is_tar.c

diff --git a/ext/fileinfo/lib/magic.c b/ext/fileinfo/libmagic/magic.c
similarity index 100%
rename from ext/fileinfo/lib/magic.c
rename to ext/fileinfo/libmagic/magic.c

diff --git a/ext/fileinfo/lib/magic.h b/ext/fileinfo/libmagic/magic.h
similarity index 100%
rename from ext/fileinfo/lib/magic.h
rename to ext/fileinfo/libmagic/magic.h

diff --git a/ext/fileinfo/lib/names.h b/ext/fileinfo/libmagic/names.h
similarity index 100%
rename from ext/fileinfo/lib/names.h
rename to ext/fileinfo/libmagic/names.h

diff --git a/ext/fileinfo/lib/patchlevel.h b/ext/fileinfo/libmagic/patchlevel.h
similarity index 98%
rename from ext/fileinfo/lib/patchlevel.h
rename to ext/fileinfo/libmagic/patchlevel.h
index 896643f09f3614510c1758a126eca568eaae6c09..14b234b731a64ad59c29e2c841140f17ba603a27 100644 (file)
--- a/ext/fileinfo/lib/patchlevel.h
+++ b/ext/fileinfo/libmagic/patchlevel.h
@@ -6,6 +6,9 @@
  * $File: patchlevel.h,v 1.68 2008/03/22 21:39:43 christos Exp $
  *
  * $Log$
+ * Revision 1.1  2008/07/11 14:10:50  derick
+ * - Step one for bundling the libmagic library. Some config.m4 issues left.
+ *
  * Revision 1.68  2008/03/22 21:39:43  christos
  * file 4.24
  *

diff --git a/ext/fileinfo/lib/print.c b/ext/fileinfo/libmagic/print.c
similarity index 100%
rename from ext/fileinfo/lib/print.c
rename to ext/fileinfo/libmagic/print.c

diff --git a/ext/fileinfo/lib/readelf.c b/ext/fileinfo/libmagic/readelf.c
similarity index 100%
rename from ext/fileinfo/lib/readelf.c
rename to ext/fileinfo/libmagic/readelf.c

diff --git a/ext/fileinfo/lib/readelf.h b/ext/fileinfo/libmagic/readelf.h
similarity index 100%
rename from ext/fileinfo/lib/readelf.h
rename to ext/fileinfo/libmagic/readelf.h

diff --git a/ext/fileinfo/lib/softmagic.c b/ext/fileinfo/libmagic/softmagic.c
similarity index 100%
rename from ext/fileinfo/lib/softmagic.c
rename to ext/fileinfo/libmagic/softmagic.c

diff --git a/ext/fileinfo/lib/tar.h b/ext/fileinfo/libmagic/tar.h
similarity index 100%
rename from ext/fileinfo/lib/tar.h
rename to ext/fileinfo/libmagic/tar.h