From 11a449ae003ce7d1aee4065a991fb70428560456 Mon Sep 17 00:00:00 2001 From: Joachim Reichel Date: Tue, 14 Mar 2006 19:35:55 +0000 Subject: [PATCH] Added/fixed CGAL_MAKEFILE= line in makefiles --- Curved_kernel/changes.txt | 3 +++ Curved_kernel/demo/Curved_kernel/makefile | 1 + Matrix_search/changes.txt | 3 +++ Matrix_search/examples/Matrix_search/makefile | 2 +- Matrix_search/test/Matrix_search/makefile | 1 + Nef_2/changes.txt | 3 +++ Nef_2/examples/Nef_2/makefile | 2 +- Nef_2/test/Nef_2/makefile | 2 +- Partition_2/changes.txt | 3 +++ Partition_2/demo/Partition_2/makefile | 2 +- Point_set_2/changes.txt | 3 +++ Point_set_2/demo/Point_set_2/Makefile | 1 + Spatial_searching/changes.txt | 2 ++ Spatial_searching/demo/Spatial_searching/makefile | 2 +- Straight_skeleton_2/changes.txt | 3 +++ Straight_skeleton_2/demo/Straight_skeleton_2/makefile | 3 ++- Straight_skeleton_2/examples/Straight_skeleton_2/makefile | 3 ++- Straight_skeleton_2/test/Straight_skeleton_2/makefile | 3 ++- Surface_mesher/changes.txt | 3 +++ Surface_mesher/examples/Surface_mesher/ImageIO/makefile | 1 + Surface_mesher/examples/Surface_mesher/makefile | 1 + Triangulation_3/changes.txt | 3 +++ Triangulation_3/demo/Triangulation_3/makefile | 2 ++ 23 files changed, 44 insertions(+), 8 deletions(-) diff --git a/Curved_kernel/changes.txt b/Curved_kernel/changes.txt index 70db7ff38f6..5a71c8db311 100755 --- a/Curved_kernel/changes.txt +++ b/Curved_kernel/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 3rd march 2006 Monique Teillaud (and yesterday) - removed all dependencies of CK from AK global functions diff --git a/Curved_kernel/demo/Curved_kernel/makefile b/Curved_kernel/demo/Curved_kernel/makefile index f6da9b72cb1..154f55b7850 100644 --- a/Curved_kernel/demo/Curved_kernel/makefile +++ b/Curved_kernel/demo/Curved_kernel/makefile @@ -6,6 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Matrix_search/changes.txt b/Matrix_search/changes.txt index 5aee53e5826..7df914fbc62 100644 --- a/Matrix_search/changes.txt +++ b/Matrix_search/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 5 August 2005 Sylvain Pion - Remove CGAL_STD. diff --git a/Matrix_search/examples/Matrix_search/makefile b/Matrix_search/examples/Matrix_search/makefile index fbcd71ca1db..8a82c33e583 100644 --- a/Matrix_search/examples/Matrix_search/makefile +++ b/Matrix_search/examples/Matrix_search/makefile @@ -6,7 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = /usr/pack/cgal-2.4-mh/make/makefile_sparc_SunOS-5.9_g++-2.95 +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Matrix_search/test/Matrix_search/makefile b/Matrix_search/test/Matrix_search/makefile index e3b3af83909..c99f5fff127 100644 --- a/Matrix_search/test/Matrix_search/makefile +++ b/Matrix_search/test/Matrix_search/makefile @@ -6,6 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Nef_2/changes.txt b/Nef_2/changes.txt index b8dd4adb08c..e4684554215 100644 --- a/Nef_2/changes.txt +++ b/Nef_2/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 27 February 2006 Andreas Fabri - Added a Base::using in PM_point_locator.h - Added using statements in Bounding_box_2.h diff --git a/Nef_2/examples/Nef_2/makefile b/Nef_2/examples/Nef_2/makefile index e06190428e0..d8941d12fe7 100644 --- a/Nef_2/examples/Nef_2/makefile +++ b/Nef_2/examples/Nef_2/makefile @@ -6,7 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -#CGAL_MAKEFILE = c:/cgal/CGAL-3.2-I-348/make/makefile_i686_CYGWINNT-5.1_CL.EXE-1310 +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Nef_2/test/Nef_2/makefile b/Nef_2/test/Nef_2/makefile index 8242c270571..a89e02a9462 100644 --- a/Nef_2/test/Nef_2/makefile +++ b/Nef_2/test/Nef_2/makefile @@ -6,7 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Partition_2/changes.txt b/Partition_2/changes.txt index c8f576b098b..f429e1791aa 100644 --- a/Partition_2/changes.txt +++ b/Partition_2/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 13 March 2006 Andreas Fabri - Fixed the demo by using the same kernel in all .C files diff --git a/Partition_2/demo/Partition_2/makefile b/Partition_2/demo/Partition_2/makefile index eaf0bb5ebf8..4fbf0d7b551 100644 --- a/Partition_2/demo/Partition_2/makefile +++ b/Partition_2/demo/Partition_2/makefile @@ -5,7 +5,7 @@ # include platform specific settings #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = c:/cgal/CGAL-3.2-I-361/make/makefile_i686_CYGWINNT-5.1_CL.EXE-1310 + # CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) diff --git a/Point_set_2/changes.txt b/Point_set_2/changes.txt index 5a37a68b3d9..1181b59216d 100644 --- a/Point_set_2/changes.txt +++ b/Point_set_2/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 22 December 2005 Sylvain Pion - Add some "using Base::member" to please g++ 4.1. diff --git a/Point_set_2/demo/Point_set_2/Makefile b/Point_set_2/demo/Point_set_2/Makefile index 645e85dcaf9..9d14ae08ff4 100644 --- a/Point_set_2/demo/Point_set_2/Makefile +++ b/Point_set_2/demo/Point_set_2/Makefile @@ -1,3 +1,4 @@ +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) CC = $(CGAL_CXX) $(CGAL_WINDOW_LIBPATH) diff --git a/Spatial_searching/changes.txt b/Spatial_searching/changes.txt index a995edf92ca..5422e0ac725 100755 --- a/Spatial_searching/changes.txt +++ b/Spatial_searching/changes.txt @@ -1,3 +1,5 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles 9 March 2006 Andreas Fabri - Changed names of examples diff --git a/Spatial_searching/demo/Spatial_searching/makefile b/Spatial_searching/demo/Spatial_searching/makefile index ab28894bea3..6c20c7260a1 100644 --- a/Spatial_searching/demo/Spatial_searching/makefile +++ b/Spatial_searching/demo/Spatial_searching/makefile @@ -6,7 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -CGAL_MAKEFILE = c:/cgal/CGAL-3.1-I-115/make/makefile_i686_CYGWINNT-5.1-1.5.6_CL.EXE-1310 +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Straight_skeleton_2/changes.txt b/Straight_skeleton_2/changes.txt index 3b449f900bc..bde9bd48d32 100755 --- a/Straight_skeleton_2/changes.txt +++ b/Straight_skeleton_2/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 9 March 2006 Fernando Cacciola - Manual improvements 8 March 2006 Fernando Cacciola diff --git a/Straight_skeleton_2/demo/Straight_skeleton_2/makefile b/Straight_skeleton_2/demo/Straight_skeleton_2/makefile index f5eeac05073..30776437fb1 100755 --- a/Straight_skeleton_2/demo/Straight_skeleton_2/makefile +++ b/Straight_skeleton_2/demo/Straight_skeleton_2/makefile @@ -5,7 +5,8 @@ # include platform specific settings #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -#CGAL_MAKEFILE=c:/cgal/CGAL-3.2-I-361/make/makefile_i686_CYGWINNT-5.1_CL.EXE-1310 + +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Straight_skeleton_2/examples/Straight_skeleton_2/makefile b/Straight_skeleton_2/examples/Straight_skeleton_2/makefile index 0aa9986c5ea..8de2a347c8e 100755 --- a/Straight_skeleton_2/examples/Straight_skeleton_2/makefile +++ b/Straight_skeleton_2/examples/Straight_skeleton_2/makefile @@ -5,7 +5,8 @@ # include platform specific settings #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -#CGAL_MAKEFILE=c:/cgal/CGAL-3.2-I-361/make/makefile_i686_CYGWINNT-5.1_CL.EXE-1310 + +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Straight_skeleton_2/test/Straight_skeleton_2/makefile b/Straight_skeleton_2/test/Straight_skeleton_2/makefile index 196b4b4d2bb..55d1ee98022 100644 --- a/Straight_skeleton_2/test/Straight_skeleton_2/makefile +++ b/Straight_skeleton_2/test/Straight_skeleton_2/makefile @@ -5,7 +5,8 @@ # include platform specific settings #---------------------------------------------------------------------# # Choose the right include file from the /make directory. -#CGAL_MAKEFILE=c:/cgal/CGAL-3.2-I-361/make/makefile_i686_CYGWINNT-5.1_CL.EXE-1310 + +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Surface_mesher/changes.txt b/Surface_mesher/changes.txt index a9677814f0e..1929990e399 100644 --- a/Surface_mesher/changes.txt +++ b/Surface_mesher/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 10 March 2006 Mariette - doc fixes diff --git a/Surface_mesher/examples/Surface_mesher/ImageIO/makefile b/Surface_mesher/examples/Surface_mesher/ImageIO/makefile index 3614d8d522c..4036e5041fa 100644 --- a/Surface_mesher/examples/Surface_mesher/ImageIO/makefile +++ b/Surface_mesher/examples/Surface_mesher/ImageIO/makefile @@ -1,3 +1,4 @@ +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Surface_mesher/examples/Surface_mesher/makefile b/Surface_mesher/examples/Surface_mesher/makefile index c227a0fa312..ca3a950216d 100644 --- a/Surface_mesher/examples/Surface_mesher/makefile +++ b/Surface_mesher/examples/Surface_mesher/makefile @@ -6,6 +6,7 @@ #---------------------------------------------------------------------# # Choose the right include file from the /make directory. +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) #---------------------------------------------------------------------# diff --git a/Triangulation_3/changes.txt b/Triangulation_3/changes.txt index 0e00dc11eb2..4c255915f40 100644 --- a/Triangulation_3/changes.txt +++ b/Triangulation_3/changes.txt @@ -1,3 +1,6 @@ +14 March 2006 Joachim Reichel +- Added/fixed CGAL_MAKEFILE= line in makefiles + 13 March 2006 Andreas Fabri - Instead of forwarding it is enough to ot use using diff --git a/Triangulation_3/demo/Triangulation_3/makefile b/Triangulation_3/demo/Triangulation_3/makefile index f82f419a318..e372e426778 100644 --- a/Triangulation_3/demo/Triangulation_3/makefile +++ b/Triangulation_3/demo/Triangulation_3/makefile @@ -4,6 +4,8 @@ # include platform specific settings #---------------------------------------------------------------------# # Choose the right include file from the /make directory. + +# CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE include $(CGAL_MAKEFILE) # ---------------------------------------------------------------------#