[elpa] externals/org 4cad6c8eaf: * lisp/Makefile: Remove references to org-contrib

[ELPA Syncer]

branch: externals/org
commit 4cad6c8eafe22317a2a010a0592ce97b67811f32
Author: Ihor Radchenko <yantar92@posteo.net>
Commit: Ihor Radchenko <yantar92@posteo.net>

    * lisp/Makefile: Remove references to org-contrib
    
    Since org-contrib is now a separate package, the parts of Makefile
    that are referring to it are no longer needed.
---
 lisp/Makefile | 21 +++------------------
 1 file changed, 3 insertions(+), 18 deletions(-)

diff --git a/lisp/Makefile b/lisp/Makefile
index f2a14b5d54..f507f18a27 100644
--- a/lisp/Makefile
+++ b/lisp/Makefile
@@ -4,28 +4,18 @@ ifeq ($(MAKELEVEL), 0)
   $(error This make needs to be started as a sub-make from the toplevel 
directory.)
 endif
 
-ifneq ($(ORG_ADD_CONTRIB),)
-  _ORG_ADD_EL_ := \
-       $(notdir \
-       $(wildcard \
-       $(addsuffix .el, \
-       $(addprefix ../contrib/lisp/, \
-       $(basename \
-       $(notdir $(ORG_ADD_CONTRIB)))))))
-endif
-
 LISPV  := org-version.el
 LISPI  := org-loaddefs.el
 LISPA  := $(LISPV) $(LISPI)
 LISPB  := $(LISPA:%el=%elc) org-install.elc
-LISPF  := $(filter-out $(LISPA),$(sort $(wildcard *.el) $(_ORG_ADD_EL_)))
+LISPF  := $(filter-out $(LISPA),$(sort $(wildcard *.el)))
 LISPC  := $(filter-out $(LISPB) $(LISPN:%el=%elc),$(LISPF:%el=%elc))
 _ORGCM_ := dirall single source slint1 slint2
 -include local.mk
 
 .PHONY:        all compile compile-dirty \
        $(_ORGCM_) $(_ORGCM_:%=compile-%) \
-       autoloads addcontrib \
+       autoloads \
        install clean cleanauto cleanall cleanelc clean-install
 
 # do not clean here, done in toplevel make
@@ -59,12 +49,7 @@ slint1:
        @$(info Compiling single $(abspath $<)...)
        -@$(ELC) $<
 
-addcontrib:
-ifneq ($(ORG_ADD_CONTRIB),)
-       $(CP) $(addprefix ../contrib/lisp/,$(_ORG_ADD_EL_)) .
-endif
-
-autoloads:     cleanauto addcontrib $(LISPI) $(LISPV)
+autoloads:     cleanauto $(LISPI) $(LISPV)
 
 $(LISPV):      $(LISPF)
        @echo "org-version: $(ORGVERSION) ($(GITVERSION))"