More programs, more libraries. src/modules build files are now saner.

util/ack/build.lua

@@ -29,7 +29,7 @@ cprogram {
 }
 
 installable {
-	name = "ack-pkg",
+	name = "pkg",
 	map = {
 		["$(INSDIR)/bin/ack"] = "+ack",
 		["$(INSDIR)/share/man/man1/ack.1"] = "./ack.1.X",
@@ -37,62 +37,3 @@ installable {
 	}
 }
 
---[[
-D := util/ack
-
-define util-ack-makeheaders-rule
-$(eval g := $(OBJDIR)/$D/dmach.c $(OBJDIR)/$D/intable.c)
-$(wordlist 2, $(words $g), $g): $(firstword $g)
-$(firstword $g): $(util-ack-mktables)
-	@echo MKTABLES
-	@mkdir -p $(OBJDIR)/$D
-	$(hide) cd $(OBJDIR)/$D && $(util-ack-mktables) $(INSDIR)/share
-
-$(eval CLEANABLES += $g)
-endef
-
-define build-ack-impl
-	$(call reset)
-	$(call cfile, $D/mktables.c)
-	$(call cprogram, $(OBJDIR)/$D/mktables)
-	$(eval util-ack-mktables := $o)
-
-	$(call reset)
-	$(eval cflags += -I$D)
-	$(call cfile, $D/list.c)
-	$(call cfile, $D/data.c)
-	$(call cfile, $D/main.c)
-	$(call cfile, $D/scan.c)
-	$(call cfile, $D/svars.c)
-	$(call cfile, $D/trans.c)
-	$(call cfile, $D/util.c)
-
-	$(call cfile, $D/rmach.c)
-	$(call dependson, $(INCDIR)/em_path.h)
-
-	$(call cfile, $D/run.c)
-	$(call cfile, $D/grows.c)
-
-	$(call cfile, $D/files.c)
-	$(call dependson, $(INCDIR)/em_path.h)
-
-	$(eval $(util-ack-makeheaders-rule))
-	$(call cfile, $(OBJDIR)/$D/dmach.c)
-	$(call cfile, $(OBJDIR)/$D/intable.c)
-
-	$(call cprogram, $(BINDIR)/ack)
-	$(call installto, $(INSDIR)/bin/ack)
-	$(eval ACK := $o)
-
-	$(call reset)
-	$(eval q := lib/descr/fe)
-	$(call installto, $(PLATIND)/descr/fe)
-	$(eval $(ACK): $o)
-
-	$(call reset)
-	$(eval q := $D/ack.1.X)
-	$(call installto, $(INSDIR)/share/man/man1/ack.1)
-endef
-
-$(eval $(build-ack-impl))
---]]

util/amisc/build.lua

@@ -4,7 +4,7 @@ local function simpleprogram(name)
 		srcs = { "./"..name..".c" },
 		deps = {
 			"h+emheaders",
-			"modules+object",
+			"modules/src/object+lib",
 		}
 	}
 

util/arch/build.lua

@@ -0,0 +1,19 @@
+cprogram {
+	name = "aal",
+	srcs = { "./archiver.c" },
+	deps = {
+		"h+emheaders",
+		"modules/src/object+lib",
+		"modules/src/print+lib",
+		"modules/src/string+lib",
+		"modules/src/system+lib"
+	}
+}
+
+installable {
+	name = "pkg",
+	map = {
+		["$(INSDIR)/bin/aal"] = "+aal",
+		["$(PLATIND)/man/man1/aal.1"] = "./aal.1"
+	}
+}

util/data/build.lua

@@ -21,7 +21,7 @@ normalrule {
 }
 
 clibrary {
-	name = "libem",
+	name = "em_data",
 	srcs = {
 		"./em_ptyp.c",
 		"+generated", -- so we build the C files