diff --git a/.gitignore b/.gitignore index ebf7bd2a6e5..3b004e3fcf0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,10 +8,13 @@ Maintenance/rpm/SOURCES/Manual_tools Maintenance/rpm/SOURCES/Manual_tools-*.tar.gz Maintenance/rpm/SRPMS/* Maintenance/rpm/my_makefile +Mesh_2/.*.deps +Mesh_2/bench/.*.deps Mesh_2/bench/bench Mesh_2/bench/semantic.cache Mesh_2/demo/Mesh_2/*.core Mesh_2/demo/Mesh_2/*.moc +Mesh_2/demo/Mesh_2/.*.deps Mesh_2/demo/Mesh_2/conform Mesh_2/demo/Mesh_2/depends Mesh_2/demo/Mesh_2/filename.edg @@ -35,6 +38,7 @@ Mesh_2/doc_tex/*.pdflg Mesh_2/doc_tex/*.ref Mesh_2/doc_tex/*.tmp Mesh_2/doc_tex/*.tmp.* +Mesh_2/doc_tex/.*.deps Mesh_2/doc_tex/Mesh_2/*.aux Mesh_2/doc_tex/Mesh_2/*.core Mesh_2/doc_tex/Mesh_2/*.dvi @@ -59,6 +63,7 @@ Mesh_2/doc_tex/Mesh_2_ref/_region* Mesh_2/doc_tex/Mesh_2_ref/semantic.cache Mesh_2/doxygen Mesh_2/examples/Mesh_2/*.core +Mesh_2/examples/Mesh_2/.*.deps Mesh_2/examples/Mesh_2/conform Mesh_2/examples/Mesh_2/conforming Mesh_2/examples/Mesh_2/depends @@ -70,6 +75,7 @@ Mesh_2/examples/Mesh_2/my_makefile Mesh_2/examples/Mesh_2/semantic.cache Mesh_2/include/CGAL/semantic.cache Mesh_2/test/Mesh_2/*.core +Mesh_2/test/Mesh_2/.*.deps Mesh_2/test/Mesh_2/depends Mesh_2/test/Mesh_2/my_makefile Mesh_2/test/Mesh_2/semantic.cache @@ -78,12 +84,14 @@ Mesh_2/test/Mesh_2/test_double_map Mesh_2/test/Mesh_2/test_filtred_container Mesh_2/test/Mesh_2/test_meshing Mesh_3/*.tags.xml +Mesh_3/.*.deps Mesh_3/applications/*.cgal Mesh_3/applications/*.exe Mesh_3/applications/*.maillage Mesh_3/applications/*.mesh Mesh_3/applications/*.png Mesh_3/applications/*.surface* +Mesh_3/applications/.*.deps Mesh_3/applications/cgal_to_medit Mesh_3/applications/depends Mesh_3/applications/display_distribution @@ -100,6 +108,7 @@ Mesh_3/doxygen Mesh_3/examples/Mesh_3/*.cgal Mesh_3/examples/Mesh_3/*.mesh Mesh_3/examples/Mesh_3/*.off +Mesh_3/examples/Mesh_3/.*.deps Mesh_3/examples/Mesh_3/applications Mesh_3/examples/Mesh_3/cgal_to_medit Mesh_3/examples/Mesh_3/chair-after.mesh @@ -128,6 +137,7 @@ Mesh_3/test/Mesh_3/*.mesh Mesh_3/test/Mesh_3/*.off Mesh_3/test/Mesh_3/*.png Mesh_3/test/Mesh_3/*.surface* +Mesh_3/test/Mesh_3/.*.deps Mesh_3/test/Mesh_3/ProgramOutput.* Mesh_3/test/Mesh_3/applications Mesh_3/test/Mesh_3/cgal_to_medit @@ -304,7 +314,9 @@ Surface_mesh_parameterization/test/Surface_mesh_parameterization/debug Surface_mesh_parameterization/test/Surface_mesh_parameterization/error.txt Surface_mesh_parameterization/test/Surface_mesh_parameterization/extensive_parameterization_test Surface_mesh_parameterization/test/Surface_mesh_parameterization/release +Surface_mesher/.*.deps Surface_mesher/demo/Surface_mesher/*.exe +Surface_mesher/demo/Surface_mesher/.*.deps Surface_mesher/demo/Surface_mesher/depends Surface_mesher/demo/Surface_mesher/implicit_surface_mesher Surface_mesher/demo/Surface_mesher/my_makefile @@ -321,6 +333,7 @@ Surface_mesher/doc_tex/*.ilg Surface_mesher/doc_tex/*.log Surface_mesher/doc_tex/*.pdflg Surface_mesher/doc_tex/*.tex +Surface_mesher/doc_tex/.*.deps Surface_mesher/doc_tex/Complex_2_in_triangulation_3/*.aux Surface_mesher/doc_tex/Complex_2_in_triangulation_3/*.bbl Surface_mesher/doc_tex/Complex_2_in_triangulation_3/*.blg @@ -359,6 +372,7 @@ Surface_mesher/doc_tex/Surface_mesher_ref/*.log Surface_mesher/doc_tex/Surface_mesher_ref/*.pdflg Surface_mesher/doxygen Surface_mesher/examples/Surface_mesher/*.exe +Surface_mesher/examples/Surface_mesher/.*.deps Surface_mesher/examples/Surface_mesher/3d_image_surface_mesher Surface_mesher/examples/Surface_mesher/ImageIO/libImageIO.* Surface_mesher/examples/Surface_mesher/ProgramOutput.3d_image_surface_mesher.* @@ -374,6 +388,7 @@ Surface_mesher/examples/Surface_mesher/surface_mesher Surface_mesher/examples/Surface_mesher/surfaces_union Surface_mesher/include/CGAL/Mesh_3 Surface_mesher/test/Surface_mesher/*.exe +Surface_mesher/test/Surface_mesher/.*.deps Surface_mesher/test/Surface_mesher/combined_spheres Surface_mesher/test/Surface_mesher/depends Surface_mesher/test/Surface_mesher/implicit_surface_mesher_test diff --git a/Mesh_2/demo/Mesh_2/GNUmakefile b/Mesh_2/demo/Mesh_2/GNUmakefile index 293af396b8f..f65e2574107 100644 --- a/Mesh_2/demo/Mesh_2/GNUmakefile +++ b/Mesh_2/demo/Mesh_2/GNUmakefile @@ -5,25 +5,8 @@ include makefile # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm depends; $(MAKE) depends - -.PHONY: dep - - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done - test -f depends diff --git a/Mesh_2/demo/Mesh_2/makefile.dependencies b/Mesh_2/demo/Mesh_2/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Mesh_2/demo/Mesh_2/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Mesh_2/dont_submit b/Mesh_2/dont_submit index 5015e50b2ec..a0d6d4f6c3c 100644 --- a/Mesh_2/dont_submit +++ b/Mesh_2/dont_submit @@ -9,3 +9,4 @@ utils implementation.tex *.kdev* depends +makefile.dependencies diff --git a/Mesh_2/examples/Mesh_2/GNUmakefile b/Mesh_2/examples/Mesh_2/GNUmakefile index 329a8e17e44..f65e2574107 100644 --- a/Mesh_2/examples/Mesh_2/GNUmakefile +++ b/Mesh_2/examples/Mesh_2/GNUmakefile @@ -5,30 +5,8 @@ include makefile # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm -f depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done - test -f depends - -run: all - ./conforming - ./mesh_class - ./mesh_global - ./mesh_with_seeds diff --git a/Mesh_2/examples/Mesh_2/makefile.dependencies b/Mesh_2/examples/Mesh_2/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Mesh_2/examples/Mesh_2/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Mesh_3/applications/GNUmakefile b/Mesh_3/applications/GNUmakefile index d44133c8f8a..f65e2574107 100644 --- a/Mesh_3/applications/GNUmakefile +++ b/Mesh_3/applications/GNUmakefile @@ -5,24 +5,8 @@ include makefile # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\..*/include/CGAL' >> depends; \ - done; \ - test -f depends diff --git a/Mesh_3/applications/makefile.dependencies b/Mesh_3/applications/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Mesh_3/applications/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Mesh_3/dont_submit b/Mesh_3/dont_submit index 5b1e22b6e90..4e0ab634c65 100644 --- a/Mesh_3/dont_submit +++ b/Mesh_3/dont_submit @@ -7,3 +7,4 @@ applications applications.README spheres_create_input.sh README +makefile.dependencies diff --git a/Mesh_3/examples/Mesh_3/GNUmakefile b/Mesh_3/examples/Mesh_3/GNUmakefile index f2b43c42ca7..f65e2574107 100644 --- a/Mesh_3/examples/Mesh_3/GNUmakefile +++ b/Mesh_3/examples/Mesh_3/GNUmakefile @@ -5,24 +5,8 @@ include makefile # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done; \ - test -f depends diff --git a/Mesh_3/examples/Mesh_3/makefile.dependencies b/Mesh_3/examples/Mesh_3/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Mesh_3/examples/Mesh_3/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Mesh_3/test/Mesh_3/GNUmakefile b/Mesh_3/test/Mesh_3/GNUmakefile index b1e1f1aafb5..a10511a10f7 100644 --- a/Mesh_3/test/Mesh_3/GNUmakefile +++ b/Mesh_3/test/Mesh_3/GNUmakefile @@ -95,24 +95,8 @@ clean: \ # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done; \ - test -f depends diff --git a/Mesh_3/test/Mesh_3/makefile.dependencies b/Mesh_3/test/Mesh_3/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Mesh_3/test/Mesh_3/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Surface_mesher/demo/Surface_mesher/GNUmakefile b/Surface_mesher/demo/Surface_mesher/GNUmakefile index 408f5319bf6..86e51fea67f 100644 --- a/Surface_mesher/demo/Surface_mesher/GNUmakefile +++ b/Surface_mesher/demo/Surface_mesher/GNUmakefile @@ -12,24 +12,8 @@ run-targets: $(TARGETS) # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm -f depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done; \ - test -f depends diff --git a/Surface_mesher/demo/Surface_mesher/makefile.dependencies b/Surface_mesher/demo/Surface_mesher/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Surface_mesher/demo/Surface_mesher/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Surface_mesher/dont_submit b/Surface_mesher/dont_submit index 4776964c198..fa6f9b5c69e 100644 --- a/Surface_mesher/dont_submit +++ b/Surface_mesher/dont_submit @@ -9,3 +9,4 @@ surfaces_union.C inputs NOTICE internal-test-surface-mesher.C +makefile.dependencies diff --git a/Surface_mesher/examples/Surface_mesher/GNUmakefile b/Surface_mesher/examples/Surface_mesher/GNUmakefile index 408f5319bf6..86e51fea67f 100644 --- a/Surface_mesher/examples/Surface_mesher/GNUmakefile +++ b/Surface_mesher/examples/Surface_mesher/GNUmakefile @@ -12,24 +12,8 @@ run-targets: $(TARGETS) # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm -f depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done; \ - test -f depends diff --git a/Surface_mesher/examples/Surface_mesher/makefile.dependencies b/Surface_mesher/examples/Surface_mesher/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Surface_mesher/examples/Surface_mesher/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES) diff --git a/Surface_mesher/test/Surface_mesher/GNUmakefile b/Surface_mesher/test/Surface_mesher/GNUmakefile index f3fd5d4e9b0..6c38b69b7b2 100644 --- a/Surface_mesher/test/Surface_mesher/GNUmakefile +++ b/Surface_mesher/test/Surface_mesher/GNUmakefile @@ -88,24 +88,8 @@ clean: \ # dependencies # # if you want deps, create a file my_makefile that contains -# -include depends +# -include makefile.dependencies # #---------------------------------------------------------------------# -include my_makefile - -dep: - rm depends; $(MAKE) depends - -.PHONY: dep - -depends: *.C - cat /dev/null > depends - for f in *.C; do \ - echo >> depends; \ - echo >> depends; \ - echo "$${f%.C}$(OBJ_EXT): \\" >> depends; \ - $(CGAL_CXX) $(CXXFLAGS) -M -MG $$f \ - | grep '\.\./\.\..*/include/CGAL' >> depends; \ - done; \ - test -f depends diff --git a/Surface_mesher/test/Surface_mesher/makefile.dependencies b/Surface_mesher/test/Surface_mesher/makefile.dependencies new file mode 100644 index 00000000000..3532ec714dd --- /dev/null +++ b/Surface_mesher/test/Surface_mesher/makefile.dependencies @@ -0,0 +1,13 @@ +deps: + rm -f .*.deps; $(MAKE) renew_deps + +.PHONY: renew_deps + +.%.deps: %.C + $(CGAL_CXX) $(CXXFLAGS) -M -MG $< | egrep -v '^ +/' > $@ + +DEPS_FILES = $(addprefix .,$(addsuffix .deps, $(basename $(wildcard *.C)))) + +renew_deps: $(DEPS_FILES) + +-include $(DEPS_FILES)