include ./build/makedefs.mk
GIT=git
.PHONY: merge-elpa
merge-elpa:
	$(GIT) fetch elpa
	$(GIT) merge --squash -s subtree --no-commit elpa/master

# Each of these stanzas defined a merge-$(UPSTREAM_NAME) target;
# there's also a merge-all target to update them all at once.
# To fetch the first time, run checkout-$(UPSTREAM_NAME)

$(eval $(call upstream-start))
UPSTREAM_NAME=sg-flymake
UPSTREAM_GIT=https://github.com/illusori/emacs-flymake
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=ace-jump
UPSTREAM_GIT=https://github.com/winterTTr/ace-jump-mode
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=s
UPSTREAM_GIT=https://github.com/magnars/s.el.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=pcre2el
#UPSTREAM_GIT=https://github.com/joddie/pcre2el.git
UPSTREAM_GIT=git@github.com:dcolascione/pcre2el.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=ws-butler
UPSTREAM_GIT=git@github.com:lewang/ws-butler.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=logcat
UPSTREAM_GIT=git@github.com:dcolascione/logcat-mode.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=gnuplot
UPSTREAM_GIT=git@github.com:bruceravel/gnuplot-mode.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=go-mode
UPSTREAM_GIT=git@github.com:dominikh/go-mode.el.git
$(eval $(call upstream-define))


$(eval $(call upstream-start))
UPSTREAM_NAME=groovy-emacs-modes
UPSTREAM_GIT=git@github.com:Groovy-Emacs-Modes/groovy-emacs-modes.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=gnus-alias
UPSTREAM_GIT=git@github.com:hexmode/gnus-alias.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=cython
UPSTREAM_GIT=git@github.com:cython/cython.git
$(eval $(call upstream-define))

$(eval $(call upstream-start))
UPSTREAM_NAME=qml-mode
UPSTREAM_GIT=git@github.com:coldnew/qml-mode.git
$(eval $(call upstream-define))