From 0daece00c64bc4b7d3ee669a5847548fccf776e3 Mon Sep 17 00:00:00 2001
From: Kai Tetzlaff <kai.tetzlaff@web.de>
Date: Sun, 5 Aug 2012 22:33:26 +0200
Subject: [PATCH] update Makefile and ignores

---
 .hgignore |   2 +
 Makefile  | 217 +++++++++++++++++++++++++++++-------------------------
 2 files changed, 118 insertions(+), 101 deletions(-)

diff --git a/.hgignore b/.hgignore
index cc721b9..5971471 100644
--- a/.hgignore
+++ b/.hgignore
@@ -44,6 +44,7 @@ w3/
 use-package/
 dvc/
 
+doxymacs/Makefile
 doxymacs/Makefile.in
 doxymacs/aclocal.m4
 doxymacs/autom4te.cache/
@@ -52,6 +53,7 @@ doxymacs/c/Makefile
 doxymacs/c/Makefile.in
 doxymacs/c/doxymacs_parser.exe
 doxymacs/c/doxymacs_parser.o
+doxymacs/c/doxymacs_parser
 doxymacs/config.status
 doxymacs/configure
 doxymacs/depcomp*
diff --git a/Makefile b/Makefile
index cdd9546..b0771d9 100644
--- a/Makefile
+++ b/Makefile
@@ -15,55 +15,60 @@ update: updaterepos
 $(call include-once,$(MK_DIR)/vcs.mk)
 $(call include-once,$(MK_DIR)/emacsd-defs.mk)
 
+GIT_DIRS += emacswiki
+URL-emacswiki := https://github.com/emacsmirror/emacswiki.org.git
+post_init_cmd-emacswiki = cd $(@D) && git checkout -b master origin/master
 
-GIT_DIRS :=\
-  emacswiki\
-  use-package\
-  org-mode\
-  gnus\
-  bbdb\
-  emacs-jabber\
-  w3\
-  doxymacs\
+GIT_DIRS += use-package
+URL-use-package := https://github.com/jwiegley/use-package.git
 
-#  apel\
-  semi\
-  flim\
-  wanderlust\
+#GIT_DIRS += apel
+URL-apel := http://github.com/wanderlust/apel.git
 
-URL-emacswiki    := https://github.com/emacsmirror/emacswiki.org.git
-URL-use-package  := https://github.com/jwiegley/use-package.git
-URL-apel         := http://github.com/wanderlust/apel.git
-URL-semi         := http://github.com/wanderlust/semi.git
-URL-flim         := http://github.com/wanderlust/flim.git
-URL-wanderlust   := http://github.com/wanderlust/wanderlust.git
-URL-org-mode     := http://orgmode.org/org-mode.git
-URL-gnus         := http://git.gnus.org/gnus.git
-URL-w3           := http://git.sv.gnu.org/r/w3.git
-URL-bbdb         := http://git.savannah.nongnu.org/r/bbdb.git
+#GIT_DIRS += semi
+URL-semi := http://github.com/wanderlust/semi.git
+
+#GIT_DIRS += flim
+URL-flim := http://github.com/wanderlust/flim.git
+
+#GIT_DIRS += wanderlust
+URL-wanderlust := http://github.com/wanderlust/wanderlust.git
+
+GIT_DIRS += org-mode
+URL-org-mode := http://orgmode.org/org-mode.git
+
+GIT_DIRS += gnus
+URL-gnus := http://git.gnus.org/gnus.git
+
+GIT_DIRS += w3
+URL-w3 := http://git.sv.gnu.org/r/w3.git
+
+GIT_DIRS += bbdb
+URL-bbdb := http://git.savannah.nongnu.org/r/bbdb.git
+
+GIT_DIRS += emacs-jabber
 URL-emacs-jabber := git://emacs-jabber.git.sourceforge.net/gitroot/emacs-jabber/emacs-jabber
-URL-doxymacs     := git://doxymacs.git.sourceforge.net/gitroot/doxymacs/doxymacs
 
-SVN_DIRS :=\
-  ess\
+GIT_DIRS += doxymacs
+URL-doxymacs := git://doxymacs.git.sourceforge.net/gitroot/doxymacs/doxymacs
 
+
+SVN_DIRS += ess
 URL-ess := https://svn.r-project.org/ESS/trunk
 
 
-CVS_DIRS :=\
-  auctex\
-  reftex\
-
+CVS_DIRS += auctex
 URL-auctex := :pserver:anonymous@cvs.savannah.gnu.org:/sources/auctex
+
+CVS_DIRS += reftex
 URL-reftex := :pserver:anonymous@cvs.savannah.gnu.org:/sources/auctex
 
 # :pserver:anonymous@cvs.namazu.org:/storage/cvsroot login
 # :pserver:anonymous@cvs.namazu.org:/storage/cvsroot co emacs-w3m
 
-BZR_DIRS :=\
-  dvc\
+BZR_DIRS += dvc
+URL-dvc := http://bzr.xsteve.at/dvc
 
-URL-dvc := http://bzr.xsteve.at/dvc/
 
 $(foreach d,$(HG_DIRS) ,$(call eval-vcs-template,HG_TMPL,$d))
 $(foreach d,$(GIT_DIRS),$(call eval-vcs-template,GIT_TMPL,$d))
@@ -81,12 +86,13 @@ auctex/configure: auctex/autogen.sh auctex/configure.ac
 	cd $(@D) && ./autogen.sh
 
 auctex/Makefile: auctex/configure Makefile
+	$(MD) $(DOT_DIR)/share/texmf
 	cd $(@D) && ./configure\
     --infodir=$(INFO_DIR)\
-    --datarootdir=$(DOT_DIR)/var\
+    --datarootdir=$(DOT_DIR)/share\
     --localstatedir=$(DOT_DIR)/var\
     --with-lispdir=$(LISP_DIR)\
-    --with-texmf-dir=$(DOT_DIR)/var/texmf\
+    --with-texmf-dir=$(DOT_DIR)/share/texmf\
 
 auctex: auctex/Makefile
 	$(MAKE) -C $(DIR-$@) clean
@@ -103,7 +109,7 @@ cd reftex:
 	$(MAKE) -C $(DIR-$@) lisp info install\
     infodir=$(INFO_DIR)\
     lispdir=$(LISP_DIR)/reftex\
-    EMACS="'$(EMACS)' --eval '(setq vc-handled-backends nil)'"
+    EMACS="$(EMACS)"
 
 
 # #########################################################################
@@ -136,7 +142,7 @@ doxymacs/Makefile: doxymacs/configure Makefile
 doxymacs: doxymacs/Makefile $(wildcard doxymacs/lisp/*.el)
 	$(MAKE) -C $(DIR-$@) clean
 	$(MAKE) -C $(DIR-$@) all install\
-    EMACS="'$(EMACS)' --eval '(setq vc-handled-backends nil)'"\
+    EMACS="$(EMACS)"\
 
 
 # #########################################################################
@@ -144,7 +150,8 @@ doxymacs: doxymacs/Makefile $(wildcard doxymacs/lisp/*.el)
 # #########################################################################
 .PHONY:	gnus
 gnus/configure :| gnus/.git
-gnus/Makefile: gnus/configure
+
+gnus/Makefile: $(MAKEFILE_LIST) gnus/configure
 	cd $(@D) && ./configure\
     --prefix=$(LISP_DIR)/gnus\
     --infodir=$(INFO_DIR)\
@@ -159,15 +166,15 @@ gnus: gnus/Makefile
 # dvc
 # #########################################################################
 .PHONY:	dvc
-dvc/configure: dvc/configure.ac
+dvc/configure: $(MAKEFILE_LIST) dvc/configure.ac
 	cd $(@D) && autoreconf
 
 dvc/Makefile: dvc/configure Makefile
 	cd $(@D) && ./configure\
     --prefix=$(LISP_DIR)/dvc\
+    --with-lispdir=$(LISP_DIR)/dvc\
     --bindir=$(BIN_DIR)\
     --infodir=$(INFO_DIR)\
-    --with-lispdir=$(LISP_DIR)/dvc\
 
 dvc: dvc/Makefile
 	-install-info --info-dir=$(INFO_DIR) --remove $(INFO_DIR)/dvc.info
@@ -186,13 +193,76 @@ org-mode:
     prefix=$(DOT_DIR)\
     infodir=$(INFO_DIR)\
     lispdir=$(LISP_DIR)/org-mode\
-    datadir=$(DOT_DIR)/var/share
+    datadir=$(DOT_DIR)/share/org-mode
 	$(MAKE) -C $(DIR-$@) install install-info doc\
     EMACS="'$(EMACS)' --eval '(setq vc-handled-backends nil)'"\
     prefix=$(DOT_DIR)\
     infodir=$(INFO_DIR)\
     lispdir=$(LISP_DIR)/org-mode\
-    datadir=$(DOT_DIR)/var/share
+    datadir=$(DOT_DIR)/share/org-mode
+
+
+# #########################################################################
+# emacs-jabber
+# #########################################################################
+.PHONY:	emacs-jabber
+$(ELISP_DIR)/emacs-jabber/configure : $(MAKEFILE_LIST)
+	cd $(@D) && autoreconf -i
+
+$(ELISP_DIR)/emacs-jabber/Makefile: $(ELISP_DIR)/emacs-jabber/configure
+	cd $(@D) && ./configure
+
+emacs-jabber: $(ELISP_DIR)/emacs-jabber/Makefile
+	$(MAKE) -C $(DIR-$@) install\
+    EMACS="$(EMACS)"\
+    prefix=$(DOT_DIR)\
+    lispdir=$(LISP_DIR)/jabber\
+    infodir=$(INFO_DIR)\
+    libexecdir=$(LISP_DIR)/jabber/bin
+
+
+# #########################################################################
+# bbdb
+# #########################################################################
+.PHONY:	bbdb
+$(ELISP_DIR)/bbdb/configure : $(MAKEFILE_LIST)\
+  $(ELISP_DIR)/bbdb/configure.ac
+	cd $(ELISP_DIR)/bbdb && autoconf
+
+$(ELISP_DIR)/bbdb/Makefile :\
+  $(ELISP_DIR)/bbdb/configure\
+  $(ELISP_DIR)/bbdb/Makefile.in\
+  $(ELISP_DIR)/bbdb/doc/Makefile.in\
+  $(ELISP_DIR)/bbdb/lisp/Makefile.in\
+  $(ELISP_DIR)/bbdb/tex/Makefile.in
+	$(MD) $(DOT_DIR)/share/texmf
+	cd $(@D) && ./configure\
+    --with-emacs="$(EMACS)"\
+    --datarootdir=$(DOT_DIR)\
+    --with-lispdir=$(LISP_DIR)/bbdb\
+    --with-texmf-dir=$(DOT_DIR)/share/texmf
+
+bbdb: $(ELISP_DIR)/bbdb/Makefile
+	$(MAKE) -C $(DIR-$@) install
+
+
+# #########################################################################
+# w3
+# #########################################################################
+.PHONY:	w3
+$(ELISP_DIR)/w3/Makefile : $(MAKEFILE_LIST)\
+  $(ELISP_DIR)/w3/configure
+	cd $(@D) && ./configure\
+    --with-emacs="$(EMACS)"\
+    --prefix=$(DOT_DIR)\
+    --with-lispdir=$(LISP_DIR)/w3\
+    --libexecdir=$(LISP_DIR)/w3/bin\
+    --datadir=$(DOT_DIR)/share\
+    --infodir=$(INFO_DIR)\
+    --with-gnus=$(ELISP_DIR)/gnus\
+
+w3: $(ELISP_DIR)/w3/Makefile
+	$(MAKE) -C $(DIR-$@) install
 
 
 # #########################################################################
@@ -208,7 +278,7 @@ apel:
      -e 's@^\([^;].*\)/lisp/emu@\1/lisp/apel@'\
     $(DIR-$@)/APEL-CFG.org > $(DIR-$@)/APEL-CFG
 	$(MAKE) -C $(DIR-$@) install\
-    EMACS="'$(EMACS)'"\
+    EMACS="$(EMACS)"\
     LISPDIR=$(LISP_DIR)
 	echo diff -u $(DIR-$@)/APEL-CFG.org $(DIR-$@)/APEL-CFG||exit 0&&exit 0
 	mv $(DIR-$@)/APEL-CFG.org $(DIR-$@)/APEL-CFG
@@ -220,7 +290,7 @@ apel:
 .PHONY:	flim
 flim:
 	$(MAKE) -C $(DIR-$@) install\
-    EMACS="'$(EMACS)'"\
+    EMACS="$(EMACS)"\
     PACKAGEDIR=$(DOT_DIR)\
     PREFIX=$(LISP_DIR)\
     LISPDIR=$(LISP_DIR)
@@ -232,7 +302,7 @@ flim:
 .PHONY:	semi
 semi:
 	$(MAKE) -C $(DIR-$@) install\
-    EMACS="'$(EMACS)'"\
+    EMACS="$(EMACS)"\
     PACKAGEDIR=$(DOT_DIR)\
     PREFIX=$(LISP_DIR)\
     LISPDIR=$(LISP_DIR)
@@ -250,7 +320,7 @@ wanderlust:
        -e 's@\"ja\" \"en\"@\"en\"@'\
     $(DIR-$@)/WL-CFG.org > $(DIR-$@)/WL-CFG
 	$(MAKE) -C $(DIR-$@) install install-info\
-    EMACS="'$(EMACS)'"\
+    EMACS="$(EMACS)"\
     LISPDIR=$(LISP_DIR)\
     INFODIR=$(INFO_DIR)\
     PIXMAPDIR=$(LISP_DIR)/wl/icons
@@ -258,61 +328,6 @@ wanderlust:
 	mv $(DIR-$@)/WL-CFG.org $(DIR-$@)/WL-CFG
 
 
-# #########################################################################
-# emacs-jabber
-# #########################################################################
-.PHONY:	emacs-jabber
-$(ELISP_DIR)/emacs-jabber/configure:
-	cd $(@D) && autoreconf -i
-
-$(ELISP_DIR)/emacs-jabber/Makefile: $(ELISP_DIR)/emacs-jabber/configure
-	cd $(@D) && ./configure
-
-emacs-jabber: $(ELISP_DIR)/emacs-jabber/Makefile
-	$(MAKE) -C $(DIR-$@) install\
-    EMACS="'$(EMACS)'"\
-    prefix=$(DOT_DIR)\
-    lispdir=$(LISP_DIR)/jabber\
-    infodir=$(INFO_DIR)\
-    libexecdir=$(LISP_DIR)/jabber/bin
-
-
-# #########################################################################
-# bbdb
-# #########################################################################
-.PHONY:	bbdb
-$(ELISP_DIR)/bbdb/configure :\
-  $(ELISP_DIR)/bbdb/configure.ac
-	cd $(ELISP_DIR)/bbdb && autoconf
-
-$(ELISP_DIR)/bbdb/Makefile :\
-  $(ELISP_DIR)/bbdb/configure\
-  $(ELISP_DIR)/bbdb/Makefile.in\
-  $(ELISP_DIR)/bbdb/doc/Makefile.in\
-  $(ELISP_DIR)/bbdb/lisp/Makefile.in\
-  $(ELISP_DIR)/bbdb/tex/Makefile.in
-	cd $(@D) && ./configure\
-    --datarootdir=$(DOT_DIR)\
-    --with-lispdir=$(LISP_DIR)/bbdb\
-    --with-texmf-dir=$(DOT_DIR)/var/texmf
-bbdb: $(ELISP_DIR)/bbdb/Makefile
-	$(MAKE) -C $(DIR-$@) install EMACS='"$(EMACS)"'
-
-
-# #########################################################################
-# w3
-# #########################################################################
-.PHONY:	w3
-w3:
-	$(MAKE) -C $(DIR-$@) install\
-    EMACS="'$(EMACS)'"\
-    prefix=$(DOT_DIR)\
-    lispdir=$(LISP_DIR)/w3\
-    infodir=$(INFO_DIR)\
-    libexecdir=$(LISP_DIR)/w3/bin\
-    datadir=$(DOT_DIR)/var/share\
-
-
 # #########################################################################
 # include .el pattern rules
 # #########################################################################