From cd1a040d2e8af68d9b547ddc6f7c44cae67a81a8 Mon Sep 17 00:00:00 2001
From: Joachim Reichel <joachim.reichel@gmx.de>
Date: Fri, 9 Mar 2007 22:53:24 +0000
Subject: [PATCH] remove -w and -g option of install_cgal remove makefile
 variables CGAL_WINDOW_LDFLAGS, CGAL_GEOWIN_LDFLAGS and CGAL_QT_LDFLAGS (see
 #1894)

---
 .../doc_tex/Developers_manual/tools.tex       |  6 ++--
 Installation/install_cgal                     |  6 ----
 Scripts/scripts/cgal_create_makefile          | 30 ++++---------------
 3 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/Developers_manual/doc_tex/Developers_manual/tools.tex b/Developers_manual/doc_tex/Developers_manual/tools.tex
index a128675dcd6..282334b3776 100644
--- a/Developers_manual/doc_tex/Developers_manual/tools.tex
+++ b/Developers_manual/doc_tex/Developers_manual/tools.tex
@@ -132,10 +132,8 @@ The following options are available to indicate the kind of makefile
 to create:
 \begin{description}
 \item[-d]   create a default CGAL makefile
-\item[-t]   create a makefile for the test suite
-\item[-w]   create a makefile with flags for LEDA windows
-\item[-g]   create a makefile with flags for GEOWIN
-\item[-q]   create a makefile with flags for QT
+\item[-t]   create a CGAL makefile for the test suite
+\item[-q]   create a CGAL makefile with Qt support
 \end{description}
 
 You should use this script to create makefiles for testing before submitting
diff --git a/Installation/install_cgal b/Installation/install_cgal
index e9fab685e55..5ce0c3f6dae 100755
--- a/Installation/install_cgal
+++ b/Installation/install_cgal
@@ -4004,12 +4004,6 @@ write_linker_flags()
   fi
   ${_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
       if [ -n "`value_of \"PROVIDE_PKG_${i}\"`" ]; then
 	  print_as_shell_comment "*** linker flags for feature ${i} ***" >> ${FILE}
diff --git a/Scripts/scripts/cgal_create_makefile b/Scripts/scripts/cgal_create_makefile
index f47d1f49ceb..857d773d31a 100755
--- a/Scripts/scripts/cgal_create_makefile
+++ b/Scripts/scripts/cgal_create_makefile
@@ -29,10 +29,8 @@
 # Usage: cgal_create_makefile [-options] [outputfile]
 #
 # -d   create a default CGAL makefile
-# -t   create a makefile for the test suite
-# -w   create a makefile with flags for LEDA windows
-# -g   create a makefile with flags for GEOWIN
-# -q   create a makefile with support for QT
+# -t   create a CGAL makefile for the test suite
+# -q   create a CGAL makefile with Qt support
 
 
 #VERSION=2.0
@@ -112,26 +110,14 @@ create_makefile()
   if [ ! -z "$TESTSUITE" ] ; then
     echo    "          \$(TESTSUITE_LIBPATH) \\"
   fi
-  if [ -z "$LEDAWINDOWS" ] ; then
-    echo    "          \$(CGAL_LIBPATH)"
-  else
-    echo    "          \$(CGAL_WINDOW_LIBPATH)"
-  fi
+  echo    "          \$(CGAL_LIBPATH)"
   echo
   echo    "LDFLAGS = \\"
   if [ ! -z "$TESTSUITE" ] ; then
     echo    "          \$(TESTSUITE_LDFLAGS) \\"
   fi
   echo    "          \$(LONG_NAME_PROBLEM_LDFLAGS) \\"
-  if [ -n "$QT" ] ; then
-    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    "          \$(CGAL_LDFLAGS)"
 
   echo
   header "target entries"
@@ -185,10 +171,8 @@ usage()
      echo "Usage: cgal_create_makefile [-options] [outputfile]"
      echo
      echo "-d   create a default CGAL makefile"
-     echo "-t   create a makefile for the test suite"
-     echo "-w   create a makefile with flags for LEDA windows"
-     echo "-g   create a makefile with flags for GEOWIN"
-     echo "-q   create a makefile with flags for QT"
+     echo "-t   create a CGAL makefile for the test suite"
+     echo "-q   create a CGAL makefile with Qt support"
 }
 
 
@@ -202,8 +186,6 @@ for i do
   case $i in
     -d) ;;
     -t) TESTSUITE='y';;
-    -w) LEDAWINDOWS='y';;
-    -g) GEOWIN='y';;
     -q) QT='y';;
     -*) usage
         exit 1;;