moving src/notify to src/

Makefile

@@ -44,10 +44,10 @@ obj += src/common/strbuf.o
 obj += src/common/xalloc.o
 obj += src/common/die.o
 
-obj += src/notify/inotify.o
+obj += src/inotify.o
-obj += src/notify/event.o
+obj += src/event.o
-obj += src/notify/fscrawl.o
+obj += src/fscrawl.o
-obj += src/notify/queue.o
+obj += src/queue.o
 
 .PHONY : all clean cleaner
 all : $(PROGRAM)

src/client/mysql.c

@@ -16,8 +16,8 @@
 
 #include <mysql/mysql.h>
 
-#include "../notify/notify.h"
+#include "../notify.h"
-#include "../notify/event.h"
+#include "../event.h"
 #include "../common/xalloc.h"
 #include "../ini/iniparser.h"
 #include "../common/util.h"

src/client/stdout.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <time.h>
-#include "../notify/notify.h"
+#include "../notify.h"
 
 static void p_exit_time() {
 

src/event.c

@@ -1,4 +1,4 @@
-/* notify/event.c - notify event implementation
+/* event.c
  * 
  *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
  *  (C) Copyright 2010 Fredric Nilsson <fredric@fiktivkod.org>
@@ -13,7 +13,7 @@
 #include <string.h>
 
 #include "event.h"
-#include "../common/path.h"
+#include "common/path.h"
 
 #define dealloc_data(ev) \
 	if (ev->path) \

src/event.h

@@ -1,4 +1,4 @@
-/* notify/event.h - event data structure and operation's for notify API
+/* event.h - event data structure and operation's for notify API
  * 
  *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
  *  (C) Copyright 2010 Fredric Nilsson <fredric@fiktivkod.org>

src/fscrawl.c

@@ -1,4 +1,4 @@
-/* notify/fscrawl.c - Filesystem traversal
+/* fscrawl.c - Filesystem traversal
  * 
  *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
  *
@@ -13,9 +13,9 @@
 #include <errno.h>
 #include <dirent.h>
 
-#include "../common/strbuf.h"
+#include "common/strbuf.h"
-#include "../common/path.h"
+#include "common/path.h"
-#include "../common/debug.h"
+#include "common/debug.h"
 #include "fscrawl.h"
 
 #define MAX_DEPTH 0x20

src/fscrawl.h

@@ -1,4 +1,4 @@
-/* notify/fscrawl.h - Filesystem traversal
+/* fscrawl.h - Filesystem traversal
  * 
  *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/inotify.c

@@ -1,4 +1,4 @@
-/* notify/inotify.c - inotify implementation
+/* inotify.c - inotify implementation
  * 
  *  (C) Copyright 2010 Henrik Hautakoski <henrik.hautakoski@gmail.com>
  *  (C) Copyright 2010 Fredric Nilsson <fredric@unknown.org>
@@ -16,12 +16,11 @@
 #include <sys/ioctl.h>
 #include <sys/inotify.h>
 
-#include "../common/util.h"
+#include "common/util.h"
 /* red black tree for watch descriptors */
-#include "../common/rbtree.h"
+#include "common/rbtree.h"
-#include "../common/debug.h"
+#include "common/debug.h"
-#include "../common/path.h"
+#include "common/path.h"
-
 #include "queue.h"
 #include "fscrawl.h"
 #include "notify.h"

src/notify.h

@@ -1,4 +1,4 @@
-/* notify/notify.h - filesystem notification API
+/* notify.h - filesystem notification API
  * 
  *  (C) Copyright 2010 Henrik Hautakoski <henrik@fiktivkod.org>
  *  (C) Copyright 2010 Fredric Nilsson <fredric@fiktivkod.org>

src/queue.c

@@ -1,4 +1,4 @@
-/* notify/queue.c
+/* queue.c
  *
  *   Copyright (C) 2010       Henrik Hautakoski <henrik@fiktivkod.org>
  *

src/queue.h

@@ -1,4 +1,4 @@
-/* notify/queue.h
+/* queue.h
  *
  *   Copyright (C) 2010       Henrik Hautakoski <henrik@fiktivkod.org>
  *

test/Makefile

@@ -39,23 +39,23 @@ inotify :
 		../src/common/die.c \
 		../src/common/strbuf.c \
 	    ../src/common/path.c \
-	    ../src/notify/event.c \
+	    ../src/event.c \
-		../src/notify/fscrawl.c \
+		../src/fscrawl.c \
-	    ../src/notify/queue.c \
+	    ../src/queue.c \
-	    ../src/notify/inotify.c \
+	    ../src/inotify.c \
 	t_inotify.c -o test_inotify
 
 fscrawl :
 	$(CC) $(CFLAGS) \
 		../src/common/path.c \
-		../src/notify/fscrawl.c \
+		../src/fscrawl.c \
 		../src/common/xalloc.c \
 		../src/common/die.c \
 		../src/common/strbuf.c \
 	t_fscrawl.c -o test_fscrawl
 
 queue :
-	$(CC) $(CFLAGS) ../src/notify/queue.c t_queue.c -o test_queue
+	$(CC) $(CFLAGS) ../src/queue.c t_queue.c -o test_queue
 
 clean :
 	rm -f test_*

test/t_fscrawl.c

@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include "../src/notify/fscrawl.h"
+#include "../src/fscrawl.h"
 
 int main(int argc, char *argv[]) {
 	

test/t_inotify.c

@@ -1,6 +1,6 @@
 
 #include <stdio.h>
-#include "../src/notify/notify.h"
+#include "../src/notify.h"
 
 PROT_SCAN_CALLBACK(my_callback) {
 	//printf("FROM THREAD -- path: %s; is_dir = %i\n", path, dir);

test/t_queue.c

@@ -1,7 +1,7 @@
 
 #include <assert.h>
 #include <stdio.h>
-#include "../src/notify/queue.h"
+#include "../src/queue.h"
 
 int main() {