Minor changes

.gitignore

@@ -1,7 +1,5 @@
 # Binary
-/client
+/bin
-/publisher
-/logger
 
 # Logs
 /logs

Makefile

@@ -3,27 +3,21 @@ include $(CONF)
 CC="gcc"
 CFLAGS=
 
-all: publisher client logger
+all: pre-build bin/publisher bin/client bin/logger
 
-publisher:
+pre-build:
-	@echo "---------- Building publisher..."
+	mkdir -p bin/
-	CFLAGS=$(CFLAGS) \
-	$(MAKE) -C src/publisher/ CC=$(CC) OUT=$(PWD) CONF=$(CONF)
 
-client:
+bin/publisher: src/publisher.c
-	@echo "---------- Building client..."
+	$(CC) -lzmq $^ -o $@
-	CFLAGS=$(CFLAGS) \
-	$(MAKE) -C src/client/ CC=$(CC) OUT=$(PWD) CONF=$(CONF)
 
-logger:
+bin/client: src/client.c
-	@echo "---------- Building logger..."
+	$(CC) -lzmq $^ -o $@
-	CFLAGS=$(CFLAGS) \
-	$(MAKE) -C src/logger/ CC=$(CC) OUT=$(PWD) CONF=$(CONF)
 
+bin/logger: src/logger.c
+	$(CC) $^ -o $@
 
 clean:
-	$(MAKE) clean -C src/publisher/ OUT=$(PWD)
+	rm -rf bin/
-	$(MAKE) clean -C src/client/ OUT=$(PWD)	
-	$(MAKE) clean -C src/logger/ OUT=$(PWD)
 
 .PHONY: clean publisher client logger

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 [])

src/client/Makefile

@@ -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

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);

src/logger/Makefile

@@ -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

src/publisher.c

@@ -6,7 +6,7 @@
 #include <assert.h>
 #include <time.h>
 
-#include "../utils.h"
+#include "utils.h"
 
 int main (void)
 {

src/publisher/Makefile

@@ -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