From 8221fd5451f094defa9866f98026b74a969f7693 Mon Sep 17 00:00:00 2001
From: Benji Dial <benji6283@gmail.com>
Date: Mon, 8 Mar 2021 14:46:19 -0500
Subject: resizable widgets, default widget implementation for some functions,
 reimplementing meminfo in raleigh

---
 makefile | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'makefile')

diff --git a/makefile b/makefile
index cea7ddd..9fb6cd1 100644
--- a/makefile
+++ b/makefile
@@ -103,9 +103,10 @@ obj/popups.so: obj/popups/info.o obj/popups/popup.o
 	ld ${partlink} $^ -o $@
 
 obj/raleigh.so: obj/raleigh/runtime.po   obj/raleigh/window.po   \
-                obj/raleigh/w/label.po   obj/raleigh/util.po     \
+                obj/raleigh/widget.po    obj/raleigh/util.po     \
                 obj/raleigh/w/padding.po obj/raleigh/w/button.po \
-                obj/raleigh/w/vbox.po    obj/raleigh/w/entry.po
+                obj/raleigh/w/vbox.po    obj/raleigh/w/entry.po  \
+                obj/raleigh/w/label.po
 	ld ${partlink} $^ -o $@
 
 obj/init.elf: obj/init/init.o obj/knob.so obj/c.rto
@@ -116,9 +117,9 @@ obj/highway.elf: obj/highway/main.o obj/highway/cmds.o obj/highway/line.o \
                  obj/c.rto
 	ld ${clink} $^ -o $@
 
-obj/meminfo.elf: obj/meminfo/meminfo.o obj/popups.so obj/libfont.so \
-                 obj/knob.so           obj/c.rto
-	ld ${clink} $^ -o $@
+obj/meminfo.elf: obj/meminfo/meminfo.po obj/raleigh.so obj/popups.so \
+                 obj/libfont.so         obj/knob.so    obj/cxx.rto
+	ld ${cxxlink} $^ -o $@
 
 obj/terminal.elf: obj/terminal/main.o obj/libfont.so obj/knob.so \
                   obj/c.rto
-- 
cgit v1.2.3