Rename hivex/ -> lib/

diff --git a/.gitignore b/.gitignore
index 6918ed2..1806916 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -25,13 +25,6 @@ generator/.pod2text.data
 generator/stamp-generator
 hivex.pc
 hivex-*.tar.gz
-hivex/*.1
-hivex/*.3
-hivex/hivex.h
-hivex/hivex.pod
-hivex/hivexsh
-hivex/hivexml
-hivex/tools/*.opt
 html/hivex.3.html
 html/hivexget.1.html
 html/hivexml.1.html
@@ -40,6 +33,13 @@ images/large
 images/mklarge
 install-sh
 *.la
+lib/*.1
+lib/*.3
+lib/hivex.h
+lib/hivex.pod
+lib/hivexsh
+lib/hivexml
+lib/tools/*.opt
 .libs
 libtool
 *.lo

diff --git a/Makefile.am b/Makefile.am
index fc57ef4..b345ea8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,7 +17,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = gnulib/lib hivex images gnulib/tests po
+SUBDIRS = gnulib/lib lib images gnulib/tests po
 
 EXTRA_DIST = hivex.pc hivex.pc.in README LICENSE
 

diff --git a/README b/README
index 3f7f018..0aaec9f 100644 (file)
--- a/README
+++ b/README
@@ -22,7 +22,7 @@ This library was derived from several sources:
    versions of Samba, so you have to go back in the source repository
    to find it (GPLv2+)
  . http://amnesia.gtisc.gatech.edu/~moyix/suzibandit.ltd.uk/MSc/
- . reverse engineering the format (see hivex/tools/visualizer.ml)
+ . reverse engineering the format (see lib/tools/visualizer.ml)
 
 Like NTREG, this library only attempts to read Windows NT registry
 files (ie. not Windows 3.1 or Windows 95/98/ME).  See the link above

diff --git a/configure.ac b/configure.ac
index 0bd511f..e2d3d08 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -398,9 +398,9 @@ AC_CONFIG_FILES([Makefile
                  gnulib/lib/Makefile
                  gnulib/tests/Makefile
                  hivex.pc
-                 hivex/Makefile
-                 hivex/tools/Makefile
                  images/Makefile
+                 lib/Makefile
+                 lib/tools/Makefile
                  po/Makefile.in])
 AC_OUTPUT
 

diff --git a/generator/generator.ml b/generator/generator.ml
index 89ba7d7..7a326db 100755 (executable)
--- a/generator/generator.ml
+++ b/generator/generator.ml
@@ -1353,8 +1353,8 @@ Run it from the top source directory using the command
 
   check_functions ();
 
-  output_to "hivex/hivex.h" generate_c_header;
-  output_to "hivex/hivex.pod" generate_c_pod;
+  output_to "lib/hivex.h" generate_c_header;
+  output_to "lib/hivex.pod" generate_c_pod;
 
   (* Always generate this file last, and unconditionally.  It's used
    * by the Makefile to know when we must re-run the generator.

diff --git a/images/Makefile.am b/images/Makefile.am
index 9a32c87..b9f9619 100644 (file)
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -23,9 +23,9 @@ EXTRA_DIST = minimal
 noinst_PROGRAMS = mklarge
 mklarge_SOURCES = mklarge.c
 mklarge_CFLAGS = \
-       -I$(srcdir)/../hivex \
+       -I$(srcdir)/../lib \
        $(WARN_CFLAGS) $(WERROR_CFLAGS)
-mklarge_LDADD = ../hivex/libhivex.la
+mklarge_LDADD = ../lib/libhivex.la
 
 noinst_DATA = large
 

diff --git a/hivex/Makefile.am b/lib/Makefile.am
similarity index 97%
rename from hivex/Makefile.am
rename to lib/Makefile.am
index acd41cf..36e7f74 100644 (file)
--- a/hivex/Makefile.am
+++ b/lib/Makefile.am
@@ -115,7 +115,7 @@ $(top_builddir)/html/hivex.3.html: hivex.pod
          --css 'pod.css' \
          --htmldir html \
          --outfile html/hivex.3.html \
-         hivex/hivex.pod
+         lib/hivex.pod
 
 $(top_builddir)/html/hivexml.1.html: hivexml.pod
        mkdir -p $(top_builddir)/html
@@ -123,7 +123,7 @@ $(top_builddir)/html/hivexml.1.html: hivexml.pod
          --css 'pod.css' \
          --htmldir html \
          --outfile html/hivexml.1.html \
-         hivex/hivexml.pod
+         lib/hivexml.pod
 
 $(top_builddir)/html/hivexget.1.html: hivexget.pod
        mkdir -p $(top_builddir)/html
@@ -131,7 +131,7 @@ $(top_builddir)/html/hivexget.1.html: hivexget.pod
          --css 'pod.css' \
          --htmldir html \
          --outfile html/hivexget.1.html \
-         hivex/hivexget.pod
+         lib/hivexget.pod
 
 $(top_builddir)/html/hivexsh.1.html: hivexsh.pod
        mkdir -p $(top_builddir)/html
@@ -139,4 +139,4 @@ $(top_builddir)/html/hivexsh.1.html: hivexsh.pod
          --css 'pod.css' \
          --htmldir html \
          --outfile html/hivexsh.1.html \
-         hivex/hivexsh.pod
+         lib/hivexsh.pod

diff --git a/hivex/byte_conversions.h b/lib/byte_conversions.h
similarity index 100%
rename from hivex/byte_conversions.h
rename to lib/byte_conversions.h

diff --git a/hivex/example1 b/lib/example1
similarity index 100%
rename from hivex/example1
rename to lib/example1

diff --git a/hivex/example2 b/lib/example2
similarity index 100%
rename from hivex/example2
rename to lib/example2

diff --git a/hivex/example3 b/lib/example3
similarity index 100%
rename from hivex/example3
rename to lib/example3

diff --git a/hivex/example4 b/lib/example4
similarity index 100%
rename from hivex/example4
rename to lib/example4

diff --git a/hivex/example5 b/lib/example5
similarity index 100%
rename from hivex/example5
rename to lib/example5

diff --git a/hivex/example6 b/lib/example6
similarity index 100%
rename from hivex/example6
rename to lib/example6

diff --git a/hivex/gettext.h b/lib/gettext.h
similarity index 100%
rename from hivex/gettext.h
rename to lib/gettext.h

diff --git a/hivex/hivex.c b/lib/hivex.c
similarity index 100%
rename from hivex/hivex.c
rename to lib/hivex.c

diff --git a/hivex/hivexget b/lib/hivexget
similarity index 100%
rename from hivex/hivexget
rename to lib/hivexget

diff --git a/hivex/hivexget.pod b/lib/hivexget.pod
similarity index 100%
rename from hivex/hivexget.pod
rename to lib/hivexget.pod

diff --git a/hivex/hivexml.c b/lib/hivexml.c
similarity index 100%
rename from hivex/hivexml.c
rename to lib/hivexml.c

diff --git a/hivex/hivexml.pod b/lib/hivexml.pod
similarity index 100%
rename from hivex/hivexml.pod
rename to lib/hivexml.pod

diff --git a/hivex/hivexsh.c b/lib/hivexsh.c
similarity index 100%
rename from hivex/hivexsh.c
rename to lib/hivexsh.c

diff --git a/hivex/hivexsh.pod b/lib/hivexsh.pod
similarity index 100%
rename from hivex/hivexsh.pod
rename to lib/hivexsh.pod

diff --git a/hivex/tools/Makefile.am b/lib/tools/Makefile.am
similarity index 100%
rename from hivex/tools/Makefile.am
rename to lib/tools/Makefile.am

diff --git a/hivex/tools/clearheaderfields.ml b/lib/tools/clearheaderfields.ml
similarity index 100%
rename from hivex/tools/clearheaderfields.ml
rename to lib/tools/clearheaderfields.ml

diff --git a/hivex/tools/counter.ml b/lib/tools/counter.ml
similarity index 100%
rename from hivex/tools/counter.ml
rename to lib/tools/counter.ml

diff --git a/hivex/tools/counter.mli b/lib/tools/counter.mli
similarity index 100%
rename from hivex/tools/counter.mli
rename to lib/tools/counter.mli

diff --git a/hivex/tools/fillemptyhbins.ml b/lib/tools/fillemptyhbins.ml
similarity index 100%
rename from hivex/tools/fillemptyhbins.ml
rename to lib/tools/fillemptyhbins.ml

diff --git a/hivex/tools/truncatefile.ml b/lib/tools/truncatefile.ml
similarity index 100%
rename from hivex/tools/truncatefile.ml
rename to lib/tools/truncatefile.ml

diff --git a/hivex/tools/visualizer.ml b/lib/tools/visualizer.ml
similarity index 100%
rename from hivex/tools/visualizer.ml
rename to lib/tools/visualizer.ml

diff --git a/hivex/tools/visualizer_NT_time.ml b/lib/tools/visualizer_NT_time.ml
similarity index 100%
rename from hivex/tools/visualizer_NT_time.ml
rename to lib/tools/visualizer_NT_time.ml

diff --git a/hivex/tools/visualizer_utils.ml b/lib/tools/visualizer_utils.ml
similarity index 100%
rename from hivex/tools/visualizer_utils.ml
rename to lib/tools/visualizer_utils.ml

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 306da64..efba1a0 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,4 +1,4 @@
-hivex/hivex.c
-hivex/hivexml.c
-hivex/hivexsh.c
 images/mklarge.c
+lib/hivex.c
+lib/hivexml.c
+lib/hivexsh.c