Makefile simplifications

Smithsonian · Sep 19, 2024 · a1356cf · a1356cf
1 parent b8b5ba2
commit a1356cf
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git 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
@@ -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
diff --git 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,8 @@ LD_LIBRARY_PATH := $(LIB):$(LD_LIBRARY_PATH)
 # Top level make targets...
 all: $(BIN)/smaxValue $(BIN)/smaxWrite
 
-# Standard generic rules and targets...
-include build.mk
-
-
-
+# Simple binaries
+$(BIN)/%: $(OBJ)/%.o | $(BIN)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
+include build.mk