From de6e7b227fb8f40e5fce48d3576ce7e123f130df Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Fri, 23 Feb 2007 00:17:01 +0000 Subject: [PATCH] - remove $(CUSTOM_LDFLAGS) from src/Core/makefile - -add $(CGAL_LIBPATHFLAGS) to src/CGALQt/makefile --- Core/src/Core/makefile | 5 +++-- Qt_widget/src/CGALQt/makefile | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Core/src/Core/makefile b/Core/src/Core/makefile index 51196b22b99..b1347d75c79 100644 --- a/Core/src/Core/makefile +++ b/Core/src/Core/makefile @@ -41,8 +41,9 @@ SOMAJOR=2 LIB_NAME_BASE = core++ ADDITIONAL_CXXFLAGS = $(ALL_GMP_CXXFLAGS) $(ALL_MPFR_CXXFLAGS) -SHARED_LIB_ADDITIONAL_LDFLAGS = $(GMP_LIBPATHFLAGS) $(GMP_LDFLAGS) \ - $(MPFR_LIBPATHFLAGS) $(MPFR_LDFLAGS) $(CUSTOM_LDFLAGS) +SHARED_LIB_ADDITIONAL_LDFLAGS = \ + $(GMP_LIBPATHFLAGS) $(GMP_LDFLAGS) \ + $(MPFR_LIBPATHFLAGS) $(MPFR_LDFLAGS) # The shared_lib case is still buggy: # - When GMP or MPFR is a static library on Darwin, it fails because -fno-common is required... diff --git a/Qt_widget/src/CGALQt/makefile b/Qt_widget/src/CGALQt/makefile index 3a5cee23fe6..9aca8eeabf4 100644 --- a/Qt_widget/src/CGALQt/makefile +++ b/Qt_widget/src/CGALQt/makefile @@ -58,7 +58,7 @@ SHARED_LIB_ADDITIONAL_LDFLAGS = \ $(QT_LIBPATHFLAGS) $(QT_LDFLAGS) \ $(OPENGL_LIBPATHFLAGS) $(OPENGL_LDFLAGS) \ $(X11_LIBPATHFLAGS) $(X11_LDFLAFS) \ - $(CGAL_CGAL_LDFLAGS) + $(CGAL_LIBPATHFLAGS) $(CGAL_CGAL_LDFLAGS) #---------------------------------------------------------------------# # common rules for all libraries