aboutsummaryrefslogtreecommitdiffstats
path: root/LUFA/StudioIntegration
diff options
context:
space:
mode:
authorDean Camera <dean@fourwalledcubicle.com>2017-04-26 20:45:40 +1000
committerDean Camera <dean@fourwalledcubicle.com>2017-04-26 20:45:40 +1000
commit2cde257fe11886bebbfe4aea816268c2739d89bb (patch)
tree31ea944c9300215e227035f13f1a55a8db9193e8 /LUFA/StudioIntegration
parenta8546529926fc87b5d73b75217ec011962e8ccaa (diff)
downloadlufa-2cde257fe11886bebbfe4aea816268c2739d89bb.tar.gz
lufa-2cde257fe11886bebbfe4aea816268c2739d89bb.tar.bz2
lufa-2cde257fe11886bebbfe4aea816268c2739d89bb.zip
Update to latest DMBS revision.
Diffstat (limited to 'LUFA/StudioIntegration')
-rw-r--r--LUFA/StudioIntegration/ProjectGenerator/placeholder.txt1
-rw-r--r--LUFA/StudioIntegration/makefile2
2 files changed, 1 insertions, 2 deletions
diff --git a/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt b/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
deleted file mode 100644
index e89b0404b..000000000
--- a/LUFA/StudioIntegration/ProjectGenerator/placeholder.txt
+++ /dev/null
@@ -1 +0,0 @@
-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 53fb47012..30483e9cb 100644
--- a/LUFA/StudioIntegration/makefile
+++ b/LUFA/StudioIntegration/makefile
@@ -58,7 +58,7 @@ clean:
@cd $(LUFA_ROOT)/.. && rm -f contents.zip exampleProjects.xml content.xml.cache extension.vsixmanifest asf-manifest.xml extension.xml helpcontentsetup.msha $(notdir $(VSIX_ASSETS)) *.vsix *.mshc
$(DOXYGEN_TAG_FILE_XML):
- @$(MAKE) -C ../ doxygen DOXYGEN_OVERRIDE_PARAMS="GENERATE_TAGFILE=Documentation/lufa_doc_tags.xml GENERATE_HTML=no GENERATE_XML=yes"
+ @make -C ../ doxygen DOXYGEN_OVERRIDE_PARAMS="GENERATE_TAGFILE=Documentation/lufa_doc_tags.xml GENERATE_HTML=no GENERATE_XML=yes"
$(DOXYGEN_COMBINED_XML): $(DOXYGEN_TAG_FILE_XML)
@xsltproc $(dir $@)/combine.xslt $(dir $@)/index.xml > $(DOXYGEN_COMBINED_XML)