commit d75dd48a89ce1fb62e643a0ab66944de743ee9e9
parent 77e86feb047b4c0dedc52d0e246cda5159d377b5
Author: Friedel Schön <[email protected]>
Date: Thu, 8 Jun 2023 17:43:22 +0200
replace binary.mk with extract-flags
Diffstat:
12 files changed, 32 insertions(+), 47 deletions(-)
diff --git a/Makefile b/Makefile
@@ -1,5 +1,8 @@
-include config.mk
-include mk/binary.mk
+-include config.mk
+
+ifeq ($(BINARIES),)
+$(error 'config.mk' is missing, run ./configure)
+endif
VERSION := 0.3.3
@@ -54,7 +57,6 @@ all: compile_flags.txt binary manual documentation
clean:
@echo "[RM] $(TARGET_DIRS)"
$(SILENT)rm -rf $(TARGET_DIRS)
- $(SILENT)rm config.mk
binary: $(BIN_FILES)
diff --git a/bin/chpst.c b/bin/chpst.c
@@ -1,3 +1,5 @@
+// +objects: parse.o util.o
+
#include "parse.h"
#include "util.h"
@@ -8,7 +10,6 @@
#include <string.h>
#include <sys/file.h>
-
int main(int argc, char** argv) {
int opt, lockfd, lockflags, gid_len = 0;
char *arg0 = NULL, *root = NULL, *cd = NULL, *lock = NULL, *exec = NULL;
diff --git a/bin/finit.c b/bin/finit.c
@@ -1,3 +1,6 @@
+// +objects: message.o util.o
+// +flags: -static
+
#include "config.h"
#include "message.h"
#include "util.h"
diff --git a/bin/fsvc.c b/bin/fsvc.c
@@ -1,3 +1,5 @@
+// +objects: message.o util.o decode.o signame.o
+
#include "config.h"
#include "message.h"
#include "service.h"
diff --git a/bin/fsvs.c b/bin/fsvs.c
@@ -1,4 +1,4 @@
-// daemon manager
+// +objects: message.o util.o supervise.o service.o start.o stop.o register.o handle_exit.o handle_command.o encode.o parse.o dependency.o pattern.o status.o
#include "config.h"
#include "message.h"
diff --git a/bin/halt.c b/bin/halt.c
@@ -1,3 +1,5 @@
+// +objects: wtmp.o util.o
+
#include "util.h"
#include "wtmp.h"
diff --git a/bin/modules-load.c b/bin/modules-load.c
@@ -1,3 +1,5 @@
+// +objects: util.o
+
#include "util.h"
#include <dirent.h>
diff --git a/bin/sigremap.c b/bin/sigremap.c
@@ -20,6 +20,7 @@
THE SOFTWARE.
*/
+// +objects: message.o signame.o
#include "message.h"
#include "signame.h"
diff --git a/bin/vlogger.c b/bin/vlogger.c
@@ -1,3 +1,5 @@
+// +objects: message.o
+
#include "config.h"
#include "message.h"
#include "util.h"
diff --git a/mk/binary.mk b/mk/binary.mk
@@ -1,33 +0,0 @@
-chpst_OBJECTS := parse.o util.o
-
-finit_OBJECTS := message.o util.o
-
-fsvc_OBJECTS := message.o util.o decode.o signame.o
-
-fsvs_OBJECTS := message.o util.o supervise.o service.o start.o stop.o \
- register.o handle_exit.o handle_command.o encode.o \
- parse.o dependency.o pattern.o status.o
-
-halt_OBJECTS := wtmp.o util.o
-
-modules-load_OBJECTS := util.o
-
-seedrng_OBJECTS :=
-
-sigremap_OBJECTS := message.o signame.o
-
-vlogger_OBJECTS := message.o
-
-zzz_OBJECTS :=
-
-chpst_FLAGS :=
-finit_FLAGS := -static
-fsvc_FLAGS :=
-fsvs_FLAGS :=
-halt_FLAGS :=
-modules-load_FLAGS :=
-seedrng_FLAGS :=
-sigremap_FLAGS :=
-vlogger_FLAGS :=
-zzz_FLAGS :=
-
diff --git a/mk/extract-flags.sh b/mk/extract-flags.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+[ -n "$2" ] && for obj in $(grep -E '^//\s+\+objects:' $1 | sed -E 's/\/\/\s+\+objects://'); do
+ echo -n "$2/$obj "
+done
+
+grep -E '^//\s+\+flags:' $1 | sed -E "s/\/\/\s+\+flags://"
diff --git a/mk/target.mk b/mk/target.mk
@@ -6,22 +6,18 @@ $(TARGET_DIRS):
$(TARGET_ASSETS_DIR): $(ASSETS_DIR) | $(TARGET_DOCS_DIR)
@echo "[CP] $@"
$(SILENT)mkdir -p $@
- $(SILENT)cp -rv $</* $@
+ $(SILENT)cp -r $</* $@
# Object rules
$(TARGET_OBJECT_DIR)/%.o: $(SRC_DIR)/%.c $(INCLUDE_FILES) | $(TARGET_OBJECT_DIR)
@echo "[CC] $@"
- $(SILENT)$(CC) -o $@ -c $(CFLAGS) $<
-
-$(TARGET_OBJECT_DIR)/%.o: $(BIN_DIR)/%.c $(INCLUDE_FILES) | $(TARGET_OBJECT_DIR)
- @echo "[CC] $@"
- $(SILENT)$(CC) -o $@ -c $(CFLAGS) $<
+ $(SILENT)$(CC) -o $@ $< -c $(CFLAGS) $(shell mk/extract-flags.sh $< $(TARGET_OBJECT_DIR))
# Executables
-$(TARGET_BIN_DIR)/%: $(TARGET_OBJECT_DIR)/%.o $(OBJ_FILES) | $(TARGET_BIN_DIR)
- @echo "[LD] $@"
- $(SILENT)$(CC) -o $@ $< $(patsubst %,$(TARGET_OBJECT_DIR)/%,$($(notdir $@)_OBJECTS)) $($(notdir $@)_FLAGS) $(LDFLAGS)
+$(TARGET_BIN_DIR)/%: $(BIN_DIR)/%.c $(OBJ_FILES) | $(TARGET_BIN_DIR)
+ @echo "[CCLD] $@"
+ $(SILENT)$(CC) -o $@ $< $(CFLAGS) $(shell mk/extract-flags.sh $< $(TARGET_OBJECT_DIR)) $(LDFLAGS)
$(TARGET_BIN_DIR)/%: $(BIN_DIR)/%.sh | $(TARGET_BIN_DIR)
@echo "[CP] $@"
