added stub makefile

diff --git a/Makefile b/Makefile
new file mode 100644 (file)
index 0000000..b7a9765
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,7 @@
+.PHONY: all clean
+
+all:
+       ./tools/build.sh
+
+clean:
+       rm -rf build/
\ No newline at end of file

diff --git a/bin/listen.c b/bin/listen.c
index 28781f68c08ab0783f9a4e00dd9dd6334998625f..7ad27ee7a900aabc9690db8d2ceed4fb7aa2043a 100644 (file)
--- a/bin/listen.c
+++ b/bin/listen.c
@@ -2,6 +2,8 @@
 #include <libnet.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 void serve(int cfd, char** argv)
 {
@@ -44,6 +46,7 @@ int main(int argc, char** argv)
         while (waitpid(-1, 0, WNOHANG) > 0);
     }
     perror("listen");
+    close(sfd);
 
     return 0;
 }

diff --git a/build.sh b/build.sh
deleted file mode 100755 (executable)
index 064ecc5..0000000
--- a/build.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-if [ "build.c" -nt "build.bin" ]; then
-  cc -Wall -Wextra -Werror -o build.bin build.c
-fi
-./build.bin
\ No newline at end of file

diff --git a/lib/net/netresolve.c b/lib/net/netresolve.c
index 86611ebea300e45652f9a762acdf5c658d85a341..44a29c1bbfbd0243f26a59938b82e606974636d3 100644 (file)
--- a/lib/net/netresolve.c
+++ b/lib/net/netresolve.c
@@ -1,5 +1,10 @@
 #include <liba.h>
-#include <impl/dial.h>
+#include <libnet.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <netinet/in.h>
+#include <netinet/ip.h>
+#include <netdb.h>
 
 struct in_addr netresolve(char *hostname)
 {

diff --git a/tools/Binary b/tools/Binary
deleted file mode 100755 (executable)
index 5d5b1bc..0000000
--- a/tools/Binary
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-. config.mk
-
-if [ -d "$2" ]; then
-    echo "Binary $1"
-else
-    if [ "$2" -nt "$1" ]; then
-        echo "Binary $1"
-        mkdir -p build/bin
-        $CC $CPPPATH $CFLAGS -o "$@"
-    fi
-fi
-

diff --git a/tools/Library b/tools/Library
deleted file mode 100755 (executable)
index d2b32bd..0000000
--- a/tools/Library
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. config.mk
-
-srcdir="${1:?No library directory specified}"
-srcdir="${srcdir%/}"
-lib="${srcdir##*/}"
-mkdir -p "build/obj/$lib"
-parallel --halt now,fail=1 "Object build/obj/$lib/{/.}.o {}" ::: $srcdir/*.c
-mkdir -p "build/lib"
-
-echo Library "build/lib/$lib.a"
-ar rcs "build/lib/$lib.a" "build/obj/$lib"/*.o
\ No newline at end of file

diff --git a/tools/Object b/tools/Object
deleted file mode 100755 (executable)
index 5a43b72..0000000
--- a/tools/Object
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-. config.mk
-
-if [ "$2" -nt "$1" ]; then
-    echo "Object $1"
-    $CC $CPPPATH $CFLAGS -c -o "$@"
-fi
\ No newline at end of file

diff --git a/build.c b/tools/build.c
similarity index 98%
rename from build.c
rename to tools/build.c
index 014f49112aeceb0f4a5b57eb22dca7ff8e2272e6..3113703230a3e8467948b6559fc511bdc2c8346b 100644 (file)
--- a/build.c
+++ b/tools/build.c
@@ -6,6 +6,8 @@
 #include <dirent.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <sys/wait.h>
 
 enum { F_FILES, F_DIRS };
 
@@ -16,7 +18,7 @@ typedef struct Target {
     void (*build)(struct Target*);
 } Target;
 
-int MaxJobs = 1;
+int MaxJobs = 12;
 
 char* CCCMD[] = {
     "cc",
@@ -24,6 +26,7 @@ char* CCCMD[] = {
     "-Iinc/",
     "-I/usr/X11/include/",
     "-I/usr/X11/include/freetype2",
+    "-I/usr/include/freetype2/",
     "-c", "-o",
     /* output */
     /* inputs */

diff --git a/tools/build.sh b/tools/build.sh
new file mode 100755 (executable)
index 0000000..112e9db
--- /dev/null
+++ b/tools/build.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+if [ "tools/build.c" -nt "tools/build.bin" ]; then
+  cc -Wall -Wextra -Werror -o tools/build.bin tools/build.c
+fi
+./tools/build.bin
\ No newline at end of file