Ajoute les informations pour compiler

.gitignore

@@ -6,6 +6,10 @@
 # Build
 build
 
+# Dependencies
+oki-lock.toml
+oki-packages
+
 # Executables
 test*
 !test/

guess-mime-type/Makefile

@@ -12,6 +12,9 @@ testGuess: build/mimetype.o build/testGuess.o
 build/mimetype.o: src/mimetype.c src/mimetype.h | build
 	$(CC) $(CFLAGS) -c $< -o $@
 
+build/mimetype.a: build/mimetype.o
+	ar rcs $@ $^
+
 build/testGuess.o: test/testGuess.c src/mimetype.h | build
 	$(CC) $(CFLAGS) -Isrc/ -c $< -o $@
 

guess-mime-type/oki.toml

@@ -3,3 +3,9 @@ name = "guess-mime-type"
 version = "0.1.0"
 description = "Guess mime type from a filename"
 license = "MIT"
+include = ["src", "Makefile"]
+
+[lib.c]
+build-static = "make build/mimetype.a"
+static-link = "build/mimetype.a"
+export = "src"

linked-list/Makefile

@@ -9,6 +9,9 @@ testLinkedList: build/linkedList.o build/testLinkedList.o
 build/linkedList.o: src/linkedList.c src/linkedList.h | build
 	gcc -Wall -c src/linkedList.c -o build/linkedList.o
 
+build/linkedList.a: build/linkedList.o
+	ar rcs $@ $^
+
 build/testLinkedList.o: test/testLinkedList.c src/linkedList.h | build	
 	gcc -Wall -Isrc/ -c test/testLinkedList.c -o build/testLinkedList.o
 

linked-list/oki.toml

@@ -3,3 +3,9 @@ name = "linked-list"
 version = "0.0.1"
 description = "Minimalist simple linked list"
 license = "MIT"
+include = ["src", "Makefile"]
+
+[lib.c]
+build-static = "make build/linkedList.a"
+static-link = "build/linkedList.a"
+export = "src"

mths/oki.toml

@@ -3,3 +3,7 @@ name = "mths"
 version = "0.2.0"
 description = "Numbers related helper macros"
 license = "MIT"
+include = ["src", "Makefile"]
+
+[lib.c]
+export = "src"

shell-escape/Makefile

@@ -1,6 +1,6 @@
 CC := gcc
 CFLAGS := -Wall -Wextra
-CPPFLAGS := -isystemthird-party
+CPPFLAGS := -isystemoki-packages/static-string-builder/src
 
 all: test
 
@@ -13,6 +13,9 @@ testEscape: build/escape.o build/testEscape.o ../static-string-builder/build/bui
 build/escape.o: src/escape.c src/escape.h | build
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $@
 
+build/escape.a: build/escape.o
+	ar rcs $@ $^
+
 build/testEscape.o: test/testEscape.c src/escape.h | build
 	$(CC) $(CPPFLAGS) $(CFLAGS) -Isrc/ -c $< -o $@
 

shell-escape/oki.toml

@@ -3,6 +3,12 @@ name = "shell-escape"
 version = "0.1.0"
 description = "Escape shell characters"
 license = "MIT"
+include = ["src", "Makefile"]
+
+[lib.c]
+build-static = "make build/escape.a"
+static-link = "build/escape.a"
+export = "src"
 
 [dependencies]
 static-string-builder = "^0.1.0"

shell-escape/src/escape.c

@@ -1,6 +1,6 @@
 #include "escape.h"
 
-#include <static-string-builder/builder.h>
+#include <string-builder.h>
 
 #include <ctype.h>
 #include <stdbool.h>

shell-escape/third-party/static-string-builder

@@ -1 +0,0 @@
-../../static-string-builder/src/

static-string-builder/Makefile

@@ -9,10 +9,13 @@ test: testBuilder
 testBuilder: build/builder.o build/testBuilder.o
 	$(CC) -o $@ $^
 
-build/builder.o: src/builder.c src/builder.h | build
+build/builder.o: src/string-builder.c src/string-builder.h | build
 	$(CC) $(CFLAGS) -c $< -o $@
 
-build/testBuilder.o: test/testBuilder.c src/builder.h | build
+build/builder.a: build/builder.o
+	ar rcs $@ $^
+
+build/testBuilder.o: test/testBuilder.c src/string-builder.h | build
 	$(CC) $(CFLAGS) -Isrc/ -c $< -o $@
 
 build:

static-string-builder/oki.toml

@@ -3,3 +3,9 @@ name = "static-string-builder"
 version = "0.1.1"
 description = "Global string builder"
 license = "MIT"
+include = ["src", "Makefile"]
+
+[lib.c]
+build-static = "make build/builder.a"
+static-link = "build/builder.a"
+export = "src"

static-string-builder/src/string-builder.c

@@ -1,4 +1,4 @@
-#include "builder.h"
+#include "string-builder.h"
 
 #include <assert.h>
 #include <string.h>

static-string-builder/test/testBuilder.c

@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "builder.h"
+#include "string-builder.h"
 
 int main(void) {
     char *result = tmp_end();