diff --git a/configure.ac b/configure.ac index cda7b11f..a3595c8e 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ define(RELEASE_NUM, 72) define(CDIO_VERSION_STR, 0.$1rc1) AC_PREREQ(2.52) -AC_REVISION([$Id: configure.ac,v 1.133 2005/01/27 04:54:26 rocky Exp $])dnl +AC_REVISION([$Id: configure.ac,v 1.134 2005/01/29 08:03:23 rocky Exp $])dnl AC_INIT(libcdio, CDIO_VERSION_STR(RELEASE_NUM)) AC_CONFIG_SRCDIR(src/cd-info.c) AM_INIT_AUTOMAKE @@ -536,8 +536,11 @@ AC_CONFIG_FILES([ \ package/libcdio.spec \ src/cd-paranoia/Makefile \ src/cd-paranoia/usage.txt \ - src/cd-paranoia/doc/cd-paranoia.1 \ - src/cd-paranoia/doc/cd-paranoia.1.jp \ + src/cd-paranoia/doc/Makefile \ + src/cd-paranoia/doc/en/cd-paranoia.1 \ + src/cd-paranoia/doc/en/Makefile \ + src/cd-paranoia/doc/jp/cd-paranoia.1 \ + src/cd-paranoia/doc/jp/Makefile \ src/Makefile \ test/check_nrg.sh \ test/check_cue.sh \ diff --git a/doc/.cvsignore b/doc/.cvsignore index f02b6c47..28dbc5de 100644 --- a/doc/.cvsignore +++ b/doc/.cvsignore @@ -16,5 +16,6 @@ *.vr Makefile Makefile.in +libcdio.html version.texi stamp-vti diff --git a/doc/doxygen/.cvsignore b/doc/doxygen/.cvsignore index dc70d74e..8cc9c7c0 100644 --- a/doc/doxygen/.cvsignore +++ b/doc/doxygen/.cvsignore @@ -1,3 +1,4 @@ Doxyfile +latex libcdio.xml libcdio.html diff --git a/src/cd-paranoia/Makefile.am b/src/cd-paranoia/Makefile.am index b21aa81e..0ec213f7 100644 --- a/src/cd-paranoia/Makefile.am +++ b/src/cd-paranoia/Makefile.am @@ -1,4 +1,4 @@ -# $Id: Makefile.am,v 1.12 2005/01/16 13:08:25 rocky Exp $ +# $Id: Makefile.am,v 1.13 2005/01/29 08:03:23 rocky Exp $ # # Copyright (C) 2004, 2005 Rocky Bernstein # Copyright (C) 1998 Monty xiphmont@mit.edu @@ -24,12 +24,9 @@ else getopt_sources = getopt.c getopt1.c endif -man_MANS = doc/cd-paranoia.1 doc/cd-paranoia.1.jp - -EXTRA_DIST = $(man_MANS) getopt.c getopt1.c \ +EXTRA_DIST = getopt.c getopt1.c \ usage.txt.in pod2c.pl \ - doc/FAQ.txt doc/overlapdef.txt \ - doc/cd-paranoia.1.in doc/cd-paranoia.1.jp.in + doc/FAQ.txt doc/overlapdef.txt noinst_HEADERS = getopt.h header.h report.h @@ -38,6 +35,8 @@ transform = s,cd-paranoia,@CDPARANOIA_NAME@, if BUILD_CD_PARANOIA +SUBDIRS = doc + cd_paranoia_SOURCES = cd-paranoia.c \ buffering_write.c buffering_write.h \ $(getopt_sources) header.c report.c usage.h utils.h version.h diff --git a/src/cd-paranoia/doc/.cvsignore b/src/cd-paranoia/doc/.cvsignore index 7a3b1c2d..282522db 100644 --- a/src/cd-paranoia/doc/.cvsignore +++ b/src/cd-paranoia/doc/.cvsignore @@ -1,2 +1,2 @@ -cd-paranoia.1 -cd-paranoia.1.jp +Makefile +Makefile.in diff --git a/src/cd-paranoia/doc/Makefile.am b/src/cd-paranoia/doc/Makefile.am new file mode 100644 index 00000000..637f5621 --- /dev/null +++ b/src/cd-paranoia/doc/Makefile.am @@ -0,0 +1,10 @@ +SUBDIRS = jp +EXTRA_DIST = FAQ.txt overlapdef.txt + +mostlyclean-generic: + -rm -f *~ \#* .*~ .\#* + +maintainer-clean-generic: + -@echo "This command is intended for maintainers to use;" + -@echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in diff --git a/src/cd-paranoia/doc/en/.cvsignore b/src/cd-paranoia/doc/en/.cvsignore new file mode 100644 index 00000000..1d681d1e --- /dev/null +++ b/src/cd-paranoia/doc/en/.cvsignore @@ -0,0 +1,4 @@ +Makefile +Makefile.in +cd-paranoia.1 + diff --git a/src/cd-paranoia/doc/en/Makefile.am b/src/cd-paranoia/doc/en/Makefile.am new file mode 100644 index 00000000..d59f626e --- /dev/null +++ b/src/cd-paranoia/doc/en/Makefile.am @@ -0,0 +1,13 @@ +manfiles = cd-paranoia.1 +man_MANS = $(manfiles) +transform = s,cd-paranoia,@CDPARANOIA_NAME@, + +EXTRA_DIST = $(manfiles) cd-paranoia.1.in + +mostlyclean-generic: + -rm -f *~ \#* .*~ .\#* + +maintainer-clean-generic: + -@echo "This command is intended for maintainers to use;" + -@echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in xine.1 diff --git a/src/cd-paranoia/doc/cd-paranoia.1.in b/src/cd-paranoia/doc/en/cd-paranoia.1.in similarity index 100% rename from src/cd-paranoia/doc/cd-paranoia.1.in rename to src/cd-paranoia/doc/en/cd-paranoia.1.in diff --git a/src/cd-paranoia/doc/jp/.cvsignore b/src/cd-paranoia/doc/jp/.cvsignore new file mode 100644 index 00000000..899f03aa --- /dev/null +++ b/src/cd-paranoia/doc/jp/.cvsignore @@ -0,0 +1,3 @@ +Makefile +Makefile.in +cd-paranoia.1 diff --git a/src/cd-paranoia/doc/jp/Makefile.am b/src/cd-paranoia/doc/jp/Makefile.am new file mode 100644 index 00000000..8c4ab782 --- /dev/null +++ b/src/cd-paranoia/doc/jp/Makefile.am @@ -0,0 +1,55 @@ +mansubdir=/jp/man1 +manfiles = cd-paranoia.1 +man_MANS = $(manfiles) cd-paranoia.1 +transform = s,cd-paranoia,@CDPARANOIA_NAME@, + +EXTRA_DIST = $(manfiles) cd-paranoia.1.in + +install-man1: $(man_MANS) + @$(NORMAL_INSTALL) + test -z "$(man1dir)" || $(mkdir_p) "$(DESTDIR)$(mandir)$(mansubdir)" + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + case "$$ext" in \ + 1*) ;; \ + *) ext='1' ;; \ + esac; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)$(mansubdir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(mandir)$(mansubdir)/$$inst; \ + done + +uninstall-man1: + @$(NORMAL_UNINSTALL) + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed -e 's/^.*\///'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(mandir)$(mansubdir)/$$inst"; \ + rm -f $(DESTDIR)$(mandir)$(mansubdir)/$$inst; \ + done + +mostlyclean-generic: + -rm -f *~ \#* .*~ .\#* + +maintainer-clean-generic: + -@echo "This command is intended for maintainers to use;" + -@echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in cd-paranoia.1 diff --git a/src/cd-paranoia/doc/cd-paranoia.1.jp.in b/src/cd-paranoia/doc/jp/cd-paranoia.1.in similarity index 100% rename from src/cd-paranoia/doc/cd-paranoia.1.jp.in rename to src/cd-paranoia/doc/jp/cd-paranoia.1.in