reorg codebase

diff --git a/src/dial.c b/bin/dial.c
similarity index 100%
rename from src/dial.c
rename to bin/dial.c

diff --git a/src/edit.c b/bin/edit.c
similarity index 100%
rename from src/edit.c
rename to bin/edit.c

diff --git a/src/init.c b/bin/init.c
similarity index 100%
rename from src/init.c
rename to bin/init.c

diff --git a/src/listen.c b/bin/listen.c
similarity index 100%
rename from src/listen.c
rename to bin/listen.c

diff --git a/src/pick.c b/bin/pick.c
similarity index 100%
rename from src/pick.c
rename to bin/pick.c

diff --git a/src/screenlock.c b/bin/screenlock.c
similarity index 100%
rename from src/screenlock.c
rename to bin/screenlock.c

diff --git a/src/shell.c b/bin/shell.c
similarity index 100%
rename from src/shell.c
rename to bin/shell.c

diff --git a/src/winmgr.c b/bin/winmgr.c
similarity index 100%
rename from src/winmgr.c
rename to bin/winmgr.c

diff --git a/build.sh b/build.sh
deleted file mode 100755 (executable)
index 18f8aa5..0000000
--- a/build.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-export PATH="$PWD/tools:$PATH"
-
-# Build all of the libraries first
-for lib in src/lib*/; do
-    Library "$lib"
-done
-
-# Now build all of the binaries
-parallel --halt now,fail=1 'Binary build/bin/{/.} {}' ::: src/*.c
-
-Binary "src/shell/"
-
-## Build all of the multi-file binaries last
-#for lib in src/*/; do
-#    Binary "$lib"
-#done

diff --git a/config.mk b/config.mk
deleted file mode 100644 (file)
index 7f7d7ab..0000000
--- a/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-CC=cc
-CPPPATH="-Iinc -I/usr/X11/include -I/usr/X11/include/freetype2 -I/usr/include/freetype2"
-CFLAGS="-g --std=c99 -Wall -Wextra -Werror"
-
-export CC CPPPATH CFLAGS
\ No newline at end of file

diff --git a/src/liba/argv0.c b/lib/a/argv0.c
similarity index 100%
rename from src/liba/argv0.c
rename to lib/a/argv0.c

diff --git a/src/liba/ecalloc.c b/lib/a/ecalloc.c
similarity index 100%
rename from src/liba/ecalloc.c
rename to lib/a/ecalloc.c

diff --git a/src/liba/efopen.c b/lib/a/efopen.c
similarity index 100%
rename from src/liba/efopen.c
rename to lib/a/efopen.c

diff --git a/src/liba/efreadline.c b/lib/a/efreadline.c
similarity index 100%
rename from src/liba/efreadline.c
rename to lib/a/efreadline.c

diff --git a/src/liba/emalloc.c b/lib/a/emalloc.c
similarity index 100%
rename from src/liba/emalloc.c
rename to lib/a/emalloc.c

diff --git a/src/liba/eraise.c b/lib/a/eraise.c
similarity index 100%
rename from src/liba/eraise.c
rename to lib/a/eraise.c

diff --git a/src/liba/erealloc.c b/lib/a/erealloc.c
similarity index 100%
rename from src/liba/erealloc.c
rename to lib/a/erealloc.c

diff --git a/src/liba/esignal.c b/lib/a/esignal.c
similarity index 100%
rename from src/liba/esignal.c
rename to lib/a/esignal.c

diff --git a/src/liba/estrdup.c b/lib/a/estrdup.c
similarity index 100%
rename from src/liba/estrdup.c
rename to lib/a/estrdup.c

diff --git a/src/liba/fatal.c b/lib/a/fatal.c
similarity index 100%
rename from src/liba/fatal.c
rename to lib/a/fatal.c

diff --git a/src/liba/smprintf.c b/lib/a/smprintf.c
similarity index 100%
rename from src/liba/smprintf.c
rename to lib/a/smprintf.c

diff --git a/src/liba/warn.c b/lib/a/warn.c
similarity index 100%
rename from src/liba/warn.c
rename to lib/a/warn.c

diff --git a/src/libui/font_close.c b/lib/ui/font_close.c
similarity index 100%
rename from src/libui/font_close.c
rename to lib/ui/font_close.c

diff --git a/src/libui/font_load.c b/lib/ui/font_load.c
similarity index 100%
rename from src/libui/font_load.c
rename to lib/ui/font_load.c

diff --git a/src/libui/libui_impl.h b/lib/ui/libui_impl.h
similarity index 100%
rename from src/libui/libui_impl.h
rename to lib/ui/libui_impl.h

diff --git a/src/libui/ui_begin.c b/lib/ui/ui_begin.c
similarity index 100%
rename from src/libui/ui_begin.c
rename to lib/ui/ui_begin.c

diff --git a/src/libui/ui_end.c b/lib/ui/ui_end.c
similarity index 100%
rename from src/libui/ui_end.c
rename to lib/ui/ui_end.c

diff --git a/src/libui/window_create.c b/lib/ui/window_create.c
similarity index 100%
rename from src/libui/window_create.c
rename to lib/ui/window_create.c

diff --git a/src/libui/window_delete.c b/lib/ui/window_delete.c
similarity index 100%
rename from src/libui/window_delete.c
rename to lib/ui/window_delete.c

diff --git a/src/libui/window_hide.c b/lib/ui/window_hide.c
similarity index 100%
rename from src/libui/window_hide.c
rename to lib/ui/window_hide.c

diff --git a/src/libui/window_show.c b/lib/ui/window_show.c
similarity index 100%
rename from src/libui/window_show.c
rename to lib/ui/window_show.c

diff --git a/mocks b/mocks
deleted file mode 100644 (file)
index a5975f7..0000000
--- a/mocks
+++ /dev/null
@@ -1,6 +0,0 @@
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xft/Xft.h>
-
-int XSync(Display* display, Bool discard);
-int XMapWindow(Display* display, Window w);
\ No newline at end of file