From e8928b001ed31694031257202775375e2f50e1a8 Mon Sep 17 00:00:00 2001 From: Richard Jones Date: Wed, 24 Feb 2010 18:20:49 +0000 Subject: [PATCH] Create separate toplevel directories for hivexsh and hivexml. --- .gitignore | 7 ++-- Makefile.am | 2 +- configure.ac | 4 ++- lib/Makefile.am | 91 ++---------------------------------------------- po/POTFILES.in | 4 +-- sh/Makefile.am | 81 ++++++++++++++++++++++++++++++++++++++++++ {lib => sh}/example1 | 0 {lib => sh}/example2 | 0 {lib => sh}/example3 | 0 {lib => sh}/example4 | 0 {lib => sh}/example5 | 0 {lib => sh}/example6 | 0 {lib => sh}/hivexget | 0 {lib => sh}/hivexget.pod | 0 {lib => sh}/hivexsh.c | 0 {lib => sh}/hivexsh.pod | 0 xml/Makefile.am | 53 ++++++++++++++++++++++++++++ {lib => xml}/hivexml.c | 0 {lib => xml}/hivexml.pod | 0 19 files changed, 147 insertions(+), 95 deletions(-) create mode 100644 sh/Makefile.am rename {lib => sh}/example1 (100%) rename {lib => sh}/example2 (100%) rename {lib => sh}/example3 (100%) rename {lib => sh}/example4 (100%) rename {lib => sh}/example5 (100%) rename {lib => sh}/example6 (100%) rename {lib => sh}/hivexget (100%) rename {lib => sh}/hivexget.pod (100%) rename {lib => sh}/hivexsh.c (100%) rename {lib => sh}/hivexsh.pod (100%) create mode 100644 xml/Makefile.am rename {lib => xml}/hivexml.c (100%) rename {lib => xml}/hivexml.pod (100%) diff --git a/.gitignore b/.gitignore index 1806916..df2cf09 100644 --- a/.gitignore +++ b/.gitignore @@ -33,12 +33,9 @@ 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 @@ -74,7 +71,11 @@ po/en@quot.header po/insert-header.sin po/quot.sed po/remove-potcdate.sin +sh/*.1 +sh/hivexsh stamp-h1 +xml/*.1 +xml/hivexml /GNUmakefile /maint.mk /build-aux diff --git a/Makefile.am b/Makefile.am index b345ea8..87ac656 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,7 +17,7 @@ ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = gnulib/lib lib images gnulib/tests po +SUBDIRS = gnulib/lib lib images gnulib/tests sh xml po EXTRA_DIST = hivex.pc hivex.pc.in README LICENSE diff --git a/configure.ac b/configure.ac index e2d3d08..41efa09 100644 --- a/configure.ac +++ b/configure.ac @@ -401,7 +401,9 @@ AC_CONFIG_FILES([Makefile images/Makefile lib/Makefile lib/tools/Makefile - po/Makefile.in]) + po/Makefile.in + sh/Makefile + xml/Makefile]) AC_OUTPUT dnl Produce summary. diff --git a/lib/Makefile.am b/lib/Makefile.am index 36e7f74..16d7107 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -18,17 +18,7 @@ SUBDIRS = tools EXTRA_DIST = \ - hivex.pod \ - hivexml.pod \ - hivexget.pod \ - hivexget \ - hivexsh.pod \ - example1 \ - example2 \ - example3 \ - example4 \ - example5 \ - example6 + hivex.pod lib_LTLIBRARIES = libhivex.la @@ -43,33 +33,9 @@ libhivex_la_LDFLAGS = -version-info 0:0:0 $(LTLIBINTL) $(LTLIBTHREAD) libhivex_la_CFLAGS = $(WARN_CFLAGS) $(WERROR_CFLAGS) libhivex_la_CPPFLAGS = -I$(top_srcdir)/gnulib/lib -bin_PROGRAMS = hivexml hivexsh -bin_SCRIPTS = hivexget -noinst_SCRIPTS = example1 example2 example3 example4 example5 example6 - -hivexml_SOURCES = \ - hivexml.c - -hivexml_LDADD = libhivex.la $(LIBXML2_LIBS) -hivexml_CFLAGS = \ - -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(LIBXML2_CFLAGS) \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) - -hivexsh_SOURCES = \ - hivexsh.c \ - hivex.h \ - byte_conversions.h - -hivexsh_LDADD = libhivex.la $(LIBREADLINE) -hivexsh_CFLAGS = \ - -I$(top_srcdir)/gnulib/lib \ - -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ - $(WARN_CFLAGS) $(WERROR_CFLAGS) - include_HEADERS = hivex.h -man_MANS = hivex.3 hivexml.1 hivexget.1 hivexsh.1 +man_MANS = hivex.3 hivex.3: hivex.pod $(POD2MAN) \ @@ -79,35 +45,8 @@ hivex.3: hivex.pod --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ $< > $@-t; mv $@-t $@ -hivexml.1: hivexml.pod - $(POD2MAN) \ - --section 1 \ - -c "Windows Registry" \ - --name "hivexml" \ - --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - $< > $@-t; mv $@-t $@ - -hivexget.1: hivexget.pod - $(POD2MAN) \ - --section 1 \ - -c "Windows Registry" \ - --name "hivexget" \ - --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - $< > $@-t; mv $@-t $@ - -hivexsh.1: hivexsh.pod - $(POD2MAN) \ - --section 1 \ - -c "Windows Registry" \ - --name "hivexsh" \ - --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ - $< > $@-t; mv $@-t $@ - noinst_DATA = \ - $(top_builddir)/html/hivex.3.html \ - $(top_builddir)/html/hivexml.1.html \ - $(top_builddir)/html/hivexget.1.html \ - $(top_builddir)/html/hivexsh.1.html + $(top_builddir)/html/hivex.3.html $(top_builddir)/html/hivex.3.html: hivex.pod mkdir -p $(top_builddir)/html @@ -116,27 +55,3 @@ $(top_builddir)/html/hivex.3.html: hivex.pod --htmldir html \ --outfile html/hivex.3.html \ lib/hivex.pod - -$(top_builddir)/html/hivexml.1.html: hivexml.pod - mkdir -p $(top_builddir)/html - cd $(top_builddir) && pod2html \ - --css 'pod.css' \ - --htmldir html \ - --outfile html/hivexml.1.html \ - lib/hivexml.pod - -$(top_builddir)/html/hivexget.1.html: hivexget.pod - mkdir -p $(top_builddir)/html - cd $(top_builddir) && pod2html \ - --css 'pod.css' \ - --htmldir html \ - --outfile html/hivexget.1.html \ - lib/hivexget.pod - -$(top_builddir)/html/hivexsh.1.html: hivexsh.pod - mkdir -p $(top_builddir)/html - cd $(top_builddir) && pod2html \ - --css 'pod.css' \ - --htmldir html \ - --outfile html/hivexsh.1.html \ - lib/hivexsh.pod diff --git a/po/POTFILES.in b/po/POTFILES.in index efba1a0..34718af 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,4 @@ images/mklarge.c lib/hivex.c -lib/hivexml.c -lib/hivexsh.c +sh/hivexsh.c +xml/hivexml.c diff --git a/sh/Makefile.am b/sh/Makefile.am new file mode 100644 index 0000000..625567d --- /dev/null +++ b/sh/Makefile.am @@ -0,0 +1,81 @@ +# hivex +# Copyright (C) 2009-2010 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +EXTRA_DIST = \ + hivexget.pod \ + hivexget \ + hivexsh.pod \ + example1 \ + example2 \ + example3 \ + example4 \ + example5 \ + example6 + +bin_PROGRAMS = hivexsh +bin_SCRIPTS = hivexget +noinst_SCRIPTS = example1 example2 example3 example4 example5 example6 + +hivexsh_SOURCES = \ + hivexsh.c \ + hivex.h \ + byte_conversions.h + +hivexsh_LDADD = ../lib/libhivex.la $(LIBREADLINE) +hivexsh_CFLAGS = \ + -I$(top_srcdir)/gnulib/lib \ + -I$(top_srcdir)/lib \ + -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) + +man_MANS = hivexget.1 hivexsh.1 + +hivexget.1: hivexget.pod + $(POD2MAN) \ + --section 1 \ + -c "Windows Registry" \ + --name "hivexget" \ + --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ + $< > $@-t; mv $@-t $@ + +hivexsh.1: hivexsh.pod + $(POD2MAN) \ + --section 1 \ + -c "Windows Registry" \ + --name "hivexsh" \ + --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ + $< > $@-t; mv $@-t $@ + +noinst_DATA = \ + $(top_builddir)/html/hivexget.1.html \ + $(top_builddir)/html/hivexsh.1.html + +$(top_builddir)/html/hivexget.1.html: hivexget.pod + mkdir -p $(top_builddir)/html + cd $(top_builddir) && pod2html \ + --css 'pod.css' \ + --htmldir html \ + --outfile html/hivexget.1.html \ + lib/hivexget.pod + +$(top_builddir)/html/hivexsh.1.html: hivexsh.pod + mkdir -p $(top_builddir)/html + cd $(top_builddir) && pod2html \ + --css 'pod.css' \ + --htmldir html \ + --outfile html/hivexsh.1.html \ + lib/hivexsh.pod diff --git a/lib/example1 b/sh/example1 similarity index 100% rename from lib/example1 rename to sh/example1 diff --git a/lib/example2 b/sh/example2 similarity index 100% rename from lib/example2 rename to sh/example2 diff --git a/lib/example3 b/sh/example3 similarity index 100% rename from lib/example3 rename to sh/example3 diff --git a/lib/example4 b/sh/example4 similarity index 100% rename from lib/example4 rename to sh/example4 diff --git a/lib/example5 b/sh/example5 similarity index 100% rename from lib/example5 rename to sh/example5 diff --git a/lib/example6 b/sh/example6 similarity index 100% rename from lib/example6 rename to sh/example6 diff --git a/lib/hivexget b/sh/hivexget similarity index 100% rename from lib/hivexget rename to sh/hivexget diff --git a/lib/hivexget.pod b/sh/hivexget.pod similarity index 100% rename from lib/hivexget.pod rename to sh/hivexget.pod diff --git a/lib/hivexsh.c b/sh/hivexsh.c similarity index 100% rename from lib/hivexsh.c rename to sh/hivexsh.c diff --git a/lib/hivexsh.pod b/sh/hivexsh.pod similarity index 100% rename from lib/hivexsh.pod rename to sh/hivexsh.pod diff --git a/xml/Makefile.am b/xml/Makefile.am new file mode 100644 index 0000000..bc841e0 --- /dev/null +++ b/xml/Makefile.am @@ -0,0 +1,53 @@ +# hivex +# Copyright (C) 2009-2010 Red Hat Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +EXTRA_DIST = \ + hivexml.pod + +bin_PROGRAMS = hivexml + +hivexml_SOURCES = \ + hivexml.c + +hivexml_LDADD = ../lib/libhivex.la $(LIBXML2_LIBS) +hivexml_CFLAGS = \ + -DLOCALEBASEDIR=\""$(datadir)/locale"\" \ + -I$(top_srcdir)/gnulib/lib \ + -I$(top_srcdir)/lib \ + $(LIBXML2_CFLAGS) \ + $(WARN_CFLAGS) $(WERROR_CFLAGS) + +man_MANS = hivexml.1 + +hivexml.1: hivexml.pod + $(POD2MAN) \ + --section 1 \ + -c "Windows Registry" \ + --name "hivexml" \ + --release "$(PACKAGE_NAME)-$(PACKAGE_VERSION)" \ + $< > $@-t; mv $@-t $@ + +noinst_DATA = \ + $(top_builddir)/html/hivexml.1.html + +$(top_builddir)/html/hivexml.1.html: hivexml.pod + mkdir -p $(top_builddir)/html + cd $(top_builddir) && pod2html \ + --css 'pod.css' \ + --htmldir html \ + --outfile html/hivexml.1.html \ + lib/hivexml.pod diff --git a/lib/hivexml.c b/xml/hivexml.c similarity index 100% rename from lib/hivexml.c rename to xml/hivexml.c diff --git a/lib/hivexml.pod b/xml/hivexml.pod similarity index 100% rename from lib/hivexml.pod rename to xml/hivexml.pod -- 1.8.3.1