From 4816ac8405f3f8a18f0e296b9a748a27d66fed0e Mon Sep 17 00:00:00 2001
From: David Phillips <david@sighup.nz>
Date: Wed, 27 Jun 2018 19:50:25 +1200
Subject: Change from TCP to UNIX sockets, massive clean up

---
 lib/Makefile   |  7 +++++--
 lib/libalarm.c | 16 ++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'lib')

diff --git a/lib/Makefile b/lib/Makefile
index 52368e0..2c9ccc9 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -4,5 +4,8 @@ CFLAGS += "-I../inc/"
 libalarm.so: libalarm.o
 	$(CC) -shared -o $@ $< $(LDFLAGS)
 
-.o.c:
-	$(CC) -o $@ $< $(LDFLAGS)
+%.o: %.c
+	$(CC) -c -o $@ $< $(LDFLAGS) $(CFLAGS)
+
+clean:
+	rm libalarm.{s,}o
diff --git a/lib/libalarm.c b/lib/libalarm.c
index 856d8f6..fb96e37 100644
--- a/lib/libalarm.c
+++ b/lib/libalarm.c
@@ -1,7 +1,12 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <sys/socket.h>
-#include <strings.h>
+#include <unistd.h>
+#include <string.h>
+#include <arpa/inet.h>
+#include <sys/types.h>
+
+
 
 int8_t recv_string(int sock, char (*buffer)[128])
 {
@@ -46,15 +51,6 @@ int send_string(int sock, char *buffer)
 	return 0;
 }
 
-#include <stdio.h>
-#include <stdint.h>
-#include <string.h>
-#include <arpa/inet.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netdb.h>
-#include <unistd.h>
-
 #include "alarmd_proto.h"
 
 int alarmd_register(int sock, char *desc, char (*uuid)[16])
-- 
cgit v1.1