diff --git a/BaS_gcc/Makefile b/BaS_gcc/Makefile
index 817652b..4ad50d8 100644
--- a/BaS_gcc/Makefile
+++ b/BaS_gcc/Makefile
@@ -186,6 +186,8 @@ clean:
 		do rm -f $$d/*.map $$d/*.s19 $$d/*.elf $$d/*.lk $$d/*.a $$d/objs/* $$d/depend;\
 	done
 	rm -f tags
+	(cd tos; make clean)
+
 
 
 # flags for targets
diff --git a/BaS_gcc/tos/Makefile b/BaS_gcc/tos/Makefile
index bd57ace..7034dd3 100644
--- a/BaS_gcc/tos/Makefile
+++ b/BaS_gcc/tos/Makefile
@@ -17,3 +17,11 @@ vmem_test:
 pci_test:
 	$(MAKE) -C $@
 
+.PHONY: clean
+clean:
+	(cd jtagwait; make clean)
+	(cd bascook; make clean)
+	(cd vmem_test; make clean)
+	(cd pci_test; make clean)
+
+
diff --git a/BaS_gcc/tos/bascook/Makefile b/BaS_gcc/tos/bascook/Makefile
index 62a065f..a04eee0 100755
--- a/BaS_gcc/tos/bascook/Makefile
+++ b/BaS_gcc/tos/bascook/Makefile
@@ -23,7 +23,9 @@ TOPDIR= ../..
 
 BAS_INCLUDE=-I$(TOPDIR)/../BaS_gcc/include
 
-INCLUDE=-I$(TOPDIR)/../libcmini/include $(BAS_INCLUDE) -nostdlib
+LIBCMINI=$(TOPDIR)/../libcmini/libcmini
+
+INCLUDE=-I$(LIBCMINI)/include $(BAS_INCLUDE) -nostdlib
 LIBS=-lcmini -nostdlib -lgcc
 CC=$(PREFIX)/bin/gcc
 
@@ -72,7 +74,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
 
 $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
 $(1)/$(APP): $$($(1)_OBJS)
-	$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/m5475/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/m5475 $(LIBS)
+	$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/m5475/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/m5475 $(LIBS)
 	$(STRIP) $$@
 endef
 $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
@@ -90,8 +92,7 @@ clean:
 
 .PHONY: printvars
 printvars:
-	@$(foreach V,$(.VARIABLES), $(if $(filter-out environment% default automatic, $(origin $V)),$(warning $V=$($V))))
-
+	@$(foreach V,$(.VARIABLES), $(if $(filter-out environment% default automatic, $(origin $V)),$(warning $V=$($V)))) 
 ifneq (clean,$(MAKECMDGOALS))
 -include $(DEPEND)
 endif
diff --git a/BaS_gcc/tos/jtagwait/Makefile b/BaS_gcc/tos/jtagwait/Makefile
index 769e385..29f21bc 100755
--- a/BaS_gcc/tos/jtagwait/Makefile
+++ b/BaS_gcc/tos/jtagwait/Makefile
@@ -21,7 +21,9 @@ endif
 DEPEND=depend
 TOPDIR = ../..
 
-INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib
+LIBCMINI=$(TOPDIR)/../libcmini/libcmini
+
+INCLUDE=-I$(LIBCMINI)/include -nostdlib
 LIBS=-lcmini -nostdlib -lgcc
 CC=$(PREFIX)/bin/gcc
 
@@ -78,7 +80,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
 
 $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
 $(1)/$(APP): $$($(1)_OBJS)
-	$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS)
+	$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS)
 	$(STRIP) $$@
 endef
 $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
diff --git a/BaS_gcc/tos/pci_test/Makefile b/BaS_gcc/tos/pci_test/Makefile
index 215fd62..b3ec937 100755
--- a/BaS_gcc/tos/pci_test/Makefile
+++ b/BaS_gcc/tos/pci_test/Makefile
@@ -21,7 +21,9 @@ endif
 DEPEND=depend
 TOPDIR = ../..
 
-INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib
+LIBCMINI=$(TOPDIR)/../libcmini/libcmini
+
+INCLUDE=-I$(LIBCMINI)/include -nostdlib
 LIBS=-lcmini -nostdlib -lgcc
 CC=$(PREFIX)/bin/gcc
 
@@ -79,7 +81,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
 
 $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
 $(1)/$(APP): $$($(1)_OBJS)
-	$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS)
+	$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS)
 	$(STRIP) $$@
 endef
 $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))
diff --git a/BaS_gcc/tos/vmem_test/Makefile b/BaS_gcc/tos/vmem_test/Makefile
index e029809..a75b4fe 100755
--- a/BaS_gcc/tos/vmem_test/Makefile
+++ b/BaS_gcc/tos/vmem_test/Makefile
@@ -21,7 +21,9 @@ endif
 DEPEND=depend
 TOPDIR = ../..
 
-INCLUDE=-I$(TOPDIR)/../libcmini/include -nostdlib
+LIBCMINI=$(TOPDIR)/../libcmini/libcmini
+
+INCLUDE=-I$(LIBCMINI)/include -nostdlib
 LIBS=-lcmini -nostdlib -lgcc
 CC=$(PREFIX)/bin/gcc
 
@@ -79,7 +81,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S
 
 $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS))
 $(1)/$(APP): $$($(1)_OBJS)
-	$(CC) $$(CFLAGS) -o $$@ $(TOPDIR)/../libcmini/$(1)/startup.o $$($(1)_OBJS) -L$(TOPDIR)/../libcmini/$(1) $(LIBS)
+	$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/$(1)/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/$(1) $(LIBS)
 	#$(STRIP) $$@
 endef
 $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR))))