Build system tweaks and testing

diff --git a/build.c b/build.c
index 9275936e32f9ca886d5ae7a57ec73aa78e02ce17..4b502fb54205d75b8704eba172d514cab30fe21a 100644 (file)
--- 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 04a9da47725930392b504016f6caa52303472e47..80350792713dfa9166caa906d10776ed0f9160c2 100644 (file)
--- 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 a3f4352ddc19f68d0d4daac02f2144a2a77ccc6f..b187b361aabd7d4e1d83debed00b7858d5771212 100644 (file)
--- 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 98326c320ae10a326d384955fb950fc124316fa0..0a2406fd2bcdf10d7a823e94606d6cadce3b6da3 100644 (file)
--- 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 fa048b2501c9fae25bc9cd96aa93891df03bea8d..70761b576208bfc4ab879f0b9fb661f9c2240e42 100644 (file)
--- a/src/xpm.c
+++ b/src/xpm.c
@@ -6,6 +6,7 @@
 #include <string.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
+#include <sys/wait.h>
 #include <unistd.h>
 
 #include "cbs.h"