ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Achim Gratz 2012-09-20 22:37:27 +02:00
parent 23b30cd124 27527b670e
commit f14f829652
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lisp/Makefile
View File

@ -14,7 +14,7 @@ _ORGCM_ = dirall single source slint1 slint2
.PHONY: all compile compile-dirty \ .PHONY: all compile compile-dirty \
$(_ORGCM_) $(_ORGCM_:%=compile-%) \ $(_ORGCM_) $(_ORGCM_:%=compile-%) \
autoloads \ autoloads addcontrib \
install clean cleanauto cleanall cleanelc clean-install install clean cleanauto cleanall cleanelc clean-install
# do not clean here, done in toplevel make # do not clean here, done in toplevel make
@ -48,7 +48,16 @@ slint1:
@$(info Compiling single $(abspath $<)...) @$(info Compiling single $(abspath $<)...)
-@$(ELC) $< -@$(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) $(LISPV): $(LISPF)
@echo "org-version: $(ORGVERSION) ($(GITVERSION))" @echo "org-version: $(ORGVERSION) ($(GITVERSION))"

9
mk/targets.mk
View File

@ -28,7 +28,7 @@ endif
check test install $(INSTSUB) \ check test install $(INSTSUB) \
info html pdf card refcard doc docs \ info html pdf card refcard doc docs \
autoloads cleanall clean $(CLEANDIRS:%=clean%) \ autoloads cleanall clean $(CLEANDIRS:%=clean%) \
clean-install cleanelc cleandirs \ clean-install cleanelc cleandirs cleanaddcontrib \
cleanlisp cleandoc cleandocs cleantest \ cleanlisp cleandoc cleandocs cleantest \
compile compile-dirty uncompiled \ compile compile-dirty uncompiled \
config config-test config-exe config-all config-eol config config-test config-exe config-all config-eol
@ -121,13 +121,6 @@ $(INSTSUB):
$(MAKE) -C $(@:install-%=%) install $(MAKE) -C $(@:install-%=%) install
autoloads: lisp autoloads: lisp
ifneq ($(ORG_ADD_CONTRIB),)
$(CP) $(wildcard \
$(addsuffix .el, \
$(addprefix contrib/lisp/, \
$(basename \
$(notdir $(ORG_ADD_CONTRIB)))))) lisp/
endif
$(MAKE) -C $< $@ $(MAKE) -C $< $@
cleandirs: cleandirs: