Muldersoft/LibHashSet
Muldersoft/LibHashSet
1
0
Fork 0
Code Releases 4 Activity

Some Makefile improvements.

Browse Source
This commit is contained in:
LoRd_MuldeR 2022-11-25 13:36:53 +01:00
parent 4dfc5f5279
commit 5675964db1
4 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile
View File

@ -1,9 +1,16 @@
SUBDIRS := libhashset hashset SUBDIRS := libhashset hashset
.PHONY: all clean BUILD_ALL := $(patsubst %,build_rule\:%,$(SUBDIRS))
CLEAN_ALL := $(patsubst %,clean_rule\:%,$(SUBDIRS))
all: .PHONY: all clean $(BUILD_ALL) $(CLEAN_ALL)
for subdir in $(SUBDIRS); do $(MAKE) -C $$subdir; done
clean: all: $(BUILD_ALL)
for subdir in $(SUBDIRS); do $(MAKE) -C $$subdir clean; done
clean: $(CLEAN_ALL)
$(BUILD_ALL):
$(MAKE) -C $(patsubst build_rule:%,%,$@)
$(CLEAN_ALL):
$(MAKE) -C $(patsubst clean_rule:%,%,$@) clean

15
hashset/Makefile
View File

@ -1,19 +1,24 @@
DUMPMACHINE := $(shell $(CC) -dumpmachine) DUMPMACHINE := $(shell $(CC) -dumpmachine)
ifneq ($(SANITIZE_ADDRESS),1)
XCFLAGS = -O3 -DNDEBUG
ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),) ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),)
XCFLAGS = -march=x86-64 -mtune=nocona -s XCFLAGS += -march=x86-64 -mtune=nocona
else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),) else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS = -march=pentiumpro -mtune=intel -s XCFLAGS += -march=pentiumpro -mtune=intel
endif
else
XCFLAGS = -fsanitize=address -static-libasan -g
endif endif
ifeq ($(OS),Windows_NT) ifneq ($(firstword $(filter %-mingw32 %-cygwin,$(DUMPMACHINE))),)
EXE_SUFFIX := .exe
ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),) ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS += -Wl,--large-address-aware XCFLAGS += -Wl,--large-address-aware
endif endif
EXE_SUFFIX := .exe
endif endif
CFLAGS = -std=c99 -O3 -DNDEBUG -D_DEFAULT_SOURCE -Wpedantic -I../libhashset/include $(XCFLAGS) CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -I../libhashset/include $(XCFLAGS)
SRC_PATH := src SRC_PATH := src
BIN_PATH := bin BIN_PATH := bin

2
hashset/src/main.c
View File

@ -326,7 +326,7 @@ static int test_function_3(hash_set_t *const hash_set)
/* TEST #4 */ /* TEST #4 */
/* ========================================================================= */ /* ========================================================================= */
#define LIMIT (UINT64_MAX >> 2) #define LIMIT (((uint64_t)UINT32_MAX) >> 2)
static int test_function_4(hash_set_t *const hash_set) static int test_function_4(hash_set_t *const hash_set)
{ {

11
libhashset/Makefile
View File

@ -1,12 +1,17 @@
DUMPMACHINE := $(shell $(CC) -dumpmachine) DUMPMACHINE := $(shell $(CC) -dumpmachine)
ifneq ($(SANITIZE_ADDRESS),1)
XCFLAGS = -O3 -DNDEBUG
ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),) ifneq ($(firstword $(filter x86_64-%,$(DUMPMACHINE))),)
XCFLAGS = -march=x86-64 -mtune=nocona XCFLAGS += -march=x86-64 -mtune=nocona
else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),) else ifneq ($(firstword $(filter i686-%,$(DUMPMACHINE))),)
XCFLAGS = -march=pentiumpro -mtune=intel XCFLAGS += -march=pentiumpro -mtune=intel
endif
else
XCFLAGS = -fsanitize=address -static-libasan -g
endif endif
CFLAGS = -std=c99 -O3 -DNDEBUG -Wpedantic -Iinclude $(XCFLAGS) CFLAGS = -std=c99 -D_DEFAULT_SOURCE -Wpedantic -Iinclude $(XCFLAGS)
SRC_PATH := src SRC_PATH := src
OBJ_PATH := obj OBJ_PATH := obj