Merge pull request #699 from laf/makefile

Updated Makefile for font-awesome and vis
This commit is contained in:
Daniel Preussker
2015-03-31 18:57:25 +02:00
+7 -1
View File
@@ -30,10 +30,16 @@ push-personal pp:
push-testing:
$(GIT) push testing
update-subtrees: datetime-subtree moment-subtree
update-subtrees: datetime-subtree moment-subtree font-awesome vis
datetime-subtree:
$(GIT_SUBTREE) --prefix=html/js/datetime https://github.com/Eonasdan/bootstrap-datetimepicker master
moment-subtree:
$(GIT_SUBTREE) --prefix=html/js/moment https://github.com/moment/moment master
font-awesome:
$(GIT_SUBTREE) --prefix=lib/Font-Awesome https://github.com/FortAwesome/Font-Awesome.git master
vis:
$(GIT_SUBTREE) --prefix=lib/vis https://github.com/almende/vis.git master