diff options
| author | Loic Guegan <manzerbredes@mailbox.org> | 2023-07-15 08:38:33 +0200 |
|---|---|---|
| committer | Loic Guegan <manzerbredes@mailbox.org> | 2023-07-15 08:38:33 +0200 |
| commit | f89a58860e4e3c76ef3c2e85d47ff38eeaaabb55 (patch) | |
| tree | ed5af12adc1654f8a480a1669d6d8b5bde8703e4 | |
| parent | c84520472c10a5085dc9004ed3b7c8019d01c4f9 (diff) | |
Minor changes
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | Makefile | 26 | ||||
| -rw-r--r-- | src/client.c (renamed from src/client/main.c) | 2 | ||||
| -rw-r--r-- | src/client/Makefile | 15 | ||||
| -rw-r--r-- | src/logger.c (renamed from src/logger/main.c) | 2 | ||||
| -rw-r--r-- | src/logger/Makefile | 13 | ||||
| -rw-r--r-- | src/publisher.c (renamed from src/publisher/main.c) | 2 | ||||
| -rw-r--r-- | src/publisher/Makefile | 15 |
8 files changed, 14 insertions, 65 deletions
@@ -1,7 +1,5 @@ # Binary -/client -/publisher -/logger +/bin # Logs /logs
\ No newline at end of file @@ -3,27 +3,21 @@ include $(CONF) CC="gcc" CFLAGS= -all: publisher client logger +all: pre-build bin/publisher bin/client bin/logger -publisher: - @echo "---------- Building publisher..." - CFLAGS=$(CFLAGS) \ - $(MAKE) -C src/publisher/ CC=$(CC) OUT=$(PWD) CONF=$(CONF) +pre-build: + mkdir -p bin/ -client: - @echo "---------- Building client..." - CFLAGS=$(CFLAGS) \ - $(MAKE) -C src/client/ CC=$(CC) OUT=$(PWD) CONF=$(CONF) +bin/publisher: src/publisher.c + $(CC) -lzmq $^ -o $@ -logger: - @echo "---------- Building logger..." - CFLAGS=$(CFLAGS) \ - $(MAKE) -C src/logger/ CC=$(CC) OUT=$(PWD) CONF=$(CONF) +bin/client: src/client.c + $(CC) -lzmq $^ -o $@ +bin/logger: src/logger.c + $(CC) $^ -o $@ clean: - $(MAKE) clean -C src/publisher/ OUT=$(PWD) - $(MAKE) clean -C src/client/ OUT=$(PWD) - $(MAKE) clean -C src/logger/ OUT=$(PWD) + rm -rf bin/ .PHONY: clean publisher client logger diff --git a/src/client/main.c b/src/client.c index e4b3498..d4a6c5c 100644 --- a/src/client/main.c +++ b/src/client.c @@ -6,7 +6,7 @@ #include <time.h> #include <string.h> -#include "../utils.h" +#include "utils.h" int main (int argc, char *argv []) diff --git a/src/client/Makefile b/src/client/Makefile deleted file mode 100644 index 1afa44c..0000000 --- a/src/client/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include $(CONF) -EXEC=client -CFLAGS+=-lzmq - -DEFINES=\ --DPUBLISHER_PORT=$(PUBLISHER_PORT) \ --DPUBLISHER_ADDR=$(PUBLISHER_ADDR) - -all: main.c - $(CC) $^ -o $(OUT)/$(EXEC) $(CFLAGS) $(DEFINES) - -clean: - rm -f $(OUT)/$(EXEC) - -.PHONY: clean diff --git a/src/logger/main.c b/src/logger.c index 04781dc..2245887 100644 --- a/src/logger/main.c +++ b/src/logger.c @@ -9,7 +9,7 @@ #include <libgen.h> #include <unistd.h> #include <sys/stat.h> -#include "../utils.h" +#include "utils.h" #include <time.h> void start(char *power_path, char *busid, char *chipaddr); diff --git a/src/logger/Makefile b/src/logger/Makefile deleted file mode 100644 index fc04b6d..0000000 --- a/src/logger/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -include $(CONF) -EXEC=logger - -DEFINES=\ --DLOGGER_DIR=$(LOGGER_DIR) - -all: main.c - $(CC) $^ -o $(OUT)/$(EXEC) $(CFLAGS) $(DEFINES) - -clean: - rm -f $(OUT)/$(EXEC) - -.PHONY: clean diff --git a/src/publisher/main.c b/src/publisher.c index 001df66..134d678 100644 --- a/src/publisher/main.c +++ b/src/publisher.c @@ -6,7 +6,7 @@ #include <assert.h> #include <time.h> -#include "../utils.h" +#include "utils.h" int main (void) { diff --git a/src/publisher/Makefile b/src/publisher/Makefile deleted file mode 100644 index 49bf5ea..0000000 --- a/src/publisher/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -include $(CONF) -EXEC=publisher -CFLAGS+=-lzmq - -DEFINES=\ --DPUBLISHER_PORT=$(PUBLISHER_PORT) \ --DPUBLISHER_ADDR=$(PUBLISHER_ADDR) - -all: main.c - $(CC) $^ -o $(OUT)/$(EXEC) $(CFLAGS) $(DEFINES) - -clean: - rm -f $(OUT)/$(EXEC) - -.PHONY: clean |