diff options
| author | Stefan Monnier | 1999-10-10 01:32:09 +0000 |
|---|---|---|
| committer | Stefan Monnier | 1999-10-10 01:32:09 +0000 |
| commit | 3f4c23f9845ea6d8cdb9b9a0ed4e5641704d9f42 (patch) | |
| tree | cacfbb70d2f15e18d4e058d371f809440584ad47 | |
| parent | 3f72fac8655baf2940a6be61d59e2a6d7e80ae73 (diff) | |
| download | emacs-3f4c23f9845ea6d8cdb9b9a0ed4e5641704d9f42.tar.gz emacs-3f4c23f9845ea6d8cdb9b9a0ed4e5641704d9f42.zip | |
(setwins): generalized a little.
(compile, bootstrap-compile, autoloads-with-other-emacs): use it.
| -rw-r--r-- | lisp/Makefile | 40 |
1 files changed, 12 insertions, 28 deletions
diff --git a/lisp/Makefile b/lisp/Makefile index 4c39540bbb4..e37d1014a2a 100644 --- a/lisp/Makefile +++ b/lisp/Makefile | |||
| @@ -52,7 +52,7 @@ temacs=../src/temacs -batch -l ./loadup.el | |||
| 52 | 52 | ||
| 53 | # Common command to find subdirectories | 53 | # Common command to find subdirectories |
| 54 | 54 | ||
| 55 | setwins=subdirs=`find . -type d -print`; \ | 55 | setwins=subdirs=`find $$wd -type d -print`; \ |
| 56 | for file in $$subdirs; do \ | 56 | for file in $$subdirs; do \ |
| 57 | case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \ | 57 | case $$file in */Old | */RCS | */CVS | */CVS/* | */=* ) ;; \ |
| 58 | *) wins="$$wins $$file" ;; \ | 58 | *) wins="$$wins $$file" ;; \ |
| @@ -62,28 +62,28 @@ setwins=subdirs=`find . -type d -print`; \ | |||
| 62 | doit: | 62 | doit: |
| 63 | 63 | ||
| 64 | custom-deps: doit | 64 | custom-deps: doit |
| 65 | $(setwins); \ | 65 | wd=.; $(setwins); \ |
| 66 | echo Directories: $$wins; \ | 66 | echo Directories: $$wins; \ |
| 67 | $(emacs) -l cus-dep -f custom-make-dependencies $$wins | 67 | $(emacs) -l cus-dep -f custom-make-dependencies $$wins |
| 68 | 68 | ||
| 69 | finder-data: doit | 69 | finder-data: doit |
| 70 | $(setwins); \ | 70 | wd=.; $(setwins); \ |
| 71 | echo Directories: $$wins; \ | 71 | echo Directories: $$wins; \ |
| 72 | $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins | 72 | $(emacs) -l finder -f finder-compile-keywords-make-dist $$wins |
| 73 | 73 | ||
| 74 | autoloads: doit | 74 | autoloads: doit |
| 75 | $(setwins); \ | 75 | wd=.; $(setwins); \ |
| 76 | echo Directories: $$wins; \ | 76 | echo Directories: $$wins; \ |
| 77 | $(emacs) -f batch-update-autoloads $$wins | 77 | $(emacs) -f batch-update-autoloads $$wins |
| 78 | 78 | ||
| 79 | update-subdirs: doit | 79 | update-subdirs: doit |
| 80 | $(setwins); \ | 80 | wd=.; $(setwins); \ |
| 81 | for file in $$wins; do \ | 81 | for file in $$wins; do \ |
| 82 | ../update-subdirs $$file; \ | 82 | ../update-subdirs $$file; \ |
| 83 | done; | 83 | done; |
| 84 | 84 | ||
| 85 | updates: doit | 85 | updates: doit |
| 86 | $(setwins); \ | 86 | wd=.; $(setwins); \ |
| 87 | for file in $$wins; do \ | 87 | for file in $$wins; do \ |
| 88 | ../update-subdirs $$file; \ | 88 | ../update-subdirs $$file; \ |
| 89 | done; \ | 89 | done; \ |
| @@ -112,14 +112,8 @@ TAGS-LISP: $(lispsource)$(lisptagsfiles1) $(lispsource)$(lisptagsfiles2) | |||
| 112 | compile: doit | 112 | compile: doit |
| 113 | wd=`pwd`; \ | 113 | wd=`pwd`; \ |
| 114 | find $$wd -name "*.elc" -print | xargs chmod +w; \ | 114 | find $$wd -name "*.elc" -print | xargs chmod +w; \ |
| 115 | subdirs=`find $$wd -type d -print`; \ | 115 | $(setwins) \ |
| 116 | for dir in $$subdirs; do \ | 116 | loadpath="(setq load-path '($$wins))"; \ |
| 117 | case $$dir in \ | ||
| 118 | */Old | */RCS | */CVS | */=* ) ;; \ | ||
| 119 | *) loadpath="$$loadpath \"$$dir\"" ;; \ | ||
| 120 | esac; \ | ||
| 121 | done; \ | ||
| 122 | loadpath="(setq load-path '($$loadpath))"; \ | ||
| 123 | dont_compile=`echo $(DONTCOMPILE)`; \ | 117 | dont_compile=`echo $(DONTCOMPILE)`; \ |
| 124 | for el in $(EL); do \ | 118 | for el in $(EL); do \ |
| 125 | compile_it=y; \ | 119 | compile_it=y; \ |
| @@ -142,14 +136,8 @@ compile: doit | |||
| 142 | bootstrap-compile: doit | 136 | bootstrap-compile: doit |
| 143 | wd=`pwd`; \ | 137 | wd=`pwd`; \ |
| 144 | find $$wd -name "*.elc" -print | xargs rm -f \ | 138 | find $$wd -name "*.elc" -print | xargs rm -f \ |
| 145 | subdirs=`find $$wd -type d -print`; \ | 139 | $(setwins) \ |
| 146 | for dir in $$subdirs; do \ | 140 | loadpath="(setq load-path '($$wins))"; \ |
| 147 | case $$dir in \ | ||
| 148 | */Old | */RCS | */CVS | */=* ) ;; \ | ||
| 149 | *) loadpath="$$loadpath \"$$dir\"" ;; \ | ||
| 150 | esac; \ | ||
| 151 | done; \ | ||
| 152 | loadpath="(setq load-path '($$loadpath))"; \ | ||
| 153 | dont_compile=`echo $(DONTCOMPILE)`; \ | 141 | dont_compile=`echo $(DONTCOMPILE)`; \ |
| 154 | for el in $(EL); do \ | 142 | for el in $(EL); do \ |
| 155 | compile_it=y; \ | 143 | compile_it=y; \ |
| @@ -178,14 +166,10 @@ recompile: doit | |||
| 178 | # autoload.el reads and writes loaddefs.el in its `source-directory'. | 166 | # autoload.el reads and writes loaddefs.el in its `source-directory'. |
| 179 | # If that's different from the current directory tree, we can't build | 167 | # If that's different from the current directory tree, we can't build |
| 180 | # loaddefs.el. | 168 | # loaddefs.el. |
| 169 | # Can't this rule be used in place of `autoload'? -sm | ||
| 181 | 170 | ||
| 182 | autoloads-with-other-emacs: doit | 171 | autoloads-with-other-emacs: doit |
| 183 | subdirs=`find . -type d -print`; \ | 172 | wd=.; $(setwins); \ |
| 184 | for file in $$subdirs; do \ | ||
| 185 | case $$file in */Old | */RCS | */CVS | */=* ) ;; \ | ||
| 186 | *) wins="$$wins $$file" ;; \ | ||
| 187 | esac; \ | ||
| 188 | done; \ | ||
| 189 | echo Directories: $$wins; \ | 173 | echo Directories: $$wins; \ |
| 190 | $(emacs) --eval '(setq source-directory ".")' \ | 174 | $(emacs) --eval '(setq source-directory ".")' \ |
| 191 | -f batch-update-autoloads $$wins | 175 | -f batch-update-autoloads $$wins |