aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA
diff options
context:
space:
mode:
Diffstat (limited to 'LUFA')
-rw-r--r--LUFA/StudioIntegration/ProjectGenerator/placeholder.txt2
-rw-r--r--LUFA/StudioIntegration/makefile6
2 files changed, 3 insertions, 5 deletions
diff --git a/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt b/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
index 381e19381..e89b0404b 100644
--- a/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
+++ b/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
@@ -1 +1 @@
-This module requires the ASF Project Generator to be extracted into this directory (i.e. with the Python scripts in the current folder). The project generator can be extracted from the release versions of Atmel Studio's ASF extension. \ No newline at end of file
+Copy the ASF Project Generator into this directory (i.e. with the Python scripts in the current folder). The project generator can be extracted from the release versions of Atmel Studio's ASF extension. \ No newline at end of file
diff --git a/LUFA/StudioIntegration/makefile b/LUFA/StudioIntegration/makefile
index f66592288..4f15dc48a 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -48,12 +48,10 @@ generate_xml: $(TEMP_MANIFEST_XML)
@rm $(TEMP_MANIFEST_XML)
-generate_caches: $(EXTENSION_OUTPUT_XML)
+generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML)
@echo "Generating ASF cache files..."
@python generate_caches.py $(LUFA_ROOT)/../
- @echo "ASF cache files generated."
-generate_vsix: $(EXTENSION_OUTPUT_XML) $(MODULE_OUTPUT_XML) generate_caches
@echo "Archiving Content..."
@cd $(LUFA_ROOT)/../ && zip contents.zip -q -9 -r --exclude=*$(notdir $(DOXYGEN_TAG_FILE_XML)) --exclude=*StudioIntegration* LUFA Bootloaders Demos Projects extension.xml README.txt
@@ -76,4 +74,4 @@ check_filenames: $(TEMP_MANIFEST_XML)
fi; \
done;
-.PHONY: all clean generate_xml check_filenames generate_caches generate_vsix \ No newline at end of file
+.PHONY: all clean generate_xml check_filenames generate_vsix \ No newline at end of file