From a9ff8f04a72e32ce7f160b2e4af1ec4a7bcd1978 Mon Sep 17 00:00:00 2001 From: Daniel Russel Date: Wed, 8 Feb 2006 04:41:00 +0000 Subject: [PATCH] updated makefiles wrt program options --- .../demo/Kinetic_data_structures/makefile | 10 +++++----- .../demo/Kinetic_data_structures/makefile.soqt | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile b/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile index 8b1616870c1..6301fb178f4 100644 --- a/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile +++ b/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile @@ -28,11 +28,11 @@ CXXFLAGS = -g \ LIBPATH = \ $(CGAL_LIBPATH) -LDFLAGS = -lboost_program_options \ +LDFLAGS = \ $(LONG_NAME_PROBLEM_LDFLAGS) \ $(CGAL_LDFLAGS) -QT_LDFLAGS = -lboost_program_options \ +QT_LDFLAGS = \ $(LONG_NAME_PROBLEM_LDFLAGS) \ $(CGAL_QT_LDFLAGS) @@ -49,16 +49,16 @@ all: \ regular_triangulation_3$(EXE_EXT) Delaunay_triangulation_2$(EXE_EXT): Delaunay_triangulation_2$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_2 Delaunay_triangulation_2$(OBJ_EXT) $(QT_LDFLAGS) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_2 Delaunay_triangulation_2$(OBJ_EXT) $(QT_LDFLAGS) $(LIB_OPT)boost_program_options Delaunay_triangulation_3$(EXE_EXT): Delaunay_triangulation_3$(OBJ_EXT) $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_3 Delaunay_triangulation_3$(OBJ_EXT) $(LDFLAGS) Delaunay_triangulation_stable_subset_2$(EXE_EXT): Delaunay_triangulation_stable_subset_2$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_stable_subset_2 Delaunay_triangulation_stable_subset_2$(OBJ_EXT) $(QT_LDFLAGS) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_stable_subset_2 Delaunay_triangulation_stable_subset_2$(OBJ_EXT) $(QT_LDFLAGS) $(LIB_OPT)boost_program_options regular_triangulation_3$(EXE_EXT): regular_triangulation_3$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)regular_triangulation_3 regular_triangulation_3$(OBJ_EXT) $(LDFLAGS) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)regular_triangulation_3 regular_triangulation_3$(OBJ_EXT) $(LDFLAGS) 2d_gui$(EXE_EXT): 2d_gui$(OBJ_EXT) $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)2d_gui 2d_gui$(OBJ_EXT) $(QT_LDFLAGS) diff --git a/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile.soqt b/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile.soqt index f6e3b097027..f31592c5aa3 100644 --- a/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile.soqt +++ b/Packages/Kinetic_data_structures/demo/Kinetic_data_structures/makefile.soqt @@ -36,7 +36,7 @@ LIBPATH = \ LDFLAGS = \ $(LONG_NAME_PROBLEM_LDFLAGS) \ - $(CGAL_QT_LDFLAGS) -lboost_program_options + $(CGAL_QT_LDFLAGS) #---------------------------------------------------------------------# # target entries @@ -57,13 +57,13 @@ all: \ $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)3d_gui 3d_gui$(OBJ_EXT) $(3D_LDFLAGS) $(LDFLAGS) Delaunay_triangulation_2$(EXE_EXT): Delaunay_triangulation_2$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_2 Delaunay_triangulation_2$(OBJ_EXT) $(LDFLAGS) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_2 Delaunay_triangulation_2$(OBJ_EXT) $(LDFLAGS) $(LIB_OPT)boost_program_options Delaunay_triangulation_3$(EXE_EXT): Delaunay_triangulation_3$(OBJ_EXT) $(3D_DEPS) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_3 Delaunay_triangulation_3$(OBJ_EXT) $(3D_LDFLAGS) $(LDFLAGS) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_3 Delaunay_triangulation_3$(OBJ_EXT) $(3D_LDFLAGS) $(LDFLAGS) Delaunay_triangulation_stable_subset_2$(EXE_EXT): Delaunay_triangulation_stable_subset_2$(OBJ_EXT) - $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_stable_subset_2 Delaunay_triangulation_stable_subset_2$(OBJ_EXT) $(LDFLAGS) + $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)Delaunay_triangulation_stable_subset_2 Delaunay_triangulation_stable_subset_2$(OBJ_EXT) $(LDFLAGS) $(LIB_OPT)boost_program_options regular_triangulation_3$(EXE_EXT): regular_triangulation_3$(OBJ_EXT) $(3D_DEPS) $(CGAL_CXX) $(LIBPATH) $(EXE_OPT)regular_triangulation_3 regular_triangulation_3$(OBJ_EXT) $(3D_LDFLAGS) $(LDFLAGS)