From 2df2e7d06cd0902947c619440e6ec83306e2fb8f Mon Sep 17 00:00:00 2001
From: Nikos Tsipinakis <nikos@tsipinakis.com>
Date: Sat, 19 Nov 2016 11:54:03 +0200
Subject: [PATCH] Move dunst source files to src/

---
 Makefile                               | 15 +++++----------
 dbus.c => src/dbus.c                   |  0
 dbus.h => src/dbus.h                   |  0
 dunst.c => src/dunst.c                 |  0
 dunst.h => src/dunst.h                 |  0
 menu.c => src/menu.c                   |  0
 menu.h => src/menu.h                   |  0
 notification.c => src/notification.c   |  0
 notification.h => src/notification.h   |  0
 option_parser.c => src/option_parser.c |  0
 option_parser.h => src/option_parser.h |  0
 rules.c => src/rules.c                 |  0
 rules.h => src/rules.h                 |  0
 settings.c => src/settings.c           |  0
 settings.h => src/settings.h           |  0
 utils.c => src/utils.c                 |  0
 utils.h => src/utils.h                 |  0
 x.c => src/x.c                         |  0
 x.h => src/x.h                         |  0
 19 files changed, 5 insertions(+), 10 deletions(-)
 rename dbus.c => src/dbus.c (100%)
 rename dbus.h => src/dbus.h (100%)
 rename dunst.c => src/dunst.c (100%)
 rename dunst.h => src/dunst.h (100%)
 rename menu.c => src/menu.c (100%)
 rename menu.h => src/menu.h (100%)
 rename notification.c => src/notification.c (100%)
 rename notification.h => src/notification.h (100%)
 rename option_parser.c => src/option_parser.c (100%)
 rename option_parser.h => src/option_parser.h (100%)
 rename rules.c => src/rules.c (100%)
 rename rules.h => src/rules.h (100%)
 rename settings.c => src/settings.c (100%)
 rename settings.h => src/settings.h (100%)
 rename utils.c => src/utils.c (100%)
 rename utils.h => src/utils.h (100%)
 rename x.c => src/x.c (100%)
 rename x.h => src/x.h (100%)

diff --git a/Makefile b/Makefile
index a70e532..9787ae4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,15 +3,10 @@
 
 include config.mk
 
-SRC = x.c  \
-	  dunst.c \
-	  dbus.c  \
-	  utils.c \
-	  option_parser.c \
-	  settings.c \
-	  rules.c \
-	  menu.c \
-	  notification.c
+CFLAGS += -I.
+LDFLAGS += -L.
+
+SRC = $(shell ls src/*.c)
 OBJ = ${SRC:.c=.o}
 
 V ?= 0
@@ -29,7 +24,7 @@ options:
 
 .c.o:
 	@echo CC -c $<
-	${CC} -c $< ${CFLAGS}
+	${CC} -o $@ -c $< ${CFLAGS}
 
 ${OBJ}: config.h config.mk
 
diff --git a/dbus.c b/src/dbus.c
similarity index 100%
rename from dbus.c
rename to src/dbus.c
diff --git a/dbus.h b/src/dbus.h
similarity index 100%
rename from dbus.h
rename to src/dbus.h
diff --git a/dunst.c b/src/dunst.c
similarity index 100%
rename from dunst.c
rename to src/dunst.c
diff --git a/dunst.h b/src/dunst.h
similarity index 100%
rename from dunst.h
rename to src/dunst.h
diff --git a/menu.c b/src/menu.c
similarity index 100%
rename from menu.c
rename to src/menu.c
diff --git a/menu.h b/src/menu.h
similarity index 100%
rename from menu.h
rename to src/menu.h
diff --git a/notification.c b/src/notification.c
similarity index 100%
rename from notification.c
rename to src/notification.c
diff --git a/notification.h b/src/notification.h
similarity index 100%
rename from notification.h
rename to src/notification.h
diff --git a/option_parser.c b/src/option_parser.c
similarity index 100%
rename from option_parser.c
rename to src/option_parser.c
diff --git a/option_parser.h b/src/option_parser.h
similarity index 100%
rename from option_parser.h
rename to src/option_parser.h
diff --git a/rules.c b/src/rules.c
similarity index 100%
rename from rules.c
rename to src/rules.c
diff --git a/rules.h b/src/rules.h
similarity index 100%
rename from rules.h
rename to src/rules.h
diff --git a/settings.c b/src/settings.c
similarity index 100%
rename from settings.c
rename to src/settings.c
diff --git a/settings.h b/src/settings.h
similarity index 100%
rename from settings.h
rename to src/settings.h
diff --git a/utils.c b/src/utils.c
similarity index 100%
rename from utils.c
rename to src/utils.c
diff --git a/utils.h b/src/utils.h
similarity index 100%
rename from utils.h
rename to src/utils.h
diff --git a/x.c b/src/x.c
similarity index 100%
rename from x.c
rename to src/x.c
diff --git a/x.h b/src/x.h
similarity index 100%
rename from x.h
rename to src/x.h