diff --git a/.gitignore b/.gitignore index 6151ace..b09ae44 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,10 @@ # Build build +# Dependencies +oki-lock.toml +oki-packages + # Executables test* !test/ diff --git a/guess-mime-type/Makefile b/guess-mime-type/Makefile index 5f05db0..2604806 100644 --- a/guess-mime-type/Makefile +++ b/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 $@ diff --git a/guess-mime-type/oki.toml b/guess-mime-type/oki.toml index 5b7081d..7e1bd03 100644 --- a/guess-mime-type/oki.toml +++ b/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" diff --git a/linked-list/Makefile b/linked-list/Makefile index 74b3889..d32d0f1 100644 --- a/linked-list/Makefile +++ b/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 diff --git a/linked-list/oki.toml b/linked-list/oki.toml index bbc4f4f..0ca5cd0 100644 --- a/linked-list/oki.toml +++ b/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" diff --git a/mths/oki.toml b/mths/oki.toml index 47be0a7..a3b69d6 100644 --- a/mths/oki.toml +++ b/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" diff --git a/shell-escape/Makefile b/shell-escape/Makefile index 07d4758..d14257a 100644 --- a/shell-escape/Makefile +++ b/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 $@ diff --git a/shell-escape/oki.toml b/shell-escape/oki.toml index fd9c617..bbf75df 100644 --- a/shell-escape/oki.toml +++ b/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" diff --git a/shell-escape/src/escape.c b/shell-escape/src/escape.c index 457c06e..b0a2437 100644 --- a/shell-escape/src/escape.c +++ b/shell-escape/src/escape.c @@ -1,6 +1,6 @@ #include "escape.h" -#include +#include #include #include diff --git a/shell-escape/third-party/static-string-builder b/shell-escape/third-party/static-string-builder deleted file mode 120000 index bc84a1f..0000000 --- a/shell-escape/third-party/static-string-builder +++ /dev/null @@ -1 +0,0 @@ -../../static-string-builder/src/ \ No newline at end of file diff --git a/static-string-builder/Makefile b/static-string-builder/Makefile index 483402c..dfde88a 100644 --- a/static-string-builder/Makefile +++ b/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: diff --git a/static-string-builder/oki.toml b/static-string-builder/oki.toml index 62d2bba..8706f7f 100644 --- a/static-string-builder/oki.toml +++ b/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" diff --git a/static-string-builder/src/builder.c b/static-string-builder/src/string-builder.c similarity index 96% rename from static-string-builder/src/builder.c rename to static-string-builder/src/string-builder.c index ff7f048..ad9fd8e 100644 --- a/static-string-builder/src/builder.c +++ b/static-string-builder/src/string-builder.c @@ -1,4 +1,4 @@ -#include "builder.h" +#include "string-builder.h" #include #include diff --git a/static-string-builder/src/builder.h b/static-string-builder/src/string-builder.h similarity index 100% rename from static-string-builder/src/builder.h rename to static-string-builder/src/string-builder.h diff --git a/static-string-builder/test/testBuilder.c b/static-string-builder/test/testBuilder.c index 127ed4b..bbc15b4 100644 --- a/static-string-builder/test/testBuilder.c +++ b/static-string-builder/test/testBuilder.c @@ -2,7 +2,7 @@ #include #include -#include "builder.h" +#include "string-builder.h" int main(void) { char *result = tmp_end();