diff options
author | Achim Gratz <Stromeko@Stromeko.DE> | 2012-09-20 22:35:35 +0200 |
---|---|---|
committer | Achim Gratz <Stromeko@Stromeko.DE> | 2012-09-20 22:35:35 +0200 |
commit | 27527b670ed0b9b11b7981bbba047a42594f6184 (patch) | |
tree | 16ba3d64fcf8dd954505d4774cf388439fd52ae2 | |
parent | ac9ed2a95db0e73ffadc85006616ca3de281c12b (diff) | |
download | org-mode-27527b670ed0b9b11b7981bbba047a42594f6184.tar.gz |
Makefile: add contrib files while generating autoloads
* mk/targets.mk: Move copy of contrib additions to lisp/Makefile.
* lisp/Makefile: Let `autoloads´ in lisp re-generate contrib files by
depending on new target `addcontrib´ in the right order.
-rw-r--r-- | lisp/Makefile | 13 | ||||
-rw-r--r-- | mk/targets.mk | 9 |
2 files changed, 12 insertions, 10 deletions
diff --git a/lisp/Makefile b/lisp/Makefile index da84db0..4bc86d4 100644 --- a/lisp/Makefile +++ b/lisp/Makefile @@ -14,7 +14,7 @@ _ORGCM_ = dirall single source slint1 slint2 .PHONY: all compile compile-dirty \ $(_ORGCM_) $(_ORGCM_:%=compile-%) \ - autoloads \ + autoloads addcontrib \ install clean cleanauto cleanall cleanelc clean-install # do not clean here, done in toplevel make @@ -48,7 +48,16 @@ slint1: @$(info Compiling single $(abspath $<)...) -@$(ELC) $< -autoloads: cleanauto $(LISPI) $(LISPV) +addcontrib: +ifneq ($(ORG_ADD_CONTRIB),) + $(CP) $(wildcard \ + $(addsuffix .el, \ + $(addprefix ../contrib/lisp/, \ + $(basename \ + $(notdir $(ORG_ADD_CONTRIB)))))) . +endif + +autoloads: cleanauto addcontrib $(LISPI) $(LISPV) $(LISPV): $(LISPF) @echo "org-version: $(ORGVERSION) ($(GITVERSION))" diff --git a/mk/targets.mk b/mk/targets.mk index aac6de9..31fc5e7 100644 --- a/mk/targets.mk +++ b/mk/targets.mk @@ -28,7 +28,7 @@ endif check test install $(INSTSUB) \ info html pdf card refcard doc docs \ autoloads cleanall clean $(CLEANDIRS:%=clean%) \ - clean-install cleanelc cleandirs \ + clean-install cleanelc cleandirs cleanaddcontrib \ cleanlisp cleandoc cleandocs cleantest \ compile compile-dirty uncompiled \ config config-test config-exe config-all config-eol @@ -121,13 +121,6 @@ $(INSTSUB): $(MAKE) -C $(@:install-%=%) install autoloads: lisp -ifneq ($(ORG_ADD_CONTRIB),) - $(CP) $(wildcard \ - $(addsuffix .el, \ - $(addprefix contrib/lisp/, \ - $(basename \ - $(notdir $(ORG_ADD_CONTRIB)))))) lisp/ -endif $(MAKE) -C $< $@ cleandirs: |