Mirrors/esp-link
2
0
Fork 0
mirror of https://github.com/jeelabs/esp-link.git synced 2026-03-08 10:16:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

conditionaly include "local.conf" from Makefile

Browse Source 
for convenience reasons included from Makefile, added to gitignore..
This commit is contained in:
susisstrolch
2015-10-10 11:57:31 +02:00
parent d092075818
commit bb5dfd082a
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -16,3 +16,4 @@ esp-link.sdf
espfs/mkespfsimage/mman-win32/libmman.a
.localhistory/
tools/
local.conf

2
Makefile
View File

@@ -8,6 +8,8 @@
# `VERBOSE=1 make ...` will print debug info
# `ESP_HOSTNAME=my.esp.example.com make wiflash` is an easy way to override a variable
#
# optional local configuration file
-include local.conf
# Makefile heavily adapted to esp-link and wireless flashing by Thorsten von Eicken
# Lots of work, in particular to support windows, by brunnels
# Original from esphttpd and others...