Revert incorrect XMEGA interrupt disable patch; all flags *except* the interrupt...

[pub/USBasp.git] / LUFA / makefile

diff --git a/LUFA/makefile b/LUFA/makefile
index ca5eacf..4453d18 100644 (file)
--- a/LUFA/makefile
+++ b/LUFA/makefile
@@ -1,6 +1,6 @@
 #
 #             LUFA Library
-#     Copyright (C) Dean Camera, 2012.
+#     Copyright (C) Dean Camera, 2013.
 #
 #  dean [at] fourwalledcubicle [dot] com
 #           www.lufa-lib.org
@@ -9,8 +9,8 @@
 #  Makefile for the LUFA library itself.
 # ---------------------------------------
 
-LUFA_VERSION_NUM        := $(shell grep LUFA_VERSION_STRING Version.h | cut -d'"' -f2)
-EXCLUDE_FROM_EXPORT     := Documentation DoxygenPages CodeTemplates Build *.conf *.tar *.o *.d *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin
+LUFA_VERSION_NUM         = $(shell grep LUFA_VERSION_STRING $(LUFA_PATH)/Version.h | cut -d'"' -f2)
+EXCLUDE_FROM_EXPORT     := Documentation DoxygenPages CodeTemplates Build StudioIntegration *.conf *.tar *.o *.d *.lss *.lst *.hex *.elf *.hex *.eep *.map *.bin
 
 # Default target - no default action when attempting to build the core directly
 all:
@@ -29,8 +29,8 @@ version:
 # Check if this is being included from a legacy or non LUFA build system makefile
 ifneq ($(LUFA_PATH),)
   LUFA_ROOT_PATH = $(patsubst %/,%,$(LUFA_PATH))/LUFA/
-  
-  include $(patsubst %/,%,$(LUFA_PATH))/LUFA/Build/lufa.sources.in
+
+  include $(patsubst %/,%,$(LUFA_PATH))/LUFA/Build/lufa_sources.mk
 else
   LUFA_BUILD_MODULES     += MASTER
   LUFA_BUILD_TARGETS     += export_tar version
@@ -38,7 +38,7 @@ else
   LUFA_PATH               = .
   ARCH                    = {AVR8,UC3,XMEGA}
   DOXYGEN_OVERRIDE_PARAMS = QUIET=YES PROJECT_NUMBER=$(LUFA_VERSION_NUM)
-  
+
   # Remove all object and associated files from the LUFA library core
   clean:
        rm -f $(LUFA_SRC_ALL_FILES:%.c=%.o)
@@ -50,4 +50,4 @@ else
   include Build/lufa_doxygen.mk
 endif
 
-.PHONY: all export_tar version clean
\ No newline at end of file
+.PHONY: all export_tar version clean