diff --git a/asoft_presenter/presenter_demo/Makefile b/asoft_presenter/presenter_demo/Makefile
index 119caad5..76f5e77c 100644
--- a/asoft_presenter/presenter_demo/Makefile
+++ b/asoft_presenter/presenter_demo/Makefile
@@ -1,6 +1,9 @@
-CC = gcc
-CFLAGS = -O2 -Wall
-LFLAGS = 
+ASOFT_PRESENTER = ../asoft_presenter
+DOS33 = ../../dos33fs-utils/dos33
+PCX2HGR = ../../hgr-utils/pcx2hgr
+SHAPE_TABLE = ../../hgr-utils/shape_table
+TOKENIZE_ASOFT = ../../asoft_basic-utils/tokenize_asoft
+
 
 all:	presenter_demo.dsk
 
@@ -10,54 +13,54 @@ presenter_demo.dsk:	PRESENTER_DEMO \
 	MKL_PLASMA.HGR PLASMA_CHOLESKY.HGR \
 	RAPL_INT_FP.HGR \
 	NUM.SHAPE MMM LOAD_DEMO
-	../dos33 -y presenter_demo.dsk SAVE A PRESENTER_DEMO
-	../dos33 -y presenter_demo.dsk SAVE B TITLE.HGR
-	../dos33 -y presenter_demo.dsk SAVE B PLASMA_DPOSV.HGR
-	../dos33 -y presenter_demo.dsk SAVE B RAPL_MICRO.HGR
-	../dos33 -y presenter_demo.dsk SAVE B MKL_PLASMA.HGR
-	../dos33 -y presenter_demo.dsk SAVE B NUM.SHAPE
-	../dos33 -y presenter_demo.dsk SAVE B WATTSUP.HGR
-	../dos33 -y presenter_demo.dsk SAVE B PLASMA_CHOLESKY.HGR
-	../dos33 -y presenter_demo.dsk SAVE B RAPL_INT_FP.HGR
-	../dos33 -y presenter_demo.dsk SAVE A MMM
-	../dos33 -y presenter_demo.dsk SAVE A LOAD_DEMO
+	$(DOS33) -y presenter_demo.dsk SAVE A PRESENTER_DEMO
+	$(DOS33) -y presenter_demo.dsk SAVE B TITLE.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE B PLASMA_DPOSV.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE B RAPL_MICRO.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE B MKL_PLASMA.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE B NUM.SHAPE
+	$(DOS33) -y presenter_demo.dsk SAVE B WATTSUP.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE B PLASMA_CHOLESKY.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE B RAPL_INT_FP.HGR
+	$(DOS33) -y presenter_demo.dsk SAVE A MMM
+	$(DOS33) -y presenter_demo.dsk SAVE A LOAD_DEMO
 
 RAPL_INT_FP.HGR:	rapl_int_fp.pcx
-	../pcx2hgr rapl_int_fp.pcx > RAPL_INT_FP.HGR
+	$(PCX2HGR) rapl_int_fp.pcx > RAPL_INT_FP.HGR
 
 PLASMA_CHOLESKY.HGR:	plasma_cholesky.pcx
-	../pcx2hgr plasma_cholesky.pcx > PLASMA_CHOLESKY.HGR
+	$(PCX2HGR) plasma_cholesky.pcx > PLASMA_CHOLESKY.HGR
 
 MKL_PLASMA.HGR:		mkl_plasma_energy.pcx
-	../pcx2hgr mkl_plasma_energy.pcx > MKL_PLASMA.HGR
+	$(PCX2HGR) mkl_plasma_energy.pcx > MKL_PLASMA.HGR
 
 LOAD_DEMO:		load_demo.bas
-	../tokenize_asoft < load_demo.bas > LOAD_DEMO
+	$(TOKENIZE_ASOFT) < load_demo.bas > LOAD_DEMO
 
 WATTSUP.HGR:		wattsup.pcx
-	../pcx2hgr wattsup.pcx > WATTSUP.HGR
+	$(PCX2HGR) wattsup.pcx > WATTSUP.HGR
 
 RAPL_MICRO.HGR:		rapl_micro.pcx
-	../pcx2hgr rapl_micro.pcx > RAPL_MICRO.HGR
+	$(PCX2HGR) rapl_micro.pcx > RAPL_MICRO.HGR
 
 
 PLASMA_DPOSV.HGR:	plasma-dposv-power.pcx
-	../pcx2hgr plasma-dposv-power.pcx > PLASMA_DPOSV.HGR
+	$(PCX2HGR) plasma-dposv-power.pcx > PLASMA_DPOSV.HGR
 
 MMM:		mmm.bas
-	../tokenize_asoft < mmm.bas > MMM
+	$(TOKENIZE_ASOFT) < mmm.bas > MMM
 
 NUM.SHAPE:	num.table
-	../shape_table -b < num.table > NUM.SHAPE
+	$(SHAPE_TABLE) -b < num.table > NUM.SHAPE
 
-TITLE.HGR:	title.pcx ../pcx2hgr
-	../pcx2hgr title.pcx > TITLE.HGR
+TITLE.HGR:	title.pcx $(PCX2HGR)
+	$(PCX2HGR) title.pcx > TITLE.HGR
 
 PRESENTER_DEMO:	demo.bas
-	../tokenize_asoft < demo.bas > PRESENTER_DEMO
+	$(TOKENIZE_ASOFT) < demo.bas > PRESENTER_DEMO
 
-demo.bas:		../asoft_presenter info
-	../asoft_presenter . > demo.bas
+demo.bas:		$(ASOFT_PRESENTER) info
+	$(ASOFT_PRESENTER) . > demo.bas
 
 clean:	
 	rm -f *~ *.IMG *.HGR demo.bas PRESENTER_DEMO NUM.SHAPE MMM LOAD_DEMO