Revert "update gui makefile and parallelized package build"

This reverts commit 0f039a8.

Author: Glowman554

gui/Makefile

@@ -1,26 +1,40 @@
-LIBS = libwindow
-PROGRAMS = vflvm explorer imgview taskmgr sysctl netinfo paint
-
 all:
-	make build_libraries -j $(nproc)
-	make build_programs -j $(nproc)
-
-build_libraries: $(addsuffix _library,$(LIBS))
-build_programs: $(addsuffix _prog,$(PROGRAMS))
-
-%_library:
+	mkdir -p bin
 	mkdir -p lib
-	make -C $* library -j $(nproc)
+	
+	make -C libwindow library
 
-%_prog:
-	mkdir -p bin
-	make -C $* prog -j $(nproc)
+	make -C vflvm prog
+	make -C explorer prog
+	make -C imgview prog
+	make -C taskmgr prog
+	make -C sysctl prog
+	make -C netinfo prog
 
+	make -C paint prog
 
 clean:
-	$(foreach lib,$(LIBS),make -C $(lib) clean;)
-	$(foreach prog,$(PROGRAMS),make -C $(prog) clean;)
+	make -C libwindow clean
+
+	make -C vflvm clean
+	make -C explorer clean
+	make -C imgview clean
+	make -C taskmgr clean
+	make -C sysctl clean
+	make -C netinfo clean
+
+	make -C tic_tac_toe clean
+	make -C paint clean
+
 
 compile_flags.txt:
-	$(foreach lib,$(LIBS),make -C $(lib) compile_flags.txt;)
-	$(foreach prog,$(PROGRAMS),make -C $(prog) compile_flags.txt;)
+	make -C libwindow compile_flags.txt
+	
+	make -C vflvm compile_flags.txt
+	make -C explorer compile_flags.txt
+	make -C imgview compile_flags.txt
+	make -C taskmgr compile_flags.txt
+	make -C sysctl compile_flags.txt
+	make -C netinfo compile_flags.txt
+
+	make -C paint compile_flags.txt

pkgs/brainasm/build.sh

@@ -10,8 +10,7 @@ if [ -d "installer" ]; then
 	rm -rvf installer
 fi
 
-make -f $1 -C src/src PROGRAM=brainasm.elf AUTHOR=glowman554 LIBS_ZIP=$2 extract_libs
-make -f $1 -C src/src PROGRAM=brainasm.elf AUTHOR=glowman554 LIBS_ZIP=$2 prog -j $(nproc)
+make -f $1 -C src/src PROGRAM=brainasm.elf AUTHOR=glowman554 LIBS_ZIP=$2 extract_libs prog
 
 bash ../run_installer.sh $1 $2 $3
 cp -v installer/install.mex ../pkgs/brainasm_install.mex

pkgs/build.sh

@@ -16,18 +16,15 @@ fi
 
 mkdir -p pkgs
 
-(
-	build_dir brainasm &
-	build_dir phoenix_tools &
-	build_dir phoenixv2_tools &
-	build_dir nyanmbr &
-	build_dir doom &
-	build_dir saf &
-	build_dir nextfs &
-	build_dir mcc &
-	wait
-)
-
+build_dir brainasm
+build_dir phoenix_tools
+build_dir phoenixv2_tools
+build_dir nyanmbr
+build_dir doom
+build_dir saf
+build_dir nextfs
+build_dir mcc
+	
 (
 	cd pkgs
 	echo export ACCEPT_ALL=1 > all.msh

pkgs/doom/build.sh

@@ -19,8 +19,7 @@ if [ -d "installer" ]; then
 	rm -rvf installer
 fi
 
-make -C src LIBS_ZIP=$2 compile_flags.txt extract_libs
-make -C src LIBS_ZIP=$2 prog -j $(nproc)
+make -C src LIBS_ZIP=$2 compile_flags.txt extract_libs prog
 
 bash ../run_installer.sh $1 $2 $3
 cp -v installer/install.mex ../pkgs/doom_install.mex