summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWerner Almesberger <werner@almesberger.net>2016-09-17 21:31:12 -0300
committerGenerated from internal repo <nobody@neo900.org>2016-09-17 21:31:12 -0300
commit481da13e2c5cde999b1370986dd059eab8ddcffe (patch)
tree986c6196577656670301a5563dfedfc557470b8b
parent3beb611d55270bf1fd3cc103b5091c5d2945a502 (diff)
downloadee-481da13e2c5cde999b1370986dd059eab8ddcffe.tar.gz
ee-481da13e2c5cde999b1370986dd059eab8ddcffe.tar.bz2
ee-481da13e2c5cde999b1370986dd059eab8ddcffe.zip
hw/Makefile, Makefile, README: "make pull" pull with submodule update
-rw-r--r--Makefile4
-rw-r--r--README10
-rw-r--r--hw/Makefile7
3 files changed, 20 insertions, 1 deletions
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..84be847
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+.PHONY: pull
+
+pull:
+ $(MAKE) -C hw pull
diff --git a/README b/README
index 09738e2..2db708d 100644
--- a/README
+++ b/README
@@ -45,5 +45,15 @@ Updating the repository
Submodules are updated to their "pinned" versions, which may be behind
the latest commit in the corresponding repo.
+cd ee
git pull
git submodule update
+
+In case the scripts in kicad-libs/components changes, also run
+
+make -C hw/kicad-libs/components
+
+
+A shortcut for all the above is available as (if in ee/ or ee/hw/):
+
+make pull
diff --git a/hw/Makefile b/hw/Makefile
index 3cec4b4..901c529 100644
--- a/hw/Makefile
+++ b/hw/Makefile
@@ -1,7 +1,12 @@
NAME = neo900
SCHTOC = ../../misc/schtoc/schtoc.pl
-.PHONY: sch sort brd pdf clean
+.PHONY: pull sch sort brd pdf clean
+
+pull:
+ git pull
+ git submodule update --init
+ $(MAKE) -C kicad-libs/components
sch:
[ -e kicad-libs ] || ln -s ../../../qi/kicad-libs .