software: more flexible compilation target

diff --git a/software/bios/Makefile b/software/bios/Makefile
index 4d4fcdd4c31a8643a0c0f9db7e6c1b1e7fbfe65c..bfd0aafa5e51c4adfca3e21aafb7417d10aee4fb 100644 (file)
--- a/software/bios/Makefile
+++ b/software/bios/Makefile
@@ -24,6 +24,9 @@ bios-rescue.elf: linker-rescue.ld $(OBJECTS) libs
                -lbase -lcompiler_rt
        chmod -x $@
 
+%.o: %.c
+       $(compile-dep)
+
 libs:
        make -C $(M2DIR)/software/libbase
 

diff --git a/software/common.mak b/software/common.mak
index 45dffd6d1c003bf61e4732083de609df006df61a..046557a9fccc55dea286dad0904e202173229a07 100644 (file)
--- a/software/common.mak
+++ b/software/common.mak
@@ -37,11 +37,12 @@ LDFLAGS = -nostdlib -nodefaultlibs
 # compile and generate dependencies, based on
 # http://scottmcpeak.com/autodepend/autodepend.html
 
-%.o: $(SRCDIR)%.c
-       $(CC) -c $(CFLAGS) $(SRCDIR)$*.c -o $*.o
-       @$(CC_normal) -MM $(CFLAGS) $(SRCDIR)$*.c > $*.d
-       @mv -f $*.d $*.d.tmp
-       @sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
-       @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
-         sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
-       @rm -f $*.d.tmp
+define compile-dep =
+$(CC) -c $(CFLAGS) $< -o $*.o
+@$(CC_normal) -MM $(CFLAGS) $< > $*.d
+@mv -f $*.d $*.d.tmp
+@sed -e 's|.*:|$*.o:|' < $*.d.tmp > $*.d
+@sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | \
+       sed -e 's/^ *//' -e 's/$$/:/' >> $*.d
+@rm -f $*.d.tmp
+endef

diff --git a/software/libbase/Makefile b/software/libbase/Makefile
index afa5650f7eb97d430e9238ca35cf205418997e38..5c938db9070b231daebffa75c6c3801533e47cdc 100644 (file)
--- a/software/libbase/Makefile
+++ b/software/libbase/Makefile
@@ -12,6 +12,9 @@ libbase.a: $(OBJECTS)
        $(AR) clr libbase.a $(OBJECTS)
        $(RANLIB) libbase.a
 
+%.o: %.c
+       $(compile-dep)
+
 .PHONY: clean
 
 clean: