Mercurial > hg > xemacs-beta
comparison Makefile.in.in @ 4939:349f01075eb7
build fixes for gdbinit and config-dependent elc files
-------------------- ChangeLog entries follow: --------------------
ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* Makefile.in.in:
* Makefile.in.in (GENERATED_HEADERS):
* Makefile.in.in (.PHONY):
* Makefile.in.in (src/.gdbinit):
* configure:
* configure.ac (TAB):
etc/gdbinit.in has been moved to src/.gdbinit.in.in. Reflect
this -- generate src/.gdbinit.in from src/.gdbinit.in.in, and
use the normal mechanism for doing so instead of copying it
specially.
Add target for `config-changed' and pass down to `src'.
Move some PHONY declarations to just before the actual targets.
src/ChangeLog addition:
2010-01-20 Ben Wing <ben@xemacs.org>
* .gdbinit.in.in:
Moved here from etc/.gdbinit.in.
Put @srcdir@ in various places rather than just `..' whenever
Makefile.in.in does so. Fixes various strange crashes and errors
than occur when using `..'.
* Makefile.in.in (config-changed):
Add target, useful when building both Unicode-internal and
old-Mule workspaces using --srcdir and don't run configure before
switching from one to the other.
author | Ben Wing <ben@xemacs.org> |
---|---|
date | Wed, 20 Jan 2010 19:48:26 -0600 |
parents | 2727d0d8ef07 |
children | 308d34e9f07d |
comparison
equal
deleted
inserted
replaced
4938:299dce99bdad | 4939:349f01075eb7 |
---|---|
1 ## Copyright (C) 2003, 2005 Ben Wing. | 1 ## Copyright (C) 2003, 2005, 2010 Ben Wing. |
2 | 2 |
3 ## DIST: This is the distribution Makefile for XEmacs. configure can | 3 ## DIST: This is the distribution Makefile for XEmacs. configure can |
4 ## DIST: make most of the changes to this file you might want, so try | 4 ## DIST: make most of the changes to this file you might want, so try |
5 ## DIST: that first. | 5 ## DIST: that first. |
6 | 6 |
241 ## When installing the info files, we need to do special things to | 241 ## When installing the info files, we need to do special things to |
242 ## avoid nuking an existing dir file, so we don't do that here; | 242 ## avoid nuking an existing dir file, so we don't do that here; |
243 ## instead, we have written out explicit code in the `install' targets. | 243 ## instead, we have written out explicit code in the `install' targets. |
244 COPYDIR = ${srcdir}/etc ${srcdir}/lisp | 244 COPYDIR = ${srcdir}/etc ${srcdir}/lisp |
245 COPYDESTS = ${etcdir} ${lispdir} | 245 COPYDESTS = ${etcdir} ${lispdir} |
246 GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h src/xemacs.def etc/PROBLEMS | 246 GENERATED_HEADERS = src/paths.h src/Emacs.ad.h src/config.h lwlib/config.h src/sheap-adjust.h src/xemacs.def etc/PROBLEMS src/.gdbinit |
247 | 247 |
248 ## MAKE_SUBDIR will always be of the form lib-src ... src, where | 248 ## MAKE_SUBDIR will always be of the form lib-src ... src, where |
249 ## `...' includes various other directories that may be inserted by | 249 ## `...' includes various other directories that may be inserted by |
250 ## configure. | 250 ## configure. |
251 all: Makefile ${GENERATED_HEADERS} ${MAKE_SUBDIR} info | 251 all: Makefile ${GENERATED_HEADERS} ${MAKE_SUBDIR} info |
280 cd ${srcdir} && $(SHELL) lib-src/config.values.sh | 280 cd ${srcdir} && $(SHELL) lib-src/config.values.sh |
281 | 281 |
282 depend ${srcdir}/src/depend: | 282 depend ${srcdir}/src/depend: |
283 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) depend | 283 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) depend |
284 | 284 |
285 .PHONY: config-changed | |
286 config-changed: | |
287 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@ | |
288 | |
289 .PHONY: check | |
285 check: | 290 check: |
286 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@ | 291 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@ |
287 | 292 |
293 .PHONY: check-features | |
288 check-features: all | 294 check-features: all |
289 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@ | 295 cd ./src && $(MAKE) $(RECURSIVE_MAKE_ARGS) $@ |
290 | 296 |
291 ## We have to force the building of Emacs.ad.h as well in order to get it | 297 ## We have to force the building of Emacs.ad.h as well in order to get it |
292 ## updated correctly when VPATH is being used. Since we use move-if-change, | 298 ## updated correctly when VPATH is being used. Since we use move-if-change, |
353 ./config.status && touch $@ | 359 ./config.status && touch $@ |
354 | 360 |
355 src/xemacs.def: $(srcdir)/src/xemacs.def.in.in | 361 src/xemacs.def: $(srcdir)/src/xemacs.def.in.in |
356 ./config.status && touch $@ | 362 ./config.status && touch $@ |
357 | 363 |
364 src/.gdbinit: ${srcdir}/src/.gdbinit.in.in | |
365 ./config.status && touch $@ | |
366 | |
358 etc/PROBLEMS: $(srcdir)/PROBLEMS | 367 etc/PROBLEMS: $(srcdir)/PROBLEMS |
359 cp $^ $@ | 368 cp $^ $@ |
360 | 369 |
361 ## ==================== Installation ==================== | 370 ## ==================== Installation ==================== |
362 | 371 |
365 ## this Makefile as well. | 374 ## this Makefile as well. |
366 | 375 |
367 ## On AIX, use tar xBf. | 376 ## On AIX, use tar xBf. |
368 | 377 |
369 .PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir | 378 .PHONY: install-only install install-arch-dep install-arch-indep gzip.el mkdir |
370 .PHONY: check check-features | |
371 | 379 |
372 ## We delete each directory in ${COPYDESTS} before we copy into it; | 380 ## We delete each directory in ${COPYDESTS} before we copy into it; |
373 ## that way, we can reinstall over directories that have been put in | 381 ## that way, we can reinstall over directories that have been put in |
374 ## place with their files read-only (perhaps because they are checked | 382 ## place with their files read-only (perhaps because they are checked |
375 ## into RCS). In order to make this safe, we make sure that the | 383 ## into RCS). In order to make this safe, we make sure that the |