Mark build test makefiles as being incompatible with parallel make builds, as they...

[pub/USBasp.git] / LUFA / makefile

diff --git a/LUFA/makefile b/LUFA/makefile
index 7abd014..e8b7b7b 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -10,9 +10,7 @@
 # ---------------------------------------
 
 LUFA_VERSION_NUM        := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
 # ---------------------------------------
 
 LUFA_VERSION_NUM        := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)

-EXCLUDE_FROM_EXPORT     := Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin *.d
-
-DOXYGEN_OVERRIDE_PARAMS = PROJECT_NUMBER=$(LUFA_VERSION_NUM)
+EXCLUDE_FROM_EXPORT     := Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.d *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin

 
 all:
 
 
 all:
 


@@ -27,22 +25,26 @@ version:
 
 # Check if this is being included from a legacy or non LUFA build system makefile
 ifneq ($(LUFA_PATH),)
 
 # Check if this is being included from a legacy or non LUFA build system makefile
 ifneq ($(LUFA_PATH),)

-  LUFA_ROOT_PATH = $(LUFA_PATH)/LUFA/
-  include $(LUFA_PATH)/LUFA/Build/lufa.sources.in
+  LUFA_ROOT_PATH = $(patsubst %/,%,$(LUFA_PATH))/LUFA/
+  
+  include $(patsubst %/,%,$(LUFA_PATH))/LUFA/Build/lufa.sources.in

 else
 else

-  LUFA_BUILD_MODULES += LIBCORE
-  LUFA_BUILD_TARGETS += export_tar version
+  LUFA_BUILD_MODULES     += MASTER
+  LUFA_BUILD_TARGETS     += export_tar version

 
 

-  LUFA_PATH           = .
-  ARCH                = {AVR8,UC3,XMEGA}
+  LUFA_PATH               = .
+  ARCH                    = {AVR8,UC3,XMEGA}
+  DOXYGEN_OVERRIDE_PARAMS = QUIET=YES PROJECT_NUMBER=$(LUFA_VERSION_NUM)

   
   clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
   
   clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)

-       rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o.d)
+       rm -f $(LUFA_SRC_ALL_FILES:%.c=%.d)

        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)
 
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.lst)
 

-  # Include LUFA build script makefiles

   include Build/lufa.core.in
   include Build/lufa.sources.in
   include Build/lufa.doxygen.in
 endif
   include Build/lufa.core.in
   include Build/lufa.sources.in
   include Build/lufa.doxygen.in
 endif

+
+
+.PHONY: all export_tar version clean
\ No newline at end of file