7438 intermittent build failures from the new boot loader
Reviewed by: Gordon Ross <gordon.w.ross@gmail.com>
Reviewed by: Toomas Soome <tsoome@me.com>

*** 9,18 ****
--- 9,19 ----
  # http://www.illumos.org/license/CDDL.
  #
  
  #
  # Copyright 2016 Toomas Soome <tsoome@me.com>
+ # Copyright 2016 RackTop Systems.
  #
  
  include $(SRC)/Makefile.master
  
  CC=             $(GCC_ROOT)/bin/gcc
*** 86,96 ****
  
  CLEANFILES=     vers.c loader.efi
  
  NEWVERSWHAT=    "EFI loader" ${MACHINE}
  
! all: machine x86 loader.efi
  install: all $(ROOTBOOTFILES)
  
  vers.c: ../../common/newvers.sh ../../efi/loader/version
          $(SH) ../../common/newvers.sh version ${NEWVERSWHAT}
  
--- 87,98 ----
  
  CLEANFILES=     vers.c loader.efi
  
  NEWVERSWHAT=    "EFI loader" ${MACHINE}
  
! all: loader.efi
! 
  install: all $(ROOTBOOTFILES)
  
  vers.c: ../../common/newvers.sh ../../efi/loader/version
          $(SH) ../../common/newvers.sh version ${NEWVERSWHAT}
  
*** 115,136 ****
  
  
  loader.sym:     $(OBJS) $(DPADD)
          $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LDADD)
  
- beforedepend ${OBJS}: machine
- 
  CLEANFILES +=   machine x86
  
  machine:
          $(RM) machine
          $(SYMLINK) ../../../${MACHINE}/include machine
  
  x86:
          $(RM) x86
          $(SYMLINK) ../../../x86/include x86
  
  clean clobber:
          $(RM) $(CLEANFILES) $(OBJS) loader.sym loader.efi
  
  %.o:    %.c
          $(COMPILE.c) $<
--- 117,138 ----
  
  
  loader.sym:     $(OBJS) $(DPADD)
          $(LD) $(LDFLAGS) -o $@ $(OBJS) $(LDADD)
  
  CLEANFILES +=   machine x86
  
  machine:
          $(RM) machine
          $(SYMLINK) ../../../${MACHINE}/include machine
  
  x86:
          $(RM) x86
          $(SYMLINK) ../../../x86/include x86
  
+ $(OBJS): machine x86
+ 
  clean clobber:
          $(RM) $(CLEANFILES) $(OBJS) loader.sym loader.efi
  
  %.o:    %.c
          $(COMPILE.c) $<