Skip to content

Commit

Permalink
Fix make dist.
Browse files Browse the repository at this point in the history
Makes fail because make doc fails .
for more information please see :
#177
  • Loading branch information
sergiomb2 committed Oct 7, 2015
1 parent cc17ffe commit 60e3462
Show file tree
Hide file tree
Showing 16 changed files with 32 additions and 31 deletions.
1 change: 1 addition & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ AC_MSG_NOTICE([
-->])

AC_CONFIG_AUX_DIR([autoaux])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([1.9.6 foreign -Wall -Wno-portability -Werror subdir-objects nostdinc no-dist-gzip dist-bzip2 dist-zip dejagnu])

AC_CONFIG_SRCDIR([src/mp4.cpp])
Expand Down
2 changes: 1 addition & 1 deletion doc/GNUmakefile.mk
Original file line number Diff line number Diff line change
Expand Up @@ -384,4 +384,4 @@ clean-local:
###############################################################################

$(sort $(MKDIRS)):
$(mkdir_p) $@
$(mkdir_p) $(sort $(MKDIRS))
2 changes: 1 addition & 1 deletion doc/texi/Authors.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@input texinfo @c -*- Texinfo -*-
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename Authors.info
@include base/article.texi
Expand Down
14 changes: 7 additions & 7 deletions doc/texi/BuildRepository.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@input texinfo @c -*- Texinfo -*-
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename BuildRepository.info
@include base/article.texi
Expand All @@ -19,12 +19,12 @@ This document describes the recommended process to build @value{PROJECT.name} fr
This chapter is for the impatient or those just looking for a quick summary of all the commands used in a typical build. You may skip this summary and jump to @ref{Build Process}.

@example
@COMMAND.checkout{}
@COMMAND.bootstrap{}
@COMMAND.configure{}
@COMMAND.build{}
@COMMAND.install{}
@COMMAND.dist{}
@COMMANDcheckout{}
@COMMANDbootstrap{}
@COMMANDconfigure{}
@COMMANDbuild{}
@COMMANDinstall{}
@COMMANDdist{}
@end example

@anchor{Build Process}
Expand Down
10 changes: 5 additions & 5 deletions doc/texi/BuildSource.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@input texinfo @c -*- Texinfo -*-
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename BuildSource.info
@include base/article.texi
Expand All @@ -19,10 +19,10 @@ This document describes the recommended process to build @value{PROJECT.name} fr
This chapter is for the impatient or those just looking for a quick summary of all the commands used in a typical build. You may skip this summary and jump to @ref{Build Process}.

@example
@COMMAND.extract{}
@COMMAND.configure{}
@COMMAND.build{}
@COMMAND.install{}
@COMMANDextract{}
@COMMANDconfigure{}
@COMMANDbuild{}
@COMMANDinstall{}
@end example

@anchor{Build Process}
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/Documentation.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@input texinfo @c -*- Texinfo -*-
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename Documentation.info
@include base/article.texi
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/ReleaseNotes.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@input texinfo @c -*- Texinfo -*-
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename ReleaseNotes.info
@include base/article.texi
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/ToolGuide.texi
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@input texinfo @c -*- Texinfo -*-
\input texinfo @c -*- Texinfo -*-
@c %**start of header
@setfilename ToolGuide.info
@include base/guide.texi
Expand Down
14 changes: 7 additions & 7 deletions doc/texi/build/commands.texi
Original file line number Diff line number Diff line change
@@ -1,33 +1,33 @@
@macro COMMAND.checkout{}
@macro COMMANDcheckout{}
svn checkout @value{PROJECT.repo.url} @value{PROJECT.name.lower}
cd @value{PROJECT.name.lower}
@end macro

@macro COMMAND.bootstrap{}
@macro COMMANDbootstrap{}
autoreconf -fiv
@end macro

@macro COMMAND.extract{}
@macro COMMANDextract{}
tar xf @value{PROJECT.name.lower}-@value{PROJECT.version}.tar.bz2
cd @value{PROJECT.name.lower}-@value{PROJECT.version}/
@end macro

@macro COMMAND.configure{}
@macro COMMANDconfigure{}
rm -fr build/
mkdir build/
cd build/
../configure
@end macro

@macro COMMAND.build{}
@macro COMMANDbuild{}
make
@end macro

@macro COMMAND.install{}
@macro COMMANDinstall{}
make install
make install-man
@end macro

@macro COMMAND.dist{}
@macro COMMANDdist{}
make dist
@end macro
2 changes: 1 addition & 1 deletion doc/texi/build/process.bootstrap.texi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The following command causes forces Autotools to regenerate all files and install helper scripts needed at configure-time and to regenerate all files.

@example
@COMMAND.bootstrap{}
@COMMANDbootstrap{}
@end example

If you are a project member and preparing for a release, it is important to note that the versions of Autotools available in your path will directly effect files added to the bundle. At the time of writing, the following versions of Autotools are recommended; in some cases a minimum is hard-coded and warnings will be issued if in violation:
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/build/process.build.texi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The following command will build @value{PROJECT.name}.

@example
@COMMAND.build{}
@COMMANDbuild{}
@end example

On some platforms @code{make} refers to a BSD-flavor of make which is not compatible with this project. Check if @code{gmake} is installed, and if it is, substitute @code{gmake} wherever you may see @code{make} in this document. Otherwise you will need to install GNU make package version 3.81 or higher. Lower versions might work.
2 changes: 1 addition & 1 deletion doc/texi/build/process.checkout.texi
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Sources are checked out from either the trunk, release or a branch. This documen
If you are a project member, then you may add the appropriate login/password information as needed.

@example
@COMMAND.checkout{}
@COMMANDcheckout{}
@end example

It is recommended to use Subversion 1.5.0 or higher.
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/build/process.configure.texi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The following command configures the project for a build. It is highly recommended that you invoke configure from an empty directory.

@example
@COMMAND.configure{}
@COMMANDconfigure{}
@end example

Please see @file{INSTALL} for details on configure usage, and standard options. Additionally, the following custom options have been added to @file{configure}:
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/build/process.dist.texi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
The following command will create a @value{PROJECT.name} source distribution. It is during this step that shipped documentation is generated.

@example
@COMMAND.dist{}
@COMMANDdist{}
@end example

This step in the build process introduces additional requirements to the host system. While most of the following utilities are generally available, @command{help2man} is used to generate man-pages; however if this command is not available the man-pages will be empty. This is acceptable for non-release builds but for full quality builds this command is required.
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/build/process.extract.texi
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
Extract sources from a @value{TERM.srcdist} bundle. Releases are available from @url{@value{PROJECT.url.website}} in the @url{@value{PROJECT.url.downloads},downloads} section.

@example
@COMMAND.extract{}
@COMMANDextract{}
@end example

Older versions of @code{tar} may not automatically uncompress the bundle, so you might have to either enter additional flags manually, or first decompress the bundle before extracting. Some possible command variations for uncompressing a @file{bz2} file:
Expand Down
2 changes: 1 addition & 1 deletion doc/texi/build/process.install.texi
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
The following command will install @value{PROJECT.name}.

@example
@COMMAND.install{}
@COMMANDinstall{}
@end example

0 comments on commit 60e3462

Please sign in to comment.