Skip to content

Commit

Permalink
Minor build system housekeeping.
Browse files Browse the repository at this point in the history
Details:
- Commented out redundant setting of LIBBLIS_LINK within all driver-
  level Makefiles. This variable is already set within common.mk, and
  so the only time it should be overridden is if the user wants to link
  to a different copy of libblis.
- Very minor changes to build/gen-make-frags/gen-make-frag.sh.
- Whitespace and inconsequential quoting change to configure.
- Moved top-level 'windows' directory into a new 'attic' directory.
  • Loading branch information
fgvanzee committed May 23, 2019
1 parent 32392cf commit 057f5f3
Show file tree
Hide file tree
Showing 32 changed files with 17 additions and 157 deletions.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion blastest/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ CFLAGS += -Wno-maybe-uninitialized -Wno-parentheses -Wfatal-errors \
-I$(INC_PATH) -DHAVE_BLIS_H

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)

# Override the location of the check-blastest.sh script.
#BLASTEST_CHECK := ./check-blastest.sh
Expand Down
3 changes: 2 additions & 1 deletion build/gen-make-frags/gen-make-frag.sh
Original file line number Diff line number Diff line change
Expand Up @@ -417,8 +417,9 @@ main()

# The arguments to this function. They'll get assigned meaningful
# values after getopts.
mkfile_frag_tmpl_path=""
root_dir=""
frag_dir=""
mkfile_frag_tmpl_path=""
suffix_file=""
ignore_file=""

Expand Down
6 changes: 3 additions & 3 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ print_usage()
echo " Environment Variables:"
echo " "
echo " CC Specifies the C compiler to use."
echo " CXX Specifies the C++ compiler to use (sandbox only)."
echo " CXX Specifies the C++ compiler to use (sandbox only)."
echo " RANLIB Specifies the ranlib executable to use."
echo " AR Specifies the archiver to use."
echo " CFLAGS Specifies additional compiler flags to use (prepended)."
Expand Down Expand Up @@ -2895,13 +2895,13 @@ main()

# -- Determine whether we are performing an out-of-tree build --------------

if [ ${dist_path} != "./" ]; then
if [ "${dist_path}" != "./" ]; then

# At this point, we know the user did not run "./configure". But we
# have not yet ruled out "<fullpath>/configure" or some # equivalent
# that uses relative paths. To further rule out these possibilities,
# we create a dummy file in the current build directory.
touch ./${dummy_file}
touch "./${dummy_file}"

# If the dummy file we just created in the current directory does not
# appear in the source distribution path, then we are in a different
Expand Down
2 changes: 1 addition & 1 deletion examples/oapi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)

# Binary executable name.
TEST_BINS := 00obj_basic.x \
Expand Down
2 changes: 1 addition & 1 deletion examples/tapi/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)

# Binary executable name.
TEST_BINS := 00level1v.x \
Expand Down
2 changes: 1 addition & 1 deletion mpi_test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)



Expand Down
2 changes: 1 addition & 1 deletion test/3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)

# Define a set of CFLAGS for use with C++ and Eigen.
CXXFLAGS := $(subst -std=c99,-std=c++11,$(CFLAGS))
Expand Down
2 changes: 1 addition & 1 deletion test/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)



Expand Down
2 changes: 1 addition & 1 deletion test/exec_sizes/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)



Expand Down
2 changes: 1 addition & 1 deletion test/mixeddt/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)


# Which library?
Expand Down
2 changes: 1 addition & 1 deletion test/studies/skx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -g -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)


# Datatype
Expand Down
2 changes: 1 addition & 1 deletion test/studies/thunderx2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ CFLAGS := $(call get-frame-cflags-for,$(CONFIG_NAME))
CFLAGS += -g -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
lIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)


# Datatype
Expand Down
2 changes: 1 addition & 1 deletion test/thread_ranges/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)


# Datatype
Expand Down
2 changes: 1 addition & 1 deletion testsuite/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ CFLAGS := $(call get-user-cflags-for,$(CONFIG_NAME))
CFLAGS += -I$(TEST_SRC_PATH)

# Locate the libblis library to which we will link.
LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)
#LIBBLIS_LINK := $(LIB_PATH)/$(LIBBLIS_L)

# Binary executable name.
TESTSUITE_BIN := test_libblis.x
Expand Down
141 changes: 0 additions & 141 deletions windows/build/bli_config.h

This file was deleted.

0 comments on commit 057f5f3

Please sign in to comment.