always-cautious/ortools-clone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove makeinfo dependencies, install with module

Browse Source
This commit is contained in:
lperron@google.com
2014-02-14 10:58:09 +00:00
parent 68ed548063
commit cab32a628d
3 changed files with 6 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
documentation/reference_manual/generate/generate.sh
View File

@@ -16,7 +16,7 @@ mkdir src
mkdir gen
mkdir tags
for subdir in algorithms base constraint_solver graph linear_solver util
dob
do
mkdir src/$subdir
cp ../../../src/$subdir/README src/$subdir
for file in ../../../src/$subdir/*.{h,cc}

2
documentation/reference_manual/generate/prepare_for_doxygen.sh
View File

@@ -45,7 +45,7 @@ $runsed 's/\/\*([^\*])/\/\*\*\1/; # /* -> /** \
s/\/\/\/ *(Date: (.*))/\/\/\/ @file/; # clutter \
s/\/\/\/ *Author:(.*)/\/\/\/ @file/; # /// Author -> /// @file \
s/\/\/\/ *Author(.*)/\/\/\/ @file/; # /// Author -> /// @file \
s/namespace operations_research \{/namespace operations_research \{\n\/** \\ingroup '"$2"' *\//;' \
s/namespace operations_research \{/namespace operations_research \{\n\/** \\page '"$2"' *\//;' \
$1
# There are no quotes around $1 to let the script work with standard input if

24
makefiles/Makefile.third_party.unix
View File

@@ -19,8 +19,6 @@ BISON_TAG = 3.0.2
FLEX_TAG = 2.5.37
# help2man is needed by bison
HELP2MAN_TAG = 1.43.3
# texinfo is needed too.
TEXINFO_TAG = 5.2
# Autoconf support
AUTOCONF_TAG = 2.69
AUTOMAKE_TAG = 1.14.1
@@ -234,7 +232,7 @@ dependencies/sources/patchelf-0.8/configure: dependencies/archives/patchelf-0.8.
# Install bison
install_bison: dependencies/install/bin/bison
dependencies/install/bin/bison: dependencies/sources/bison-$(BISON_TAG)/Makefile $(ACLOCAL_TARGET) dependencies/install/bin/help2man dependencies/install/bin/makeinfo
dependencies/install/bin/bison: dependencies/sources/bison-$(BISON_TAG)/Makefile $(ACLOCAL_TARGET) dependencies/install/bin/help2man
cd dependencies/sources/bison-$(BISON_TAG) && $(SET_PATH) make install
dependencies/sources/bison-$(BISON_TAG)/Makefile: dependencies/sources/bison-$(BISON_TAG)/configure $(ACLOCAL_TARGET)
@@ -250,7 +248,7 @@ dependencies/archives/bison-$(BISON_TAG).tar.gz:
# Install flex
install_flex: dependencies/install/bin/flex
dependencies/install/bin/flex: dependencies/sources/flex-$(FLEX_TAG)/Makefile $(ACLOCAL_TARGET) dependencies/install/bin/makeinfo
dependencies/install/bin/flex: dependencies/sources/flex-$(FLEX_TAG)/Makefile $(ACLOCAL_TARGET)
cd dependencies/sources/flex-$(FLEX_TAG) && $(SET_PATH) make install
dependencies/sources/flex-$(FLEX_TAG)/Makefile: dependencies/sources/flex-$(FLEX_TAG)/configure $(ACLOCAL_TARGET)
@@ -275,20 +273,6 @@ dependencies/sources/help2man-$(HELP2MAN_TAG)/configure: dependencies/archives/h
dependencies/archives/help2man-$(HELP2MAN_TAG).tar.gz:
cd dependencies/archives && curl -OL http://ftpmirror.gnu.org/help2man/help2man-$(HELP2MAN_TAG).tar.gz
# Install texinfo
dependencies/install/bin/makeinfo: dependencies/sources/texinfo-$(TEXINFO_TAG)/Makefile
cd dependencies/sources/texinfo-$(TEXINFO_TAG) && $(SET_PATH) make install
dependencies/sources/texinfo-$(TEXINFO_TAG)/Makefile: dependencies/sources/texinfo-$(TEXINFO_TAG)/configure
cd dependencies/sources/texinfo-$(TEXINFO_TAG) && $(SET_PATH) autoreconf
cd dependencies/sources/texinfo-$(TEXINFO_TAG) && $(SET_PATH) ./configure --prefix=$(OR_ROOT_FULL)/dependencies/install
dependencies/sources/texinfo-$(TEXINFO_TAG)/configure: dependencies/archives/texinfo-$(TEXINFO_TAG).tar.gz
cd dependencies/sources && tar xvzmf ../archives/texinfo-$(TEXINFO_TAG).tar.gz
dependencies/archives/texinfo-$(TEXINFO_TAG).tar.gz:
cd dependencies/archives && curl -OL http://ftpmirror.gnu.org/texinfo/texinfo-$(TEXINFO_TAG).tar.gz
# Install libtool
dependencies/install/bin/libtool: dependencies/sources/libtool-$(LIBTOOL_TAG)/Makefile
cd dependencies/sources/libtool-$(LIBTOOL_TAG) && make install
@@ -303,13 +287,13 @@ dependencies/archives/libtool-$(LIBTOOL_TAG).tar.gz:
cd dependencies/archives && curl -OL http://ftpmirror.gnu.org/libtool/libtool-$(LIBTOOL_TAG).tar.gz
# Install automake
dependencies/install/bin/automake: dependencies/sources/automake-$(AUTOMAKE_TAG)/Makefile dependencies/install/bin/makeinfo
dependencies/install/bin/automake: dependencies/sources/automake-$(AUTOMAKE_TAG)/Makefile
cd dependencies/sources/automake-$(AUTOMAKE_TAG) && $(SET_PATH) ./bootstrap.sh
cd dependencies/sources/automake-$(AUTOMAKE_TAG) && $(SET_PATH) make
cd dependencies/sources/automake-$(AUTOMAKE_TAG) && $(SET_PATH) make install
dependencies/sources/automake-$(AUTOMAKE_TAG)/Makefile: dependencies/sources/automake-$(AUTOMAKE_TAG)/configure dependencies/install/bin/autoconf dependencies/install/bin/makeinfo
dependencies/sources/automake-$(AUTOMAKE_TAG)/Makefile: dependencies/sources/automake-$(AUTOMAKE_TAG)/configure dependencies/install/bin/autoconf
cd dependencies/sources/automake-$(AUTOMAKE_TAG) && $(SET_PATH) ./configure --prefix=$(OR_ROOT_FULL)/dependencies/install
dependencies/sources/automake-$(AUTOMAKE_TAG)/configure: dependencies/archives/automake-$(AUTOMAKE_TAG).tar.gz