Make configure/make/make install work with spaces.

.gitignore

@@ -33,6 +33,10 @@ config.mk
 bli_config.h
 bli_addon.h
 blis.pc
+.dist_path
+.install_libdir
+.install_incdir
+.install_sharedir
 
 # -- monolithic headers --
 

Makefile

@@ -58,6 +58,7 @@
         check checkblas \
         checkblis checkblis-fast checkblis-md checkblis-salt \
         install-headers install-helper-headers install-libs install-lib-symlinks \
+        make-symlinks make-install-symlinks \
         showconfig \
         clean cleanmk cleanh cleanlib distclean \
         cleantest cleanblastest cleanblistest \
@@ -524,7 +525,7 @@ clean: cleanh cleanlib
 
 # --- Environment check rules ---
 
-check-env: check-env-make-defs check-env-fragments check-env-mk
+check-env: check-env-make-defs check-env-fragments check-env-mk make-symlinks
 
 check-env-mk:
 ifeq ($(CONFIG_MK_PRESENT),no)
@@ -541,6 +542,23 @@ ifeq ($(ALL_MAKE_DEFS_MK_PRESENT),no)
 	$(error Cannot proceed: Some make_defs.mk files not found or mislabeled!)
 endif
 
+make-symlinks:
+#	@rm -f .dist_path
+#	@ln -s "$(DIST_PATH_REAL)" .dist_path
+
+make-install-symlinks:
+#	@rm -f .install_libdir
+#	@rm -f .install_incdir
+#	@rm -f .install_shredir
+#	@ln -s "$(INSTALL_LIBDIR_REAL)" .install_libdir
+#	@ln -s "$(INSTALL_INCDIR_REAL)" .install_incdir
+#	@ln -s "$(INSTALL_SHAREDIR_REAL)" .install_sharedir
+	@mkdir -p "$(INSTALL_LIBDIR_REAL)"
+	@mkdir -p "$(INSTALL_INCDIR_REAL)"
+	@mkdir -p "$(INSTALL_SHAREDIR_REAL)"
+
+$(CONFIG_MK_FILE) $(ALL_H99_FILES): check-env
+
 
 # --- Shared/dynamic libblis symbol file creation/refresh ---
 
@@ -1085,37 +1103,35 @@ endif
 install-headers: check-env $(HEADERS_INSTALLED) install-helper-headers
 
 # Rule for installing main headers.
-$(MK_INCL_DIR_INST)/%.h: $(BASE_INC_PATH)/%.h $(CONFIG_MK_FILE)
+$(MK_INCL_DIR_INST)/%.h: $(BASE_INC_PATH)/%.h $(CONFIG_MK_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(dir $(@))
 	$(INSTALL) -m 0644 $(<) $(dir $(@))
 else
 	@$(MKDIR) $(dir $(@))
-	@echo "Installing $(notdir $(<)) into $(dir $(@))/"
+	@echo "Installing $(notdir $(<)) into $(subst .install_incdir,$(INSTALL_INCDIR_REAL),$(dir $(@)))"
 	@$(INSTALL) -m 0644 $(<) $(dir $(@))
 endif
 
-$(MK_INCL_DIR_INST)/%.hh: $(VEND_CPP_PATH)/%.hh $(CONFIG_MK_FILE)
+$(MK_INCL_DIR_INST)/%.hh: $(VEND_CPP_PATH)/%.hh $(CONFIG_MK_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(dir $(@))
 	$(INSTALL) -m 0644 $(<) $(dir $(@))
 else
 	@$(MKDIR) $(dir $(@))
-	@echo "Installing $(notdir $(<)) into $(dir $(@))/"
+	@echo "Installing $(notdir $(<)) into $(subst .install_incdir,$(INSTALL_INCDIR_REAL),$(dir $(@)))"
 	@$(INSTALL) -m 0644 $(<) $(dir $(@))
 endif
 
 install-helper-headers: check-env $(HELP_HEADERS_INSTALLED)
 
 # A rule to install a helper header file.
 define make-helper-header-rule
-$(INSTALL_INCDIR)/$(notdir $(1)): $(BUILD_PATH)/$(notdir $(1)) $(CONFIG_MK_FILE)
+$(INSTALL_INCDIR)/$(notdir $(1)): $(BUILD_PATH)/$(notdir $(1)) $(CONFIG_MK_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
-	$(MKDIR) $(INSTALL_INCDIR)
 	$(INSTALL) -m 0644 $$(<) $$(@)
 else
-	@$(MKDIR) $(INSTALL_INCDIR)
-	@echo "Installing $$(@F) helper header into $(INSTALL_INCDIR)/"
+	@echo "Installing $$(@F) helper header into $(INSTALL_INCDIR_REAL)/"
 	@$(INSTALL) -m 0644 $$(<) $$(@)
 endif
 endef
@@ -1127,7 +1143,7 @@ $(foreach h, $(HELP_HEADERS_TO_INSTALL), $(eval $(call make-helper-header-rule,$
 
 install-share: check-env $(MK_SHARE_DIR_INST) $(PC_SHARE_DIR_INST)
 
-$(MK_SHARE_DIR_INST): $(CONFIGURE_FILE) $(FRAGS_TO_INSTALL) $(PLUGIN_FRAGS_TO_INSTALL) $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE)
+$(MK_SHARE_DIR_INST): $(CONFIGURE_FILE) $(FRAGS_TO_INSTALL) $(PLUGIN_FRAGS_TO_INSTALL) $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(@)
 	$(MKDIR) $(@)/plugin
@@ -1148,29 +1164,29 @@ ifeq ($(ENABLE_VERBOSE),yes)
 else
 	@$(MKDIR) $(@)
 	@$(MKDIR) $(@)/plugin
-	@echo "Installing $(notdir $(FRAGS_TO_INSTALL)) into $(@)/"
+	@echo "Installing $(notdir $(FRAGS_TO_INSTALL)) into $(INSTALL_SHAREDIR_REAL)/"
 	@$(INSTALL) -m 0755 $(filter %.sh,$(FRAGS_TO_INSTALL)) $(@)
 	@$(INSTALL) -m 0644 $(filter-out %.sh,$(FRAGS_TO_INSTALL)) $(@)
-	@echo "Installing $(notdir $(PLUGIN_FRAGS_TO_INSTALL)) into $(@)/plugin/"
+	@echo "Installing $(notdir $(PLUGIN_FRAGS_TO_INSTALL)) into $(INSTALL_SHAREDIR_REAL)/plugin/"
 	@$(INSTALL) -m 0644 $(PLUGIN_FRAGS_TO_INSTALL) $(@)/plugin
-	@echo "Installing $(CONFIGURE_FILE) into $(@)/configure-plugin"
+	@echo "Installing $(CONFIGURE_FILE) into $(INSTALL_SHAREDIR_REAL)/configure-plugin"
 	@$(INSTALL) -m 0755 $(CONFIGURE_FILE) $(@)/configure-plugin
 #	@$(MKDIR) -p $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)#\
 #	@echo "Installing $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE) into $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)"
 #	@$(INSTALL) -m 0644 $(CONFIG_DIR)/$(CONFIG_NAME)/$(MAKE_DEFS_FILE) \
 #	               $(@)/$(CONFIG_DIR)/$(CONFIG_NAME)/
 	@for THIS_CONFIG in $(FULL_CONFIG_LIST); do \
 		$(MKDIR) -p $(@)/$(CONFIG_DIR)/$$THIS_CONFIG; \
-		echo "Installing $(CONFIG_DIR)/$$THIS_CONFIG/$(MAKE_DEFS_FILE) into $(@)/$(CONFIG_DIR)/$$THIS_CONFIG"; \
+		echo "Installing $(CONFIG_DIR)/$$THIS_CONFIG/$(MAKE_DEFS_FILE) into $(INSTALL_SHAREDIR_REAL)/$(CONFIG_DIR)/$$THIS_CONFIG"; \
 		$(INSTALL) -m 0644 $(CONFIG_DIR)/$$THIS_CONFIG/$(MAKE_DEFS_FILE) \
 		              $(@)/$(CONFIG_DIR)/$$THIS_CONFIG; \
-		echo "Installing $(CONFIG_DIR)/$$THIS_CONFIG/bli_kernel_defs_$$THIS_CONFIG.h into $(@)/$(CONFIG_DIR)/$$THIS_CONFIG"; \
+		echo "Installing $(CONFIG_DIR)/$$THIS_CONFIG/bli_kernel_defs_$$THIS_CONFIG.h into $(INSTALL_SHAREDIR_REAL)/$(CONFIG_DIR)/$$THIS_CONFIG"; \
 		$(INSTALL) -m 0644 $(CONFIG_DIR)/$$THIS_CONFIG/bli_kernel_defs_$$THIS_CONFIG.h \
 		              $(@)/$(CONFIG_DIR)/$$THIS_CONFIG; \
 	done
 endif
 
-$(PC_SHARE_DIR_INST): $(PC_IN_FILE)
+$(PC_SHARE_DIR_INST): $(PC_IN_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
 	$(MKDIR) $(@)
 	$(shell cat "$(PC_IN_FILE)" \
@@ -1184,7 +1200,7 @@ ifeq ($(ENABLE_VERBOSE),yes)
 	$(INSTALL) -m 0644 $(PC_OUT_FILE) $(@)
 else
 	@$(MKDIR) $(@)
-	@echo "Installing $(PC_OUT_FILE) into $(@)/"
+	@echo "Installing $(PC_OUT_FILE) into $(subst .install_sharedir,$(INSTALL_SHAREDIR_REAL),$(@))"
 	@$(shell cat "$(PC_IN_FILE)" \
 	| sed -e "s#@PACKAGE_VERSION@#$(VERSION)#g" \
 	| sed -e "s#@prefix@#$(prefix)#g" \
@@ -1201,13 +1217,11 @@ endif
 install-libs: check-env $(MK_LIBS_INST)
 
 # Install static library.
-$(INSTALL_LIBDIR)/%.a: $(BASE_LIB_PATH)/%.a $(CONFIG_MK_FILE)
+$(INSTALL_LIBDIR)/%.a: $(BASE_LIB_PATH)/%.a $(CONFIG_MK_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
-	$(MKDIR) $(@D)
 	$(INSTALL) -m 0644 $< $@
 else
-	@echo "Installing $(@F) into $(INSTALL_LIBDIR)/"
-	@$(MKDIR) $(@D)
+	@echo "Installing $(@F) into $(INSTALL_LIBDIR_REAL)/"
 	@$(INSTALL) -m 0644 $< $@
 endif
 
@@ -1217,36 +1231,30 @@ endif
 ifeq ($(IS_WIN),no)
 
 # Linux/OSX library (.so OR .dylib) installation rules.
-$(INSTALL_LIBDIR)/%.$(LIBBLIS_SO_MMB_EXT): $(BASE_LIB_PATH)/%.$(SHLIB_EXT) $(CONFIG_MK_FILE)
+$(INSTALL_LIBDIR)/%.$(LIBBLIS_SO_MMB_EXT): $(BASE_LIB_PATH)/%.$(SHLIB_EXT) $(CONFIG_MK_FILE) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
-	$(MKDIR) $(@D)
 	$(INSTALL) -m 0755 $< $@
 else
-	@echo "Installing $(@F) into $(INSTALL_LIBDIR)/"
-	@$(MKDIR) $(@D)
+	@echo "Installing $(@F) into $(INSTALL_LIBDIR_REAL)/"
 	@$(INSTALL) -m 0755 $< $@
 endif
 
 else # ifeq ($(IS_WIN),yes)
 
 # Windows library (.dll and .lib) installation rules.
-$(INSTALL_LIBDIR)/%.$(SHLIB_EXT): $(BASE_LIB_PATH)/%.$(SHLIB_EXT)
+$(INSTALL_LIBDIR)/%.$(SHLIB_EXT): $(BASE_LIB_PATH)/%.$(SHLIB_EXT) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
-	@$(MKDIR) $(@D)
 	@$(INSTALL) -m 0644 $(BASE_LIB_PATH)/$(@F) $@
 else
-	@echo "Installing $(@F) into $(INSTALL_LIBDIR)/"
-	@$(MKDIR) $(@D)
+	@echo "Installing $(@F) into $(INSTALL_LIBDIR_REAL)/"
 	@$(INSTALL) -m 0644 $(BASE_LIB_PATH)/$(@F) $@
 endif
 
-$(INSTALL_LIBDIR)/%.$(LIBBLIS_SO_MAJ_EXT): $(BASE_LIB_PATH)/%.$(LIBBLIS_SO_MAJ_EXT)
+$(INSTALL_LIBDIR)/%.$(LIBBLIS_SO_MAJ_EXT): $(BASE_LIB_PATH)/%.$(LIBBLIS_SO_MAJ_EXT) make-install-symlinks
 ifeq ($(ENABLE_VERBOSE),yes)
-	@$(MKDIR) $(@D)
 	@$(INSTALL) -m 0644 $(BASE_LIB_PATH)/$(@F) $@
 else
-	@echo "Installing $(@F) into $(INSTALL_LIBDIR)/"
-	@$(MKDIR) $(@D)
+	@echo "Installing $(@F) into $(INSTALL_LIBDIR_REAL)/"
 	@$(INSTALL) -m 0644 $(BASE_LIB_PATH)/$(@F) $@
 endif
 
@@ -1265,7 +1273,7 @@ ifeq ($(ENABLE_VERBOSE),yes)
 	$(SYMLINK) $(<F) $(@F)
 	$(MV) $(@F) $(INSTALL_LIBDIR)/
 else
-	@echo "Installing symlink $(@F) into $(INSTALL_LIBDIR)/"
+	@echo "Installing symlink $(@F) into $(INSTALL_LIBDIR_REAL)/"
 	@$(SYMLINK) $(<F) $(@F)
 	@$(MV) $(@F) $(INSTALL_LIBDIR)/
 endif
@@ -1276,7 +1284,7 @@ ifeq ($(ENABLE_VERBOSE),yes)
 	$(SYMLINK) $(<F) $(@F)
 	$(MV) $(@F) $(INSTALL_LIBDIR)/
 else
-	@echo "Installing symlink $(@F) into $(INSTALL_LIBDIR)/"
+	@echo "Installing symlink $(@F) into $(INSTALL_LIBDIR_REAL)/"
 	@$(SYMLINK) $(<F) $(@F)
 	@$(MV) $(@F) $(INSTALL_LIBDIR)/
 endif
@@ -1312,6 +1320,7 @@ showconfig: check-env
 cleanmk:
 ifeq ($(IS_CONFIGURED),yes)
 ifeq ($(ENABLE_VERBOSE),yes)
+	- $(RM_F) .dist_path .install_libdir .install_incdir .install_sharedir
 	- $(FIND) $(CONFIG_FRAG_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
 	- $(FIND) $(FRAME_FRAG_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
 	- $(FIND) $(REFKERN_FRAG_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
@@ -1323,6 +1332,8 @@ ifneq ($(SANDBOX),)
 	- $(FIND) $(SANDBOX_FRAG_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
 endif
 else
+	@echo "Removing helper symlinks"
+	@- $(RM_F) .dist_path .install_libdir .install_incdir .install_sharedir
 	@echo "Removing makefile fragments from $(CONFIG_FRAG_PATH)"
 	@- $(FIND) $(CONFIG_FRAG_PATH) -name "$(FRAGMENT_MK)" | $(XARGS) $(RM_F)
 	@echo "Removing makefile fragments from $(FRAME_FRAG_PATH)"

blastest/src/fortran/run-f2c.sh

@@ -1,15 +1,15 @@
 #!/bin/bash
 
 # This script converts netlib [sdcz]blat[123].f files from Fortran to C.
-# 
+#
 
-# Start by converting to C with f2c. 
+# Start by converting to C with f2c.
 # Options used:
 #  -A  Produce ANSI C (instead of old-style C).
 #  -R  Do  not promote REAL functions and operations to DOUBLE PRECISION.
 #  -a  Make local variables automatic rather than static (unless they
 #      appear in a DATA, EQUIVALENCE, NAMELIST, or SAVE statement).
-f2c -A -R -a *.f
+f2c -A -R -a ./*.f
 
 # Add 'const' qualifier to certain function delcarations so they match
 # the prototypes taken from libf2c.
@@ -27,7 +27,7 @@ recursive-sed.sh -c "s/VOID/void/g" -p "*.c"
 # Add prefix to calls to epsilon_() based on the file in which the
 # function is called. [sd]_epsilon_() are not libf2c functions, but
 # they are present in the local subset of libf2c used to link the
-# BLAS testsuite drivers. 
+# BLAS testsuite drivers.
 recursive-sed.sh -c "s/epsilon_/s_epsilon_/g" -p "[sc]*.c"
 recursive-sed.sh -c "s/epsilon_/d_epsilon_/g" -p "[dz]*.c"
 
@@ -61,4 +61,3 @@ recursive-sed.sh -c "s/ void zdotc_(doublecomplex \*,/${subst1}doublecomplex zdo
 recursive-sed.sh -c "s/ void zdotu_(doublecomplex \*,/${subst1}doublecomplex zdotu_(${subst2}/g" -p "z*1.c"
 recursive-sed.sh -c "s/\(.*\)zdotc_(\&z__1,/${subst1}\1z__1 = zdotc_(${subst2}\1/g" -p "z*1.c"
 recursive-sed.sh -c "s/\(.*\)zdotu_(\&z__1,/${subst1}\1z__1 = zdotu_(${subst2}\1/g" -p "z*1.c"
-

build/bump-version.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#  BLIS    
+#  BLIS
 #  An object-based framework for developing high-performance BLAS-like
 #  libraries.
 #
@@ -42,13 +42,13 @@
 print_usage()
 {
 	#local script_name
-	
+
 	# Get the script name
 	#script_name=${0##*/}
-	
+
 	# Echo usage info
 	echo " "
-	echo " "$script_name
+	echo " $script_name"
 	echo " "
 	echo " Field G. Van Zee"
 	echo " "
@@ -79,7 +79,7 @@ print_usage()
 	echo "   -f VERSFILE  version file name"
 	echo "                  Update VERSFILE with new version string instead of default"
 	echo "                  'version' file."
-	
+
 	# Exit with non-zero exit status
 	exit 1
 }
@@ -113,9 +113,9 @@ main()
 
 	# The git directory.
 	gitdir='.git'
-	
+
 	# Whether we are performing a dry run or not.
-	dry_run_flag=""	
+	dry_run_flag=""
 
 	# -- END GLOBAL VARIABLE DECLARATIONS --
 
@@ -165,20 +165,20 @@ main()
 
 		echo "${script_name}: updating version file '${version_file}'."
 		if [ -z "$dry_run_flag" ]; then
-			echo "${new_version_str}" > ${version_file}
+			echo "${new_version_str}" > "${version_file}"
 		fi
 
 		echo "${script_name}: executing: git commit -m \"Version file update (${new_version_str})\" ${version_file}."
 		if [ -z "$dry_run_flag" ]; then
-			git commit -m "Version file update (${new_version_str})" ${version_file}
+			git commit -m "Version file update (${new_version_str})" "${version_file}"
 		fi
 
 		git_commit_str=$(git describe --always)
 		echo "${script_name}: commit to be tagged: ${git_commit_str}."
 
 		echo "${script_name}: executing: git tag ${new_version_str} ${git_commit_str}."
 		if [ -z "$dry_run_flag" ]; then
-			git tag ${new_version_str} ${git_commit_str}
+			git tag "${new_version_str}" "${git_commit_str}"
 		fi
 
 		echo "${script_name}: updating ${changelog_file}."