diff --git a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile
index c005ad1..d6b0002 100644
--- a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/Makefile
@@ -34,9 +34,12 @@ SRCS		=	\
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
 
-EXO_DEPENDS	=	\
-                ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/ctr_bootrom11.padbin \
-                ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/ctr_bootrom9.padbin \
+BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/ctr_bootrom11.padbin
+BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/ctr_bootrom9.padbin
+BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
+
+MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
+               -DBROM_PADBIN_ARM9=$(BROM_PADBIN_ARM9) \
 
 
 include	$(CTRBROM_ROOT)/build/buildtools/commondefs
@@ -52,7 +55,7 @@ do-build:		$(TARGETS)
 include	$(CTRBROM_ROOT)/build/buildtools/modulerules
 
 
-crt0.c : $(EXO_DEPENDS)
+crt0.c : $(BROM_DEPENDS)
 	touch crt0.c
 
 
diff --git a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c
index aa3bf18..6fc177c 100644
--- a/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c
+++ b/trunk/bootrom/build/bootrom/ctr_bootrom/rom/crt0.c
@@ -35,7 +35,7 @@ asm void _start( void )
         EXPORT  CTR_BROM_ARM9
 
 CTR_BROM_ARM11
-        INCBIN  ../ARM11/bin/BROM_BUILDTYPE_ARM11/ctr_bootrom11.padbin
+        INCBIN  BROM_PADBIN_ARM11
 CTR_BROM_ARM9
-        INCBIN  ../ARM9/bin/BROM_BUILDTYPE_ARM9/ctr_bootrom9.padbin
+        INCBIN  BROM_PADBIN_ARM9
 }
diff --git a/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile b/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile
index b3210f6..df8122e 100644
--- a/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/jtag-only/rom/Makefile
@@ -34,9 +34,12 @@ SRCS		=	\
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
 
-EXO_DEPENDS	=	\
-                ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/brom11_jtag_only.padbin \
-                ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/brom9_jtag_only.padbin \
+BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/brom11_jtag_only.padbin
+BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/brom9_jtag_only.padbin
+BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
+
+MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
+               -DBROM_PADBIN_ARM9=$(BROM_PADBIN_ARM9) \
 
 
 include	$(CTRBROM_ROOT)/build/buildtools/commondefs
@@ -52,7 +55,7 @@ do-build:		$(TARGETS)
 include	$(CTRBROM_ROOT)/build/buildtools/modulerules
 
 
-crt0.c : $(EXO_DEPENDS)
+crt0.c : $(BROM_DEPENDS)
 	touch crt0.c
 
 
diff --git a/trunk/bootrom/build/bootrom/jtag-only/rom/crt0.c b/trunk/bootrom/build/bootrom/jtag-only/rom/crt0.c
index 7cfb522..6fc177c 100644
--- a/trunk/bootrom/build/bootrom/jtag-only/rom/crt0.c
+++ b/trunk/bootrom/build/bootrom/jtag-only/rom/crt0.c
@@ -35,7 +35,7 @@ asm void _start( void )
         EXPORT  CTR_BROM_ARM9
 
 CTR_BROM_ARM11
-        INCBIN  ../ARM11/bin/BROM_BUILDTYPE_ARM11/brom11_jtag_only.padbin
+        INCBIN  BROM_PADBIN_ARM11
 CTR_BROM_ARM9
-        INCBIN  ../ARM9/bin/BROM_BUILDTYPE_ARM9/brom9_jtag_only.padbin
+        INCBIN  BROM_PADBIN_ARM9
 }
diff --git a/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile b/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile
index 1d708e0..1e149ea 100644
--- a/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile
+++ b/trunk/bootrom/build/bootrom/teg-dev/rom/Makefile
@@ -34,9 +34,12 @@ SRCS		=	\
 #SRCDIR		=	# using default
 #LCFILE		=	# using default
 
-EXO_DEPENDS	=	\
-                ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/teg_dev11.padbin \
-                ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/teg_dev9.padbin \
+BROM_PADBIN_ARM11 = ../ARM11/bin/$(BROM_BUILDTYPE_ARM11)/teg_dev11.padbin
+BROM_PADBIN_ARM9  = ../ARM9/bin/$(BROM_BUILDTYPE_ARM9)/teg_dev9.padbin
+BROM_DEPENDS = $(BROM_PADBIN_ARM11) $(BROM_PADBIN_ARM9)
+
+MACRO_FLAGS += -DBROM_PADBIN_ARM11=$(BROM_PADBIN_ARM11) \
+               -DBROM_PADBIN_ARM9=$(BROM_PADBIN_ARM9) \
 
 
 include	$(CTRBROM_ROOT)/build/buildtools/commondefs
@@ -52,7 +55,7 @@ do-build:		$(TARGETS)
 include	$(CTRBROM_ROOT)/build/buildtools/modulerules
 
 
-crt0.c : $(EXO_DEPENDS)
+crt0.c : $(BROM_DEPENDS)
 	touch crt0.c
 
 
diff --git a/trunk/bootrom/build/bootrom/teg-dev/rom/crt0.c b/trunk/bootrom/build/bootrom/teg-dev/rom/crt0.c
index 1c043ed..6fc177c 100644
--- a/trunk/bootrom/build/bootrom/teg-dev/rom/crt0.c
+++ b/trunk/bootrom/build/bootrom/teg-dev/rom/crt0.c
@@ -35,7 +35,7 @@ asm void _start( void )
         EXPORT  CTR_BROM_ARM9
 
 CTR_BROM_ARM11
-        INCBIN  ../ARM11/bin/BROM_BUILDTYPE_ARM11/teg_dev11.padbin
+        INCBIN  BROM_PADBIN_ARM11
 CTR_BROM_ARM9
-        INCBIN  ../ARM9/bin/BROM_BUILDTYPE_ARM9/teg_dev9.padbin
+        INCBIN  BROM_PADBIN_ARM9
 }