diff --git a/pcomp/Makefile b/pcomp/Makefile
index 3f6473d..3a6d10b 100644
--- a/pcomp/Makefile
+++ b/pcomp/Makefile
@@ -9,15 +9,14 @@ LIBGEN=./libgen
 .pas:
 	fpc -Mobjfpc -gl $<
 
-all: pcomp sasm sdis libgen lsymgen
+all: pcomp sasm sdis lsymgen shortgen
 
-libs: pcomp sasm lsymgen libgen
+libs: pcomp sasm lsymgen shortgen
 	$(SASM) ../lib/coreloader.s
 	$(LSYMGEN) ../lib/coreloader.sym
 	$(PCOMP) -n ../lib/stdlib.pas
-	$(LIBGEN) ../lib/stdlib.s
-	$(LIBGEN) ../lib/runtime.s
-	$(LIBGEN) ../lib/float32.s
+	$(SASM) ../lib/stdlibwrap.s ../lib/stdlib.lib
+	$(LSYMGEN) ../lib/stdlibwrap.sym ../lib/stdlib.lsym
 
 nativecomp: pcomp sasm libs
 	$(PCOMP) sasm.pas