songsenand
/
cgal
mirror of https://github.com/CGAL/cgal
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

remove -w and -g option of install_cgal 

remove makefile variables CGAL_WINDOW_LDFLAGS, CGAL_GEOWIN_LDFLAGS and CGAL_QT_LDFLAGS
(see #1894)
This commit is contained in:
Joachim Reichel 2007-03-09 22:53:24 +00:00
parent d7494960f0
commit cd1a040d2e
3 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Developers_manual/doc_tex/Developers_manual/tools.tex
View File

@ -132,10 +132,8 @@ The following options are available to indicate the kind of makefile
to create: to create:
\begin{description} \begin{description}
\item[-d] create a default CGAL makefile \item[-d] create a default CGAL makefile
\item[-t] create a makefile for the test suite \item[-t] create a CGAL makefile for the test suite
\item[-w] create a makefile with flags for LEDA windows \item[-q] create a CGAL makefile with Qt support
\item[-g] create a makefile with flags for GEOWIN
\item[-q] create a makefile with flags for QT
\end{description} \end{description}
You should use this script to create makefiles for testing before submitting You should use this script to create makefiles for testing before submitting

6
Installation/install_cgal
View File

@ -4004,12 +4004,6 @@ write_linker_flags()
fi fi
${_printf} "\n\n" >> ${FILE} ${_printf} "\n\n" >> ${FILE}
print_as_shell_comment " The following flags are obsolete" >> ${FILE}
${_printf} "%s\n\n" "CGAL_WINDOW_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE}
${_printf} "%s\n\n" "CGAL_GEOWIN_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE}
${_printf} "%s\n\n" "CGAL_QT_LDFLAGS = \$(CGAL_LDFLAGS)" >> ${FILE}
for i in ${SUPPORT_FEATURES}; do for i in ${SUPPORT_FEATURES}; do
if [ -n "`value_of \"PROVIDE_PKG_${i}\"`" ]; then if [ -n "`value_of \"PROVIDE_PKG_${i}\"`" ]; then
print_as_shell_comment "*** linker flags for feature ${i} ***" >> ${FILE} print_as_shell_comment "*** linker flags for feature ${i} ***" >> ${FILE}

30
Scripts/scripts/cgal_create_makefile
View File

@ -29,10 +29,8 @@
# Usage: cgal_create_makefile [-options] [outputfile] # Usage: cgal_create_makefile [-options] [outputfile]
# #
# -d create a default CGAL makefile # -d create a default CGAL makefile
# -t create a makefile for the test suite # -t create a CGAL makefile for the test suite
# -w create a makefile with flags for LEDA windows # -q create a CGAL makefile with Qt support
# -g create a makefile with flags for GEOWIN
# -q create a makefile with support for QT
#VERSION=2.0 #VERSION=2.0
@ -112,26 +110,14 @@ create_makefile()
if [ ! -z "$TESTSUITE" ] ; then if [ ! -z "$TESTSUITE" ] ; then
echo " \$(TESTSUITE_LIBPATH) \\" echo " \$(TESTSUITE_LIBPATH) \\"
fi fi
if [ -z "$LEDAWINDOWS" ] ; then echo " \$(CGAL_LIBPATH)"
echo " \$(CGAL_LIBPATH)"
else
echo " \$(CGAL_WINDOW_LIBPATH)"
fi
echo echo
echo "LDFLAGS = \\" echo "LDFLAGS = \\"
if [ ! -z "$TESTSUITE" ] ; then if [ ! -z "$TESTSUITE" ] ; then
echo " \$(TESTSUITE_LDFLAGS) \\" echo " \$(TESTSUITE_LDFLAGS) \\"
fi fi
echo " \$(LONG_NAME_PROBLEM_LDFLAGS) \\" echo " \$(LONG_NAME_PROBLEM_LDFLAGS) \\"
if [ -n "$QT" ] ; then echo " \$(CGAL_LDFLAGS)"
echo " \$(CGAL_QT_LDFLAGS)"
elif [ -n "$GEOWIN" ] ; then
echo " \$(CGAL_GEOWIN_LDFLAGS)"
elif [ -z "$LEDAWINDOWS" ] ; then
echo " \$(CGAL_LDFLAGS)"
else
echo " \$(CGAL_WINDOW_LDFLAGS)"
fi
echo echo
header "target entries" header "target entries"
@ -185,10 +171,8 @@ usage()
echo "Usage: cgal_create_makefile [-options] [outputfile]" echo "Usage: cgal_create_makefile [-options] [outputfile]"
echo echo
echo "-d create a default CGAL makefile" echo "-d create a default CGAL makefile"
echo "-t create a makefile for the test suite" echo "-t create a CGAL makefile for the test suite"
echo "-w create a makefile with flags for LEDA windows" echo "-q create a CGAL makefile with Qt support"
echo "-g create a makefile with flags for GEOWIN"
echo "-q create a makefile with flags for QT"
} }
@ -202,8 +186,6 @@ for i do
case $i in case $i in
-d) ;; -d) ;;
-t) TESTSUITE='y';; -t) TESTSUITE='y';;
-w) LEDAWINDOWS='y';;
-g) GEOWIN='y';;
-q) QT='y';; -q) QT='y';;
-*) usage -*) usage
exit 1;; exit 1;;