From 79af847f90e5013dd9dd0680101406b4484572e3 Mon Sep 17 00:00:00 2001 From: Trent Huber Date: Mon, 5 May 2025 22:56:35 -0400 Subject: [PATCH] Build system tweaks and testing --- build.c | 3 +-- clean.c | 10 +++++----- external/build.c | 1 + src/colors/build.c | 1 + src/xpm.c | 1 + 5 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.c b/build.c index 9275936..4b502fb 100644 --- a/build.c +++ b/build.c @@ -9,8 +9,7 @@ int main(void) { build("external/"); build("src/"); - cflags = (char *[]){CFCBS, NULL}; - compile("clean", CBS, NULL); + compile("clean", NULL); load('x', "clean", "clean", NULL); diff --git a/clean.c b/clean.c index 04a9da4..8035079 100644 --- a/clean.c +++ b/clean.c @@ -1,14 +1,14 @@ #define ROOT #include "build.h" -#define COLORS SRC "colors.c" +#include "external/cbs/cbs.c" + #define FIND "/usr/bin/find" -#define FONT SRC "font.c" +#define RM "/bin/rm" #define GENCOLORS SRC "colors/gencolors" #define GENFONT SRC "font/genfont" -#define RM "/bin/rm" - -#include "external/cbs/cbs.c" +#define COLORS SRC "colors.c" +#define FONT SRC "font.c" int main(void) { char *what, **whos, **regexes, ***rms; diff --git a/external/build.c b/external/build.c index a3f4352..b187b36 100644 --- a/external/build.c +++ b/external/build.c @@ -37,6 +37,7 @@ void cbs(void) { cflags = (char *[]){CFPIC, NULL}; compile(CBSSRC, NULL); + load(LIBTYPE, CBSLIB, CBSSRC, NULL); } diff --git a/src/colors/build.c b/src/colors/build.c index 98326c3..0a2406f 100644 --- a/src/colors/build.c +++ b/src/colors/build.c @@ -9,6 +9,7 @@ int main(void) { build(NULL); compile("gencolors", NULL); + load('x', "gencolors", "gencolors", NULL); if (modified(COLORS, "gencolors.c") || modified(COLORS, "rgb.txt")) diff --git a/src/xpm.c b/src/xpm.c index fa048b2..70761b5 100644 --- a/src/xpm.c +++ b/src/xpm.c @@ -6,6 +6,7 @@ #include #include #include +#include #include #include "cbs.h" -- 2.51.0