move source files from project root into src directory. Makefile is a bit broken though

11 files changed, 7 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index 3baa6c6..15e1851 100644
--- a/Makefile
+++ b/Makefile
@@ -6,8 +6,10 @@ CFLAGS!=echo -std=c99 `pkg-config --cflags gtk+-2.0 webkit-1.0 libsoup-2.4 gthre
 LDFLAGS:=$(shell pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0) -pthread $(LDFLAGS)
 LDFLAGS!=echo `pkg-config --libs gtk+-2.0 webkit-1.0 libsoup-2.4 gthread-2.0` -pthread $(LDFLAGS)
 
-SRC = uzbl-core.c events.c callbacks.c inspector.c
-OBJ = ${SRC:.c=.o}
+SRC = $(wildcard src/*.c)
+HEAD = $(wildcard src/*.h)
+TOBJ = $(SRC:.c=.o)
+OBJ = $(foreach obj, $(TOBJ), $(notdir $(obj)))
 
 all: uzbl-browser options
 
@@ -25,7 +27,7 @@ options:
 	@${CC} -c ${CFLAGS} $<
 	@echo ... done.
 
-${OBJ}: uzbl-core.h events.h callbacks.h inspector.h config.h
+${OBJ}: ${HEAD}
 
 uzbl-core: ${OBJ}
 	@echo
@@ -59,7 +61,7 @@ test-uzbl-core: uzbl-core
 	./uzbl-core --uri http://www.uzbl.org --verbose
 
 test-uzbl-browser: uzbl-browser
-	./uzbl-browser --uri http://www.uzbl.org --verbose
+	./src/uzbl-browser --uri http://www.uzbl.org --verbose
 
 test-uzbl-core-sandbox: uzbl-core
 	make DESTDIR=./sandbox RUN_PREFIX=`pwd`/sandbox/usr/local install-uzbl-core
@@ -104,7 +106,7 @@ install-uzbl-core: all
 
 install-uzbl-browser:
 	install -d $(INSTALLDIR)/bin
-	install -m755 uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
+	install -m755 src/uzbl-browser $(INSTALLDIR)/bin/uzbl-browser
 	install -m755 examples/data/uzbl/scripts/uzbl-cookie-daemon $(INSTALLDIR)/bin/uzbl-cookie-daemon
 	install -m755 examples/data/uzbl/scripts/uzbl-event-manager $(INSTALLDIR)/bin/uzbl-event-manager
 	sed -i 's#^PREFIX=.*#PREFIX=$(RUN_PREFIX)#' $(INSTALLDIR)/bin/uzbl-browser
diff --git a/callbacks.c b/src/callbacks.c
index dab92c1..dab92c1 100644
--- a/callbacks.c
+++ b/src/callbacks.c
diff --git a/callbacks.h b/src/callbacks.h
index 3f318f2..3f318f2 100644
--- a/callbacks.h
+++ b/src/callbacks.h
diff --git a/config.h b/src/config.h
index e9b9a8e..e9b9a8e 100644
--- a/config.h
+++ b/src/config.h
diff --git a/events.c b/src/events.c
index acb554c..acb554c 100644
--- a/events.c
+++ b/src/events.c
diff --git a/events.h b/src/events.h
index 7b8f58b..7b8f58b 100644
--- a/events.h
+++ b/src/events.h
diff --git a/inspector.c b/src/inspector.c
index de3dbcd..de3dbcd 100644
--- a/inspector.c
+++ b/src/inspector.c
diff --git a/inspector.h b/src/inspector.h
index 57d0ca9..57d0ca9 100644
--- a/inspector.h
+++ b/src/inspector.h
diff --git a/uzbl-browser b/src/uzbl-browser
index d9b9752..d9b9752 100755
--- a/uzbl-browser
+++ b/src/uzbl-browser
diff --git a/uzbl-core.c b/src/uzbl-core.c
index bc294b4..bc294b4 100644
--- a/uzbl-core.c
+++ b/src/uzbl-core.c
diff --git a/uzbl-core.h b/src/uzbl-core.h
index df9eb1a..df9eb1a 100644
--- a/uzbl-core.h
+++ b/src/uzbl-core.h