diff --git a/.gitattributes b/.gitattributes index 360a7bfa468..d0a7c5566fb 100644 --- a/.gitattributes +++ b/.gitattributes @@ -514,6 +514,8 @@ Installation/config/support/test_ZLIB.C -text Installation/config/testfiles/CGAL_CFG_DEEP_DEPENDENT_TEMPLATE_BUG.C -text Installation/config/testfiles/CGAL_CFG_OUTOFLINE_MEMBER_DEFINITION_BUG.C -text Installation/config/testfiles/CGAL_CFG_SUNPRO_RWSTD.C -text +Installation/src/makefile_lib -text +Installation/src/makefile_sharedlib -text Interpolation/doc_tex/Interpolation/nn_coords.eps -text Interpolation/doc_tex/Interpolation/nn_coords.gif -text svneol=unset#unset Interpolation/doc_tex/Interpolation/nn_coords.ipe -text diff --git a/Installation/src/makefile_lib b/Installation/src/makefile_lib new file mode 100644 index 00000000000..ffd016799fe --- /dev/null +++ b/Installation/src/makefile_lib @@ -0,0 +1,99 @@ +# Copyright (c) 2003,2004,2005,2006 Utrecht University (The Netherlands), +# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), +# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg +# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), +# and Tel-Aviv University (Israel). All rights reserved. +# +# This file is part of CGAL (www.cgal.org); you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; version 2.1 of the License. +# See the file LICENSE.LGPL distributed with CGAL. +# +# Licensees holding a valid commercial license may use this file in +# accordance with the commercial license agreement provided with the software. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +# +# $URL: svn+ssh://scm.gforge.inria.fr/svn/cgal/trunk/Scripts/developer_scripts/create_internal_release $ +# $Id: create_internal_release 29699 2006-03-22 17:40:45Z spion $ +# +# Author(s) : Radu Ursu +# Sylvain Pion + +# This is the makefile for compiling the CGAL object library libCGAL.a. +# +# N.B. There are different makefiles for creating the object library +# and the shared object library, because the suffix rules (in particular: +# the compiler flags) for these libraries are different. + +#---------------------------------------------------------------------# +# include platform specific settings +#---------------------------------------------------------------------# +# Choose the right include file from the /make directory. + +CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE +include $(CGAL_MAKEFILE) + +#---------------------------------------------------------------------# +# compiler flags +#---------------------------------------------------------------------# + +CXXFLAGS = $(CGAL_LIB_CXXFLAGS) + +#---------------------------------------------------------------------# +# Object files +#---------------------------------------------------------------------# + +CGAL_OBJECTS = \ +assertions$(OBJ_EXT) \ +Bbox_2_intersections$(OBJ_EXT) \ +Bbox_3_intersections$(OBJ_EXT) \ +cgal_logo$(OBJ_EXT) \ +Color$(OBJ_EXT) \ +File_header_extended_OFF$(OBJ_EXT) \ +File_header_OFF$(OBJ_EXT) \ +File_scanner_OFF$(OBJ_EXT) \ +File_writer_inventor$(OBJ_EXT) \ +File_writer_OFF$(OBJ_EXT) \ +File_writer_VRML_2$(OBJ_EXT) \ +File_writer_wavefront$(OBJ_EXT) \ +Geomview_stream$(OBJ_EXT) \ +Interval_arithmetic$(OBJ_EXT) \ +io$(OBJ_EXT) \ +JAMA_numeric_solver$(OBJ_EXT) \ +KDS_Log$(OBJ_EXT) \ +kernel$(OBJ_EXT) \ +MP_Float$(OBJ_EXT) \ +numeric_solvers_support$(OBJ_EXT) \ +Polynomial$(OBJ_EXT) \ +Random$(OBJ_EXT) \ +Real_timer$(OBJ_EXT) \ +Timer$(OBJ_EXT) \ +Turkowski_numeric_solver$(OBJ_EXT) + +#---------------------------------------------------------------------# +# target entries +#---------------------------------------------------------------------# + +lib: lib_no_install + mv $(CGAL_LIB) $(CGAL_LIB_DESTINATION) + +lib_no_install: $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) + $(CGAL_LIB_CREATE)$(CGAL_LIB) \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_LIB_LDFLAGS) + $(RANLIB) $(CGAL_LIB) + rm $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) + + +clean: + rm -f $(CGAL_LIB) $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) + +#---------------------------------------------------------------------# +# suffix rules +#---------------------------------------------------------------------# + +.C$(OBJ_EXT): + $(CGAL_CXX) $(CXXFLAGS) -c $< + diff --git a/Installation/src/makefile_sharedlib b/Installation/src/makefile_sharedlib new file mode 100644 index 00000000000..1063121098f --- /dev/null +++ b/Installation/src/makefile_sharedlib @@ -0,0 +1,93 @@ +# Copyright (c) 2004,2005,2006 Utrecht University (The Netherlands), +# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), +# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg +# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), +# and Tel-Aviv University (Israel). All rights reserved. +# +# This file is part of CGAL (www.cgal.org); you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public License as +# published by the Free Software Foundation; version 2.1 of the License. +# See the file LICENSE.LGPL distributed with CGAL. +# +# Licensees holding a valid commercial license may use this file in +# accordance with the commercial license agreement provided with the software. +# +# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE +# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. +# +# $URL: svn+ssh://scm.gforge.inria.fr/svn/cgal/trunk/Scripts/developer_scripts/create_internal_release $ +# $Id: create_internal_release 29699 2006-03-22 17:40:45Z spion $ +# +# Author(s) : Radu Ursu +# Sylvain Pion + +# This is the makefile for compiling the CGAL shared object library libCGAL.so. +# +# N.B. There are different makefiles for creating the object library +# and the shared object library, because the suffix rules (in particular: +# the compiler flags) for these libraries are different. + +#---------------------------------------------------------------------# +# include platform specific settings +#---------------------------------------------------------------------# +# Choose the right include file from the /make directory. + +CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE +include $(CGAL_MAKEFILE) + +#---------------------------------------------------------------------# +# compiler flags +#---------------------------------------------------------------------# + +CXXFLAGS = $(CGAL_SHARED_LIB_CXXFLAGS) + +#---------------------------------------------------------------------# +# object files +#---------------------------------------------------------------------# + +CGAL_OBJECTS = \ +assertions$(OBJ_EXT) \ +Bbox_2_intersections$(OBJ_EXT) \ +Bbox_3_intersections$(OBJ_EXT) \ +cgal_logo$(OBJ_EXT) \ +Color$(OBJ_EXT) \ +File_header_extended_OFF$(OBJ_EXT) \ +File_header_OFF$(OBJ_EXT) \ +File_scanner_OFF$(OBJ_EXT) \ +File_writer_inventor$(OBJ_EXT) \ +File_writer_OFF$(OBJ_EXT) \ +File_writer_VRML_2$(OBJ_EXT) \ +File_writer_wavefront$(OBJ_EXT) \ +Geomview_stream$(OBJ_EXT) \ +Interval_arithmetic$(OBJ_EXT) \ +io$(OBJ_EXT) \ +JAMA_numeric_solver$(OBJ_EXT) \ +KDS_Log$(OBJ_EXT) \ +kernel$(OBJ_EXT) \ +MP_Float$(OBJ_EXT) \ +numeric_solvers_support$(OBJ_EXT) \ +Polynomial$(OBJ_EXT) \ +Random$(OBJ_EXT) \ +Real_timer$(OBJ_EXT) \ +Timer$(OBJ_EXT) \ +Turkowski_numeric_solver$(OBJ_EXT) + +#---------------------------------------------------------------------# +# target entries +#---------------------------------------------------------------------# + +lib: $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) + $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \ + `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ + $(CGAL_SHARED_LIB_LDFLAGS) + mv $(CGAL_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' + rm $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) + + +#---------------------------------------------------------------------# +# suffix rules +#---------------------------------------------------------------------# + +.C$(OBJ_EXT): + $(CGAL_CXX) $(CXXFLAGS) -c $< + diff --git a/Scripts/developer_scripts/create_internal_release b/Scripts/developer_scripts/create_internal_release index f68e82d67df..20bfaae61ff 100755 --- a/Scripts/developer_scripts/create_internal_release +++ b/Scripts/developer_scripts/create_internal_release @@ -320,182 +320,6 @@ EOF } - -sub make_src_makefiles(){ - chdir "$RELEASEDIR/$VERSION" or die; - chdir 'src' or die; - @source_files = glob("*.C"); -@object_files = map {substr($_, 0,-2) . '$(OBJ_EXT)'} @source_files; -$, = " \\\n"; - -open MFLIB, ">makefile_lib"; - -print MFLIB <<'EOF'; -# Copyright (c) 2003,2004,2005,2006 Utrecht University (The Netherlands), -# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), -# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg -# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), -# and Tel-Aviv University (Israel). All rights reserved. -# -# This file is part of CGAL (www.cgal.org); you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. -# -# Licensees holding a valid commercial license may use this file in -# accordance with the commercial license agreement provided with the software. -# -# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# -# $URL$ -# $Id$ -# -# Author(s) : Radu Ursu -# Sylvain Pion - -# This is the makefile for compiling the CGAL object library libCGAL.a. -# -# N.B. There are different makefiles for creating the object library -# and the shared object library, because the suffix rules (in particular: -# the compiler flags) for these libraries are different. - -#---------------------------------------------------------------------# -# include platform specific settings -#---------------------------------------------------------------------# -# Choose the right include file from the /make directory. - -CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE -include $(CGAL_MAKEFILE) - -#---------------------------------------------------------------------# -# compiler flags -#---------------------------------------------------------------------# - -CXXFLAGS = $(CGAL_LIB_CXXFLAGS) - -#---------------------------------------------------------------------# -# Object files -#---------------------------------------------------------------------# - -CGAL_OBJECTS = \ -EOF - -print MFLIB @object_files; -print MFLIB "\n"; - -print MFLIB <<'EOF'; - -#---------------------------------------------------------------------# -# target entries -#---------------------------------------------------------------------# - -lib: lib_no_install - mv $(CGAL_LIB) $(CGAL_LIB_DESTINATION) - -lib_no_install: $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) - $(CGAL_LIB_CREATE)$(CGAL_LIB) \ - `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ - $(CGAL_LIB_LDFLAGS) - $(RANLIB) $(CGAL_LIB) - rm $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) - - -clean: - rm -f $(CGAL_LIB) $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) - -#---------------------------------------------------------------------# -# suffix rules -#---------------------------------------------------------------------# - -.C$(OBJ_EXT): - $(CGAL_CXX) $(CXXFLAGS) -c $< - -EOF - -close MFLIB; -open MFSHARED, ">makefile_sharedlib"; - -print MFSHARED <<'EOF'; -# Copyright (c) 2004,2005,2006 Utrecht University (The Netherlands), -# ETH Zurich (Switzerland), Freie Universitaet Berlin (Germany), -# INRIA Sophia-Antipolis (France), Martin-Luther-University Halle-Wittenberg -# (Germany), Max-Planck-Institute Saarbruecken (Germany), RISC Linz (Austria), -# and Tel-Aviv University (Israel). All rights reserved. -# -# This file is part of CGAL (www.cgal.org); you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; version 2.1 of the License. -# See the file LICENSE.LGPL distributed with CGAL. -# -# Licensees holding a valid commercial license may use this file in -# accordance with the commercial license agreement provided with the software. -# -# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE -# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. -# -# $URL$ -# $Id$ -# -# Author(s) : Radu Ursu -# Sylvain Pion - -# This is the makefile for compiling the CGAL shared object library libCGAL.so. -# -# N.B. There are different makefiles for creating the object library -# and the shared object library, because the suffix rules (in particular: -# the compiler flags) for these libraries are different. - -#---------------------------------------------------------------------# -# include platform specific settings -#---------------------------------------------------------------------# -# Choose the right include file from the /make directory. - -CGAL_MAKEFILE = ENTER_YOUR_INCLUDE_MAKEFILE_HERE -include $(CGAL_MAKEFILE) - -#---------------------------------------------------------------------# -# compiler flags -#---------------------------------------------------------------------# - -CXXFLAGS = $(CGAL_SHARED_LIB_CXXFLAGS) - -#---------------------------------------------------------------------# -# object files -#---------------------------------------------------------------------# - -CGAL_OBJECTS = \ -EOF - -print MFSHARED @object_files; -print MFSHARED "\n"; - -print MFSHARED <<'EOF'; - -#---------------------------------------------------------------------# -# target entries -#---------------------------------------------------------------------# - -lib: $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) - $(CGAL_SHARED_LIB_CREATE)$(CGAL_SHARED_LIB) \ - `ls *$(OBJ_EXT) | awk '{for (i=1; i<=NF;++i){printf "$(CGAL_OBJ_PREFIX)";print $$i}}'`\ - $(CGAL_SHARED_LIB_LDFLAGS) - mv $(CGAL_SHARED_LIB) '$(CGAL_LIB_DESTINATION)' - rm $(CGAL_OBJECTS) $(CGAL_EXTRA_OBJECTS) - - -#---------------------------------------------------------------------# -# suffix rules -#---------------------------------------------------------------------# - -.C$(OBJ_EXT): - $(CGAL_CXX) $(CXXFLAGS) -c $< - -EOF - -} - - #---------------------------------------------------------------# # CreateExampleTestDirs #---------------------------------------------------------------# @@ -1024,7 +848,6 @@ create_version_file(); create_version_tex_file(); make_testscripts(); set_file_headers(); -make_src_makefiles(); CreateSrcTestDir(); CreateSrcCoreTestDir(); # Must be called after CreateSrcTestDir() CreateSrcQtTestDir(); # Must be called after CreateSrcTestDir()