From 515beab3a084dc191ac2c7407ba7f0f8aeffafad Mon Sep 17 00:00:00 2001 From: Ryan Kavanagh Date: Wed, 16 Sep 2015 11:21:55 -0400 Subject: Tidy up emacsen submodules --- .gitmodules | 42 ++--------------------- emacsen/Fill-Column-Indicator | 1 - emacsen/Makefile | 79 +++---------------------------------------- emacsen/auto-complete | 1 - emacsen/auto-indent-mode | 1 - emacsen/bbdb | 1 - emacsen/dtrt-indent | 1 - emacsen/haskell-mode | 1 - emacsen/magit | 1 - emacsen/markdown-mode | 1 - emacsen/proofgeneral | 1 - emacsen/use-package | 1 + emacsen/vm | 1 - 13 files changed, 9 insertions(+), 123 deletions(-) delete mode 160000 emacsen/Fill-Column-Indicator delete mode 160000 emacsen/auto-complete delete mode 160000 emacsen/auto-indent-mode delete mode 160000 emacsen/bbdb delete mode 160000 emacsen/dtrt-indent delete mode 160000 emacsen/haskell-mode delete mode 160000 emacsen/magit delete mode 160000 emacsen/markdown-mode delete mode 160000 emacsen/proofgeneral create mode 160000 emacsen/use-package delete mode 160000 emacsen/vm diff --git a/.gitmodules b/.gitmodules index 21e0276..b7d06cb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,51 +1,15 @@ -[submodule "emacsen/auto-complete"] - path = emacsen/auto-complete - url = https://github.com/auto-complete/auto-complete.git -[submodule "emacsen/auto-indent-mode"] - path = emacsen/auto-indent-mode - url = https://github.com/mlf176f2/auto-indent-mode.el/ -[submodule "emacsen/magit"] - path = emacsen/magit - url = https://github.com/magit/magit.git -[submodule "emacsen/proofgeneral"] - path = emacsen/proofgeneral - url = https://github.com/emacsmirror/proofgeneral.git -[submodule "emacsen/popup"] - path = emacsen/popup - url = https://github.com/auto-complete/popup-el.git -[submodule "emacsen/markdown-mode"] - path = emacsen/markdown-mode - url = git://jblevins.org/git/markdown-mode.git -[submodule "dictem"] - path = dictem - url = https://github.com/cheusov/dictem.git [submodule "emacsen/dictem"] path = emacsen/dictem url = https://github.com/cheusov/dictem.git -[submodule "emacsen/vm"] - path = emacsen/vm - url = https://github.com/emacsmirror/vm.git -[submodule "emacsen/bbdb"] - path = emacsen/bbdb - url = git://git.savannah.nongnu.org/bbdb.git -[submodule "emacsen/haskell-mode"] - path = emacsen/haskell-mode - url = https://github.com/haskell/haskell-mode.git [submodule ".fonts/Inconsolata-Hellenic"] path = .fonts/Inconsolata-Hellenic url = git://github.com/cosmix/Inconsolata-Hellenic.git [submodule ".tmux/powerline"] path = .tmux/powerline url = https://github.com/erikw/tmux-powerline.git -[submodule "emacsen/dtrt-indent"] - path = emacsen/dtrt-indent - url = git://git.sv.gnu.org/dtrt-indent.git [submodule ".rlwrap"] path = .rlwrap url = https://github.com/ryanakca/rlwrap_mail.git -[submodule "emacsen/auctex"] - path = emacsen/auctex - url = git://git.sv.gnu.org/auctex.git -[submodule "emacsen/Fill-Column-Indicator"] - path = emacsen/Fill-Column-Indicator - url = https://github.com/alpaker/Fill-Column-Indicator.git +[submodule "emacsen/use-package"] + path = emacsen/use-package + url = https://github.com/jwiegley/use-package.git diff --git a/emacsen/Fill-Column-Indicator b/emacsen/Fill-Column-Indicator deleted file mode 160000 index 7c57b73..0000000 --- a/emacsen/Fill-Column-Indicator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7c57b734f3d25554897db3cf7c66c140e3e0ddc8 diff --git a/emacsen/Makefile b/emacsen/Makefile index 19702da..402f081 100644 --- a/emacsen/Makefile +++ b/emacsen/Makefile @@ -4,18 +4,8 @@ EMACSD=$(ROOT)/build/.emacs.d/ export ELISPDIR EMACSEN=$(ROOT)/emacsen -SUBDIRS = auto-complete \ - auto-indent-mode \ - bbdb \ - dictem \ - dtrt-indent \ - haskell-mode \ - magit \ - markdown-mode \ - popup \ - proofgeneral \ - vm -# color-theme-6.6.0 \ +SUBDIRS = dictem \ + use-package MAKEDIRS = $(SUBDIRS:%=make-%) INSTALLDIRS = $(SUBDIRS:%=install-%) @@ -44,74 +34,15 @@ $(CLEANDIRS): [ ! -f $(@:clean-%=%)/Makefile ] || $(MAKE) -C $(@:clean-%=%) clean # Manual overrides: -make-auto-indent-mode make-markdown-mode make-popup make-dictem make-dtrt-indent: +make-dictem install-use-package: touch $@ -clean-auto-indent-mode clean-markdown-mode clean-popup clean-dictem: +clean-dictem install-use-package: echo $@ -make-auto-complete: - $(MAKE) -C $(@:make-%=%) -e EMACS="emacs -L lib/popup/" - touch $@ - -make-bbdb: make-vm - cd $(@:make-%=%) && autoconf && ./configure --prefix=$(EMACSD) --without-tex-dir \ - --with-vm-dir=$(EMACSEN)/vm/lisp \ - --with-lispdir=$(EMACSD)bbdb - $(MAKE) -C $(@:make-%=%) - touch $@ - -make-haskell-mode: - $(MAKE) -C $(@:make-%=%) compile - touch $@ - -make-proofgeneral: - $(MAKE) -C $(@:make-%=%) compile - touch $@ - -make-vm: - # info file is broken in vm at the moment. - echo '%s/^all: info/all:/g\n%s/^info:.*/info:/g\nw' | ed vm/info/Makefile.in - cd $(@:make-%=%) && autoconf && ./configure --prefix=$(EMACSD) --with-other-dirs=$(EMACSEN)/bbdb/lisp - $(MAKE) -C $(@:make-%=%) - touch $@ - -install-auto-complete: - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) -e DIR=$(EMACSD)/$(@:install-%=%) \ - -e EMACS="emacs -L lib/popup/" install - -install-bbdb: - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) -e lispdir=$(EMACSD)/$(@:install-%=%) install - -install-auto-indent-mode install-dictem install-dtrt-indent install-markdown-mode install-popup: +install-dictem install-use-package: -mkdir -p $(EMACSD)/$(@:install-%=%) install -m 644 $(@:install-%=%)/*.el $(EMACSD)/$(@:install-%=%) - -install-color-theme-6.6.0: - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) -e ELISPDIR=$(EMACSD)/$(@:install-%=%) install - -install-haskell-mode: make-haskell-mode - -mkdir -p $(EMACSD)/$(@:install-%=%) - install -m 644 $(@:install-%=%)/*.elc $(EMACSD)/$(@:install-%=%) - -install-magit: - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) -e PREFIX="" -e DESTDIR=$(EMACSD) \ - -e SYSCONFDIR="" -e ELISP_INSTALL_DIR=$(EMACSD)/$(@:install-%=%) install - -install-proofgeneral: - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) -e ELISP=$(EMACSD)/$(@:install-%=%) install-el install-elc - -install-vm: - -mkdir -p $(EMACSD)/$(@:install-%=%) - $(MAKE) -C $(@:install-%=%) -e lispdir=$(EMACSD)/$(@:install-%=%) install - -clean-vm: - [ ! -f $(@:clean-%=%)/Makefile ] || $(MAKE) -C $(@:clean-%=%) distclean clobber: for dir in $(SUBDIRS); do \ diff --git a/emacsen/auto-complete b/emacsen/auto-complete deleted file mode 160000 index da86439..0000000 --- a/emacsen/auto-complete +++ /dev/null @@ -1 +0,0 @@ -Subproject commit da864398a96805a2c79ac61fadeebd420ccb3cdc diff --git a/emacsen/auto-indent-mode b/emacsen/auto-indent-mode deleted file mode 160000 index 35b9f52..0000000 --- a/emacsen/auto-indent-mode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 35b9f5242626f2ff02ea67ebbe6c9fd93a08a382 diff --git a/emacsen/bbdb b/emacsen/bbdb deleted file mode 160000 index fafcf87..0000000 --- a/emacsen/bbdb +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fafcf8705d760539f59485fe97b4741063e7514b diff --git a/emacsen/dtrt-indent b/emacsen/dtrt-indent deleted file mode 160000 index b82354e..0000000 --- a/emacsen/dtrt-indent +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b82354e495c84e5f3535ca1a4d35b18e9596cc90 diff --git a/emacsen/haskell-mode b/emacsen/haskell-mode deleted file mode 160000 index 7f885cc..0000000 --- a/emacsen/haskell-mode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 7f885ccf29bf35d7b0f546eb25669565dd3911bb diff --git a/emacsen/magit b/emacsen/magit deleted file mode 160000 index d735607..0000000 --- a/emacsen/magit +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d735607aa121bdb690cc8edd8e117da5282871c4 diff --git a/emacsen/markdown-mode b/emacsen/markdown-mode deleted file mode 160000 index 8413823..0000000 --- a/emacsen/markdown-mode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8413823d2cc976cd53786286f968a4b985591774 diff --git a/emacsen/proofgeneral b/emacsen/proofgeneral deleted file mode 160000 index 1afd9da..0000000 --- a/emacsen/proofgeneral +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1afd9da42eaf12cf1c46f016372fb6d8054c58ff diff --git a/emacsen/use-package b/emacsen/use-package new file mode 160000 index 0000000..4b7917c --- /dev/null +++ b/emacsen/use-package @@ -0,0 +1 @@ +Subproject commit 4b7917cc276b33cd7daff96ef764f4626baf0a5c diff --git a/emacsen/vm b/emacsen/vm deleted file mode 160000 index d4216b2..0000000 --- a/emacsen/vm +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d4216b2d73f0d5fd5a42bb3077292d5511d30ef5 -- cgit v1.2.3