[Boost-commit] svn:boost r73070 - sandbox/e_float/libs/e_float/build

Subject: [Boost-commit] svn:boost r73070 - sandbox/e_float/libs/e_float/build
From: e_float_at_[hidden]
Date: 2011-07-13 17:02:01

Author: christopher_kormanyos
Date: 2011-07-13 17:02:00 EDT (Wed, 13 Jul 2011)
New Revision: 73070
URL: http://svn.boost.org/trac/boost/changeset/73070

Log:
- Restored proper name of Makefile.
Added:
   sandbox/e_float/libs/e_float/build/Makefile   (contents, props changed)
Removed:
   sandbox/e_float/libs/e_float/build/Makefile.gmk
Text files modified: 
   sandbox/e_float/libs/e_float/build/e_float.vcxproj         |    15 +--------------                         
   sandbox/e_float/libs/e_float/build/e_float.vcxproj.filters |     6 +++---                                  
   2 files changed, 4 insertions(+), 17 deletions(-)

Added: sandbox/e_float/libs/e_float/build/Makefile
==============================================================================
--- (empty file)
+++ sandbox/e_float/libs/e_float/build/Makefile	2011-07-13 17:02:00 EDT (Wed, 13 Jul 2011)
@@ -0,0 +1,192 @@
+
+#          Copyright Christopher Kormanyos 2002 - 2011.
+# Distributed under the Boost Software License, Version 1.0.
+#    (See accompanying file LICENSE_1_0.txt or copy at
+#          http://www.boost.org/LICENSE_1_0.txt)
+
+# This work is based on an earlier work:
+# "Algorithm 910: A Portable C++ Multiple-Precision System for Special-Function Calculations",
+# in ACM TOMS, {VOL 37, ISSUE 4, (February 2011)} © ACM, 2011. http://doi.acm.org/10.1145/1916461.1916469
+
+###############################################################
+#
+# Makefile for e_float
+#
+###############################################################
+
+
+# ------------------------------------------------------------------------------
+# filelist
+# ------------------------------------------------------------------------------
+include MakefileFiles.gmk
+
+ifeq ($(MP),)
+  TYPE_MP = efx
+endif
+
+ifeq ($(MP),efx)
+  TYPE_MP = efx
+endif
+
+ifeq ($(MP),gmp)
+  TYPE_MP = gmp
+endif
+
+ifeq ($(MP),mpfr)
+  TYPE_MP = mpfr
+endif
+
+# ------------------------------------------------------------------------------
+# symbols
+# ------------------------------------------------------------------------------
+PAR_OPEN  = \(
+PAR_CLOSE = \)
+
+
+# ------------------------------------------------------------------------------
+# targets
+# ------------------------------------------------------------------------------
+PATH_TARGET  = unix-$(TYPE_MP)
+PATH_OBJ     = $(PATH_TARGET)/obj
+PATH_ERR     = $(PATH_TARGET)/err
+TARGET       = e_float
+EXTENSION    = exe
+
+
+# ------------------------------------------------------------------------------
+# Tool parameters
+# ------------------------------------------------------------------------------
+CFLAGS_BASE = -std=c++0x -O3 -I../../../boost
+CFLAGS_WARN = -Wall -Wextra -pedantic -Weffc++
+LFLAGS_BASE =
+
+ifeq ($(TYPE_MP),efx)
+  CFLAGS_BASE := $(CFLAGS_BASE) -DE_FLOAT_TYPE_EFX
+  FILES_MP = ../src/e_float/efx/e_float_efx
+endif
+
+ifeq ($(TYPE_MP),gmp)
+  CFLAGS_BASE := $(CFLAGS_BASE) -DE_FLOAT_TYPE_GMP
+  LFLAGS_BASE := $(LFLAGS_BASE) -lgmp
+  FILES_MP = ../src/e_float/gmp/e_float_gmp
+endif
+
+ifeq ($(TYPE_MP),mpfr)
+  CFLAGS_BASE := $(CFLAGS_BASE) -DE_FLOAT_TYPE_MPFR
+  LFLAGS_BASE := $(LFLAGS_BASE) -lgmp -lmpfr
+  FILES_MP = ../src/e_float/mpfr/e_float_mpfr
+endif
+
+CFLAGS        = $(CFLAGS_BASE) $(CFLAGS_WARN)
+CFLAGS_NOWARN = $(CFLAGS_BASE)
+LFLAGS        = $(LFLAGS_BASE)
+
+
+# ------------------------------------------------------------------------------
+# object files
+# ------------------------------------------------------------------------------
+FILES_ALL = $(FILES_MP)        \
+            $(FILES_EF)        \
+            $(FILES_UTILITY)   \
+            $(FILES_FUNCTIONS) \
+            $(FILES_EXAMPLES)  \
+            $(FILES_TEST)      \
+            $(FILES_TEST_SPOT) \
+            $(FILES_TEST_REAL) \
+            $(FILES_TEST_IMAG)
+
+FILES_O = $(addprefix $(PATH_OBJ)/, $(notdir $(addsuffix .o, $(FILES_ALL))))
+
+
+# ------------------------------------------------------------------------------
+# VPATH definition: VPATH is required for make to find the source files.
+# ------------------------------------------------------------------------------
+VPATH    := $(sort $(dir $(FILES_ALL)))
+
+
+# ------------------------------------------------------------------------------
+# Development tools
+# ------------------------------------------------------------------------------
+GCC   = gcc
+CC    = g++
+SED   = sed
+ECHO  = echo
+MAKE  = make
+MKDIR = mkdir
+RM    = rm
+GAWK  = gawk
+
+
+# ------------------------------------------------------------------------------
+# Main-Dependencies (target: all)
+# ------------------------------------------------------------------------------
+.PHONY: all
+all: OutputDirs Version $(PATH_TARGET)/$(TARGET).$(EXTENSION)
+
+
+# ------------------------------------------------------------------------------
+# Main-Dependencies (target: rebuild)
+# ------------------------------------------------------------------------------
+.PHONY: rebuild
+rebuild: clean all
+
+
+# ------------------------------------------------------------------------------
+# Clean project (target: clean)
+# ------------------------------------------------------------------------------
+.PHONY: clean
+clean: Version
+	@$(ECHO) +++ cleaning all
+	@-$(RM) -f $(PATH_TARGET)/$(TARGET).$(EXTENSION) > NUL  2> NUL
+	@-$(RM) -f $(PATH_OBJ)/*.*                       > NUL  2> NUL
+	@-$(RM) -f $(PATH_ERR)/*.*                       > NUL  2> NUL
+
+
+# ------------------------------------------------------------------------------
+# create output directories
+# ------------------------------------------------------------------------------
+.PHONY: OutputDirs
+OutputDirs:
+  # Create the output directories
+	@-$(MKDIR) -p $(PATH_TARGET)
+	@-$(MKDIR) -p $(PATH_OBJ)
+	@-$(MKDIR) -p $(PATH_ERR)
+
+
+# ------------------------------------------------------------------------------
+# version information
+# ------------------------------------------------------------------------------
+.PHONY: Version
+Version:
+  # Print the GNU make version and the GCC version
+	@-$(MAKE) --version | $(GAWK) '{ if(match($$0, "Make") > 0) print("GNUmake version: " $$0) }'
+	@-$(GCC)  --version | $(GAWK) '{ if(match($$0, "gcc")  > 0) print("GCC version: " $$0) }'
+
+
+# ------------------------------------------------------------------------------
+# link/locate application
+# ------------------------------------------------------------------------------
+$(PATH_TARGET)/$(TARGET).$(EXTENSION) : $(FILES_O)
+	@$(ECHO) +++ linking application: link to $(PATH_TARGET)/$(TARGET).$(EXTENSION)
+	@$(CC) $(FILES_O) $(LFLAGS) -o $(PATH_TARGET)/$(TARGET).$(EXTENSION)
+
+
+# ------------------------------------------------------------------------------
+# include dependency files
+# ------------------------------------------------------------------------------
+ifneq ($(MAKECMDGOALS),rebuild)
+-include $(subst .o,.d, $(FILES_O))
+endif
+
+
+# ------------------------------------------------------------------------------
+# pattern rule for cpp-files
+# ------------------------------------------------------------------------------
+$(PATH_OBJ)/%.o : %.cpp
+  # Compile the source file...
+  # ...and Reformat (using sed) any possible error/warning messages for the Visual Studio build window
+  # ...and Generate a dependency file (using the g++ flag -MM), reformating it with sed
+	@-$(ECHO) +++ compiling: $<
+	@-$(CC) $(CFLAGS) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
+	@-$(SED) -e 's|.h:\([0-9]*\),|.h(\1) :|' -e 's|:\([0-9]*\):|(\1) :|' $(PATH_ERR)/$(basename $(@F)).err
+	@-$(CC) $(CFLAGS) -MM $< | $(SED) -e 's|\($(basename $(@F)).o\):|$(PATH_OBJ)/\1:|' > $(PATH_OBJ)/$(basename $(@F)).d

Deleted: sandbox/e_float/libs/e_float/build/Makefile.gmk
==============================================================================
--- sandbox/e_float/libs/e_float/build/Makefile.gmk	2011-07-13 17:02:00 EDT (Wed, 13 Jul 2011)
+++ (empty file)
@@ -1,192 +0,0 @@
-
-#          Copyright Christopher Kormanyos 2002 - 2011.
-# Distributed under the Boost Software License, Version 1.0.
-#    (See accompanying file LICENSE_1_0.txt or copy at
-#          http://www.boost.org/LICENSE_1_0.txt)
-
-# This work is based on an earlier work:
-# "Algorithm 910: A Portable C++ Multiple-Precision System for Special-Function Calculations",
-# in ACM TOMS, {VOL 37, ISSUE 4, (February 2011)} © ACM, 2011. http://doi.acm.org/10.1145/1916461.1916469
-
-###############################################################
-#
-# Makefile for e_float
-#
-###############################################################
-
-
-# ------------------------------------------------------------------------------
-# filelist
-# ------------------------------------------------------------------------------
-include MakefileFiles.gmk
-
-ifeq ($(MP),)
-  TYPE_MP = efx
-endif
-
-ifeq ($(MP),efx)
-  TYPE_MP = efx
-endif
-
-ifeq ($(MP),gmp)
-  TYPE_MP = gmp
-endif
-
-ifeq ($(MP),mpfr)
-  TYPE_MP = mpfr
-endif
-
-# ------------------------------------------------------------------------------
-# symbols
-# ------------------------------------------------------------------------------
-PAR_OPEN  = \(
-PAR_CLOSE = \)
-
-
-# ------------------------------------------------------------------------------
-# targets
-# ------------------------------------------------------------------------------
-PATH_TARGET  = unix-$(TYPE_MP)
-PATH_OBJ     = $(PATH_TARGET)/obj
-PATH_ERR     = $(PATH_TARGET)/err
-TARGET       = e_float
-EXTENSION    = exe
-
-
-# ------------------------------------------------------------------------------
-# Tool parameters
-# ------------------------------------------------------------------------------
-CFLAGS_BASE = -std=c++0x -O3 -I../../../boost
-CFLAGS_WARN = -Wall -Wextra -pedantic -Weffc++
-LFLAGS_BASE =
-
-ifeq ($(TYPE_MP),efx)
-  CFLAGS_BASE := $(CFLAGS_BASE) -DE_FLOAT_TYPE_EFX
-  FILES_MP = ../src/e_float/efx/e_float_efx
-endif
-
-ifeq ($(TYPE_MP),gmp)
-  CFLAGS_BASE := $(CFLAGS_BASE) -DE_FLOAT_TYPE_GMP
-  LFLAGS_BASE := $(LFLAGS_BASE) -lgmp
-  FILES_MP = ../src/e_float/gmp/e_float_gmp
-endif
-
-ifeq ($(TYPE_MP),mpfr)
-  CFLAGS_BASE := $(CFLAGS_BASE) -DE_FLOAT_TYPE_MPFR
-  LFLAGS_BASE := $(LFLAGS_BASE) -lgmp -lmpfr
-  FILES_MP = ../src/e_float/mpfr/e_float_mpfr
-endif
-
-CFLAGS        = $(CFLAGS_BASE) $(CFLAGS_WARN)
-CFLAGS_NOWARN = $(CFLAGS_BASE)
-LFLAGS        = $(LFLAGS_BASE)
-
-
-# ------------------------------------------------------------------------------
-# object files
-# ------------------------------------------------------------------------------
-FILES_ALL = $(FILES_MP)        \
-            $(FILES_EF)        \
-            $(FILES_UTILITY)   \
-            $(FILES_FUNCTIONS) \
-            $(FILES_EXAMPLES)  \
-            $(FILES_TEST)      \
-            $(FILES_TEST_SPOT) \
-            $(FILES_TEST_REAL) \
-            $(FILES_TEST_IMAG)
-
-FILES_O = $(addprefix $(PATH_OBJ)/, $(notdir $(addsuffix .o, $(FILES_ALL))))
-
-
-# ------------------------------------------------------------------------------
-# VPATH definition: VPATH is required for make to find the source files.
-# ------------------------------------------------------------------------------
-VPATH    := $(sort $(dir $(FILES_ALL)))
-
-
-# ------------------------------------------------------------------------------
-# Development tools
-# ------------------------------------------------------------------------------
-GCC   = gcc
-CC    = g++
-SED   = sed
-ECHO  = echo
-MAKE  = make
-MKDIR = mkdir
-RM    = rm
-GAWK  = gawk
-
-
-# ------------------------------------------------------------------------------
-# Main-Dependencies (target: all)
-# ------------------------------------------------------------------------------
-.PHONY: all
-all: OutputDirs Version $(PATH_TARGET)/$(TARGET).$(EXTENSION)
-
-
-# ------------------------------------------------------------------------------
-# Main-Dependencies (target: rebuild)
-# ------------------------------------------------------------------------------
-.PHONY: rebuild
-rebuild: clean all
-
-
-# ------------------------------------------------------------------------------
-# Clean project (target: clean)
-# ------------------------------------------------------------------------------
-.PHONY: clean
-clean: Version
-	@$(ECHO) +++ cleaning all
-	@-$(RM) -f $(PATH_TARGET)/$(TARGET).$(EXTENSION) > NUL  2> NUL
-	@-$(RM) -f $(PATH_OBJ)/*.*                       > NUL  2> NUL
-	@-$(RM) -f $(PATH_ERR)/*.*                       > NUL  2> NUL
-
-
-# ------------------------------------------------------------------------------
-# create output directories
-# ------------------------------------------------------------------------------
-.PHONY: OutputDirs
-OutputDirs:
-  # Create the output directories
-	@-$(MKDIR) -p $(PATH_TARGET)
-	@-$(MKDIR) -p $(PATH_OBJ)
-	@-$(MKDIR) -p $(PATH_ERR)
-
-
-# ------------------------------------------------------------------------------
-# version information
-# ------------------------------------------------------------------------------
-.PHONY: Version
-Version:
-  # Print the GNU make version and the GCC version
-	@-$(MAKE) --version | $(GAWK) '{ if(match($$0, "Make") > 0) print("GNUmake version: " $$0) }'
-	@-$(GCC)  --version | $(GAWK) '{ if(match($$0, "gcc")  > 0) print("GCC version: " $$0) }'
-
-
-# ------------------------------------------------------------------------------
-# link/locate application
-# ------------------------------------------------------------------------------
-$(PATH_TARGET)/$(TARGET).$(EXTENSION) : $(FILES_O)
-	@$(ECHO) +++ linking application: link to $(PATH_TARGET)/$(TARGET).$(EXTENSION)
-	@$(CC) $(FILES_O) $(LFLAGS) -o $(PATH_TARGET)/$(TARGET).$(EXTENSION)
-
-
-# ------------------------------------------------------------------------------
-# include dependency files
-# ------------------------------------------------------------------------------
-ifneq ($(MAKECMDGOALS),rebuild)
--include $(subst .o,.d, $(FILES_O))
-endif
-
-
-# ------------------------------------------------------------------------------
-# pattern rule for cpp-files
-# ------------------------------------------------------------------------------
-$(PATH_OBJ)/%.o : %.cpp
-  # Compile the source file...
-  # ...and Reformat (using sed) any possible error/warning messages for the Visual Studio build window
-  # ...and Generate a dependency file (using the g++ flag -MM), reformating it with sed
-	@-$(ECHO) +++ compiling: $<
-	@-$(CC) $(CFLAGS) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
-	@-$(SED) -e 's|.h:\([0-9]*\),|.h(\1) :|' -e 's|:\([0-9]*\):|(\1) :|' $(PATH_ERR)/$(basename $(@F)).err
-	@-$(CC) $(CFLAGS) -MM $< | $(SED) -e 's|\($(basename $(@F)).o\):|$(PATH_OBJ)/\1:|' > $(PATH_OBJ)/$(basename $(@F)).d

Modified: sandbox/e_float/libs/e_float/build/e_float.vcxproj
==============================================================================
--- sandbox/e_float/libs/e_float/build/e_float.vcxproj	(original)
+++ sandbox/e_float/libs/e_float/build/e_float.vcxproj	2011-07-13 17:02:00 EDT (Wed, 13 Jul 2011)
@@ -1312,20 +1312,7 @@
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-gmp|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-mpfr|x64'">true</ExcludedFromBuild>
     </None>
-    <None Include="ReadMe_VisualCLibraries.txt">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug-efx|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug-gmp|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug-mpfr|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-efx|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-gmp|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-mpfr|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug-efx|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug-gmp|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug-mpfr|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-efx|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-gmp|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release-mpfr|x64'">true</ExcludedFromBuild>
-    </None>
+    <None Include="vc_libraries.txt" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Modified: sandbox/e_float/libs/e_float/build/e_float.vcxproj.filters
==============================================================================
--- sandbox/e_float/libs/e_float/build/e_float.vcxproj.filters	(original)
+++ sandbox/e_float/libs/e_float/build/e_float.vcxproj.filters	2011-07-13 17:02:00 EDT (Wed, 13 Jul 2011)
@@ -541,9 +541,6 @@
     <None Include="MakefileFiles.gmk">
       <Filter>libs\e_float\build</Filter>
     </None>
-    <None Include="ReadMe_VisualCLibraries.txt">
-      <Filter>libs\e_float\build</Filter>
-    </None>
     <None Include="..\license\ACM_e_float_boost_license.pdf">
       <Filter>libs\e_float\licence</Filter>
     </None>
@@ -562,5 +559,8 @@
     <None Include="..\..\..\doc\e_float_poster_courier.pdf">
       <Filter>doc</Filter>
     </None>
+    <None Include="vc_libraries.txt">
+      <Filter>libs\e_float\build</Filter>
+    </None>
   </ItemGroup>
 </Project>
\ No newline at end of file