aboutsummaryrefslogtreecommitdiff
path: root/emacsen
diff options
context:
space:
mode:
authorRyan Kavanagh <rak@debian.org>2015-09-16 11:21:55 -0400
committerRyan Kavanagh <rak@debian.org>2015-09-16 11:21:55 -0400
commit515beab3a084dc191ac2c7407ba7f0f8aeffafad (patch)
treefccdd033f4e75fbe2211ae3097fd5e958b78bf52 /emacsen
parentDon't quote stuff in mailcap (diff)
Tidy up emacsen submodules
Diffstat (limited to 'emacsen')
m---------emacsen/Fill-Column-Indicator0
-rw-r--r--emacsen/Makefile79
m---------emacsen/auto-complete0
m---------emacsen/auto-indent-mode0
m---------emacsen/bbdb0
m---------emacsen/dtrt-indent0
m---------emacsen/haskell-mode0
m---------emacsen/magit0
m---------emacsen/markdown-mode0
m---------emacsen/proofgeneral0
m---------emacsen/use-package0
m---------emacsen/vm0
12 files changed, 5 insertions, 74 deletions
diff --git a/emacsen/Fill-Column-Indicator b/emacsen/Fill-Column-Indicator
deleted file mode 160000
-Subproject 7c57b734f3d25554897db3cf7c66c140e3e0ddc
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
-Subproject da864398a96805a2c79ac61fadeebd420ccb3cd
diff --git a/emacsen/auto-indent-mode b/emacsen/auto-indent-mode
deleted file mode 160000
-Subproject 35b9f5242626f2ff02ea67ebbe6c9fd93a08a38
diff --git a/emacsen/bbdb b/emacsen/bbdb
deleted file mode 160000
-Subproject fafcf8705d760539f59485fe97b4741063e7514
diff --git a/emacsen/dtrt-indent b/emacsen/dtrt-indent
deleted file mode 160000
-Subproject b82354e495c84e5f3535ca1a4d35b18e9596cc9
diff --git a/emacsen/haskell-mode b/emacsen/haskell-mode
deleted file mode 160000
-Subproject 7f885ccf29bf35d7b0f546eb25669565dd3911b
diff --git a/emacsen/magit b/emacsen/magit
deleted file mode 160000
-Subproject d735607aa121bdb690cc8edd8e117da5282871c
diff --git a/emacsen/markdown-mode b/emacsen/markdown-mode
deleted file mode 160000
-Subproject 8413823d2cc976cd53786286f968a4b98559177
diff --git a/emacsen/proofgeneral b/emacsen/proofgeneral
deleted file mode 160000
-Subproject 1afd9da42eaf12cf1c46f016372fb6d8054c58f
diff --git a/emacsen/use-package b/emacsen/use-package
new file mode 160000
+Subproject 4b7917cc276b33cd7daff96ef764f4626baf0a5
diff --git a/emacsen/vm b/emacsen/vm
deleted file mode 160000
-Subproject d4216b2d73f0d5fd5a42bb3077292d5511d30ef