Makefile: Only provide one make rule for each directory

Otherwise we end up with warnings like this,

   Makefile:258: warning: overriding recipe for target `efi'
   Makefile:253: warning: ignoring old recipe for target `efi'

Signed-off-by: Matt Fleming <matt.fleming@intel.com>

diff --git a/Makefile b/Makefile
index 15d0a98..a4daae5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -247,14 +247,7 @@ all-local: $(BTARGET) $(ITARGET)
        -ls -l $(BOBJECTS) $(IOBJECTS)
 subdirs: $(BSUBDIRS) $(ISUBDIRS)
 
-# Note the double-colon which avoids the make warning about redefining
-# a rule for libinstaller.
-$(BSUBDIRS):
-       @mkdir -p $@
-       $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \
-               -f $(SRC)/$@/Makefile $(MAKECMDGOALS)
-
-$(ISUBDIRS):
+$(sort $(ISUBDIRS) $(BSUBDIRS)):
        @mkdir -p $@
        $(MAKE) -C $@ SRC="$(SRC)/$@" OBJ="$(OBJ)/$@" \
                -f $(SRC)/$@/Makefile $(MAKECMDGOALS)