From fe02835dfa1920a0e9e047f8512ee897f5a40f2f Mon Sep 17 00:00:00 2001
From: Alex Kotov <kotovalexarian@gmail.com>
Date: Sat, 13 Nov 2021 02:48:06 +0500
Subject: [PATCH] Move services to separate directory

---
 Makefile                          | 6 +++---
 dwm.c                             | 4 ++--
 datetime.c => services/datetime.c | 2 +-
 datetime.h => services/datetime.h | 0
 status.c => services/status.c     | 2 +-
 status.h => services/status.h     | 0
 6 files changed, 7 insertions(+), 7 deletions(-)
 rename datetime.c => services/datetime.c (98%)
 rename datetime.h => services/datetime.h (100%)
 rename status.c => services/status.c (99%)
 rename status.h => services/status.h (100%)

diff --git a/Makefile b/Makefile
index 9fb636e..2e1147b 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
 
 include config.mk
 
-SRC = atoms.c datetime.c drw.c dwm.c status.c util.c
+SRC = atoms.c drw.c dwm.c services/datetime.c services/status.c util.c
 OBJ = ${SRC:.c=.o}
 
 all: options dwm
@@ -14,8 +14,8 @@ options:
 	@echo "LDFLAGS  = ${LDFLAGS}"
 	@echo "CC       = ${CC}"
 
-.c.o:
-	${CC} -c ${CFLAGS} $<
+%.o: %.c
+	${CC} -c $< -o $@ ${CFLAGS}
 
 ${OBJ}: config.h config.mk
 
diff --git a/dwm.c b/dwm.c
index a9dbfb6..a69a547 100644
--- a/dwm.c
+++ b/dwm.c
@@ -42,9 +42,9 @@
 #include <X11/Xft/Xft.h>
 
 #include "atoms.h"
-#include "datetime.h"
 #include "drw.h"
-#include "status.h"
+#include "services/datetime.h"
+#include "services/status.h"
 #include "util.h"
 
 /* macros */
diff --git a/datetime.c b/services/datetime.c
similarity index 98%
rename from datetime.c
rename to services/datetime.c
index 7de4b78..9171aca 100644
--- a/datetime.c
+++ b/services/datetime.c
@@ -1,6 +1,6 @@
 #include "datetime.h"
 
-#include "atoms.h"
+#include "../atoms.h"
 #include "status.h"
 
 #include <pthread.h>
diff --git a/datetime.h b/services/datetime.h
similarity index 100%
rename from datetime.h
rename to services/datetime.h
diff --git a/status.c b/services/status.c
similarity index 99%
rename from status.c
rename to services/status.c
index 13f23dc..7200126 100644
--- a/status.c
+++ b/services/status.c
@@ -1,6 +1,6 @@
 #include "status.h"
 
-#include "atoms.h"
+#include "../atoms.h"
 #include "datetime.h"
 
 #include <pthread.h>
diff --git a/status.h b/services/status.h
similarity index 100%
rename from status.h
rename to services/status.h