comparison src/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 9873ea104ef6
children 4ce4d519bdd8
comparison
equal deleted inserted replaced
4938:299dce99bdad 4939:349f01075eb7
1 ## Makefile for src subdirectory in XEmacs. 1 ## Makefile for src subdirectory in XEmacs.
2 ## Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc. 2 ## Copyright (C) 1985, 1987, 1988, 1993, 1994 Free Software Foundation, Inc.
3 ## Copyright (C) 1994, 1995 Board of Trustees, University of Illinois 3 ## Copyright (C) 1994, 1995 Board of Trustees, University of Illinois
4 ## Copyright (C) 1996, 1997 Sun Microsystems, Inc. 4 ## Copyright (C) 1996, 1997 Sun Microsystems, Inc.
5 ## Copyright (C) 1998, 1999 J. Kean Johnston. 5 ## Copyright (C) 1998, 1999 J. Kean Johnston.
6 ## Copyright (C) 2001, 2002, 2003, 2005 Ben Wing. 6 ## Copyright (C) 2001, 2002, 2003, 2005, 2010 Ben Wing.
7 7
8 ## This file is part of XEmacs. 8 ## This file is part of XEmacs.
9 9
10 ## XEmacs is free software; you can redistribute it and/or modify it 10 ## XEmacs is free software; you can redistribute it and/or modify it
11 ## under the terms of the GNU General Public License as published by the 11 ## under the terms of the GNU General Public License as published by the
915 915
916 ###################### Automated tests 916 ###################### Automated tests
917 testdir = $(SRC)/../tests/automated 917 testdir = $(SRC)/../tests/automated
918 batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir) 918 batch_test_emacs = $(BATCH_PACKAGES) -l $(testdir)/test-harness.el -f batch-test-emacs $(testdir)
919 919
920 # `config-changed' is useful if you are building both Unicode-internal
921 # and old-Mule workspaces using --srcdir and don't run configure before
922 # switching from one to the other. If you rerun configure, update-elc.el
923 # notices this and automatically removes the two files below, but not
924 # if you just switch directories and `make'. In that case, do
925 # `make config-changed' to avoid an error.
926
927 .PHONY: remove-config-dependent-elcs config-changed
928 remove-config-dependent-elcs:
929 rm $(LISP)/mule/chinese.elc $(LISP)/mule/general-late.elc
930 config-changed: remove-config-dependent-elcs all
931
932
920 .PHONY: check check-temacs check-features 933 .PHONY: check check-temacs check-features
921 check: 934 check:
922 $(DO_XEMACS) $(batch_test_emacs) 935 $(DO_XEMACS) $(batch_test_emacs)
923 check-temacs: 936 check-temacs:
924 $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs) 937 $(TEMACS_BATCH) $(run_temacs_args) $(batch_test_emacs)