Merge branch 'master' of git+ssh://git.donarmstrong.com/srv/git/lib

diff --git a/emacs_el/.gitignore b/emacs_el/.gitignore
index c08f1722c1cc7e7897fda0e471a4b5929277a0e1..22c5ee38044b32eb82572e7b23360092fa251905 100644 (file)
--- a/emacs_el/.gitignore
+++ b/emacs_el/.gitignore
@@ -1,2 +1,3 @@
 *.elc
 web-mode
+org-ref

diff --git a/emacs_el/.mrconfig b/emacs_el/.mrconfig
index 14dfe4dc28aab499370ecb2840208c0521dee23f..4da11def31cd3194d7bab05ff49c9c088de9007c 100644 (file)
--- a/emacs_el/.mrconfig
+++ b/emacs_el/.mrconfig
@@ -2,3 +2,13 @@
 checkout = git clone http://git.donarmstrong.com/org-ref.git org-ref
 [web-mode]
 checkout = git clone https://github.com/fxbois/web-mode.git web-mode
+[helm]
+checkout = git clone https://github.com/emacs-helm/helm.git helm
+[helm-bibtex]
+checkout = git clone https://github.com/tmalsburg/helm-bibtex.git helm-bibtex
+[parsebib]
+checkout = git clone https://github.com/joostkremers/parsebib.git parsebib
+[s-el]
+checkout = git clone https://github.com/magnars/s.el.git s-el
+[f-el]
+checkout = git clone https://github.com/rejeep/f.el.git f-el
\ No newline at end of file

diff --git a/emacs_el/Makefile b/emacs_el/Makefile
index c79737ef3cf1a9e84da85f3b29d6e1f3c6fd1186..cfd61b4fb23320b9d376de10b5d9ebc81a491790 100644 (file)
--- a/emacs_el/Makefile
+++ b/emacs_el/Makefile
@@ -8,18 +8,26 @@ ifeq ($(strip $(WHICH_EMACS)),)
 ELC_FILES=$(patsubst %.el,%.elc,$(wildcard *.el))
 endif
 
-all: $(ELC_FILES) configuration
+SUBDIRS=
+LIBOPTS=-L .
+ifeq ($(strip $(WHICH_EMACS)),)
+SUBDIRS=configuration helm org-ref
+LIBDIRS=-L . -L helm
+endif
+
+
+all: $(ELC_FILES) $(SUBDIRS)
 
 EMACS=emacs
 
-configuration:
-       $(MAKE) -C configuration
+$(SUBDIRS): %: 
+       $(MAKE) -C $@
 
 %.elc: %.el
-       $(EMACS) -q -no-site-file -L . --no-site-file -batch -f batch-byte-compile $<;
+       $(EMACS) -q -no-site-file $(LIBDIRS) --no-site-file -batch -f batch-byte-compile $<;
 
 clean: 
        rm -f *.elc
 
-.PHONY: clean all configuration
+.PHONY: clean all $(SUBDIRS)
 

diff --git a/templates/perl_module_header.pm b/templates/perl_module_header.pm
index f3633f3c8daf24c0a19f56fa68b91b98c99e87c5..b28a314e6fae842bd6851f20bea45a66c49875d8 100644 (file)
--- a/templates/perl_module_header.pm
+++ b/templates/perl_module_header.pm
@@ -1,14 +1,14 @@
-# This module is part of , and is released
-# under the terms of the GPL version 2, or any later version. See the
-# file README and COPYING for more information.
-# Copyright 2008 by Don Armstrong <don@donarmstrong.com>.
-# $Id$
+# This module is part of , and
+# is released under the terms of the GPL version 3, or any later
+# version (at your option). See the file README and COPYING for more
+# information.
+# Copyright 2015 by Don Armstrong <don@donarmstrong.com>.
 
-package ;
+package THEPACKAGE;
 
 =head1 NAME
 
- --
+THEPACKGE --
 
 =head1 SYNOPSIS
 
@@ -28,7 +28,7 @@ use vars qw($VERSION $DEBUG %EXPORT_TAGS @EXPORT_OK @EXPORT);
 use base qw(Exporter);
 
 BEGIN{
-     ($VERSION) = q$Revision$ =~ /^Revision:\s+([^\s+])/;
+     $VERSION = '0.1';
      $DEBUG = 0 unless defined $DEBUG;
 
      @EXPORT = ();