From 556bcb414cb012ccbe5a81bf5ce1495f53336cd1 Mon Sep 17 00:00:00 2001 From: Attila Kovacs Date: Thu, 19 Sep 2024 21:53:30 +0200 Subject: [PATCH] Makefile simplifications --- Makefile | 3 --- test.mk | 11 +++-------- tools.mk | 8 +------- 3 files changed, 4 insertions(+), 18 deletions(-) diff --git a/Makefile b/Makefile index cd8f281..a2d705b 100644 --- a/Makefile +++ b/Makefile @@ -28,9 +28,6 @@ else $(info WARNING! Doxygen is not available. Will skip 'dox' target) endif -# Link against thread lib -LDFLAGS += -pthread - export # Build everything... diff --git a/test.mk b/test.mk index f2f216d..3c88149 100644 --- a/test.mk +++ b/test.mk @@ -1,6 +1,6 @@ -# Load the common Makefile definitions... -include config.mk +include config.mk +# Load the common Makefile definitions... CFLAGS += -g LDFLAGS += -L$(LIB) -lsmax @@ -13,9 +13,4 @@ TESTS = $(BIN)/simpleIntTest $(BIN)/simpleIntsTest $(BIN)/structTest $(BIN)/queu # Top level make targets... all: $(TESTS) - -$(BIN)/%: $(OBJ)/%.o | $(BIN) - $(CC) -o $@ $^ $(LDFLAGS) - -# Standard generic rules and targets... -include build.mk +include build.mk \ No newline at end of file diff --git a/tools.mk b/tools.mk index 2b70a14..ca3fd40 100644 --- a/tools.mk +++ b/tools.mk @@ -1,4 +1,3 @@ -# Load the common Makefile definitions... include config.mk LDFLAGS += -L$(LIB) -lsmax @@ -7,9 +6,4 @@ LD_LIBRARY_PATH := $(LIB):$(LD_LIBRARY_PATH) # Top level make targets... all: $(BIN)/smaxValue $(BIN)/smaxWrite -# Standard generic rules and targets... -include build.mk - - - - +include build.mk \ No newline at end of file