Mercurial > hg > xemacs-beta
changeset 1490:74b2ea269eb5
[xemacs-hg @ 2003-05-20 15:00:22 by james]
Andrew Begel's change to move use of srcdir below its definition.
| author | james |
|---|---|
| date | Tue, 20 May 2003 15:00:28 +0000 |
| parents | 52dd7cedee30 |
| children | d968d4073031 |
| files | modules/ChangeLog modules/common/Makefile.common modules/sample/external/Makefile.in.in modules/sample/internal/Makefile.in.in |
| diffstat | 4 files changed, 15 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/modules/ChangeLog Tue May 20 14:40:09 2003 +0000 +++ b/modules/ChangeLog Tue May 20 15:00:28 2003 +0000 @@ -1,3 +1,9 @@ +2003-05-09 Andrew Begel <abegel@CS.Berkeley.EDU> + + * common/Makefile.common: Move use of srcdir below its definition. + * sample/internal/Makefile.in.in: Ditto. + * sample/external/Makefile.in.in: Ditto. + 2003-05-20 Jerry James <james@xemacs.org> * sample/internal/Makefile.in.in: Expand $^ for makes that don't
--- a/modules/common/Makefile.common Tue May 20 14:40:09 2003 +0000 +++ b/modules/common/Makefile.common Tue May 20 15:00:28 2003 +0000 @@ -27,9 +27,6 @@ ## Note: This will be appended to the individual module Makefiles by configure. -SRC_SRCS:=$(SRCS:%=$(srcdir)/%) -OBJS=$(SRCS:.c=.o) - SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ @@ -47,6 +44,9 @@ srcdir=@srcdir@ VPATH=@srcdir@ +SRC_SRCS:=$(SRCS:%=$(srcdir)/%) +OBJS=$(SRCS:.c=.o) + MODCC=@MOD_CC@ MODARCHDIR=@MODARCHDIR@ MAKE_DOCFILE=@MAKE_DOCFILE@
--- a/modules/sample/external/Makefile.in.in Tue May 20 14:40:09 2003 +0000 +++ b/modules/sample/external/Makefile.in.in Tue May 20 15:00:28 2003 +0000 @@ -10,9 +10,6 @@ SRCS=sample.c ### You should not need to modify anything below this line -SRC_SRCS=$(SRCS:%=$(srcdir)/%) -OBJS=$(SRCS:.c=.o) - SHELL=/bin/sh RM=rm -f CFLAGS=@CFLAGS@ @@ -21,6 +18,9 @@ srcdir=@srcdir@ VPATH=@srcdir@ +SRC_SRCS=$(SRCS:%=$(srcdir)/%) +OBJS=$(SRCS:.c=.o) + ELLCC=@ELLCC@ MODARCHDIR=$(shell @ELLCC@ --mod-archdir) INSTALLPATH=$(shell @ELLCC@ --mod-site-location)
--- a/modules/sample/internal/Makefile.in.in Tue May 20 14:40:09 2003 +0000 +++ b/modules/sample/internal/Makefile.in.in Tue May 20 15:00:28 2003 +0000 @@ -33,9 +33,6 @@ SRCS=sample.c ### You should not need to modify anything below this line -SRC_SRCS=$(SRCS:%=$(srcdir)/%) -OBJS=$(SRCS:.c=.o) - SHELL=/bin/sh RM=rm -f PROGNAME=@PROGNAME@ @@ -53,6 +50,9 @@ srcdir=@srcdir@ VPATH=@srcdir@ +SRC_SRCS=$(SRCS:%=$(srcdir)/%) +OBJS=$(SRCS:.c=.o) + CC=@MOD_CC@ MODARCHDIR=@MODARCHDIR@ MAKE_DOCFILE=@MAKE_DOCFILE@