Mercurial > hg > xemacs-beta
changeset 1252:a0845169de0a
[xemacs-hg @ 2003-02-03 17:46:54 by james]
Fix module building on FreeBSD (and probably other non-GNU make systems).
| author | james |
|---|---|
| date | Mon, 03 Feb 2003 17:46:58 +0000 |
| parents | 47ea9f547332 |
| children | fa27ca2c798c |
| files | modules/ChangeLog modules/common/Makefile.common |
| diffstat | 2 files changed, 11 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/modules/ChangeLog Mon Feb 03 02:42:56 2003 +0000 +++ b/modules/ChangeLog Mon Feb 03 17:46:58 2003 +0000 @@ -1,3 +1,9 @@ +2003-01-30 Robert Pluim <rpluim@bigfoot.com> + + * Makefile.common: FreeBSD make compatability fixes: expand + SRC_SRCS immediately, use MODCC rather than CC to prevent + overriding by top-level makefile. + 2003-01-15 Jerry James <james@eecs.ku.edu> * ldap/eldap.c: Apply Ben's postgresql change to LDAP also.
--- a/modules/common/Makefile.common Mon Feb 03 02:42:56 2003 +0000 +++ b/modules/common/Makefile.common Mon Feb 03 17:46:58 2003 +0000 @@ -27,7 +27,7 @@ ## Note: This will be appended to the individual module Makefiles by configure. -SRC_SRCS=$(SRCS:%=$(srcdir)/%) +SRC_SRCS:=$(SRCS:%=$(srcdir)/%) OBJS=$(SRCS:.c=.o) SHELL=/bin/sh @@ -47,7 +47,7 @@ srcdir=@srcdir@ VPATH=@srcdir@ -CC=@MOD_CC@ +MODCC=@MOD_CC@ MODARCHDIR=@MODARCHDIR@ MAKE_DOCFILE=@MAKE_DOCFILE@ MODCFLAGS=@MODCFLAGS@ @@ -59,13 +59,13 @@ all: $(OBJECT_TO_BUILD) .c.o: - $(CC) $(MODCFLAGS) -c $< + $(MODCC) $(MODCFLAGS) -c $< $(MODNAME).ell: $(OBJS) $(MODNAME)_i.o - $(CC) --mode=link --mode=verbose --mod-output=$@ $^ $(LDFLAGS) + $(MODCC) --mode=link --mode=verbose --mod-output=$@ $^ $(LDFLAGS) $(MODNAME)_i.c: $(SRCS) - ELLMAKEDOC=$(MAKE_DOCFILE) $(CC) --mode=init --mod-output=$@ \ + ELLMAKEDOC=$(MAKE_DOCFILE) $(MODCC) --mode=init --mod-output=$@ \ --mod-name=$(MODNAME) --mod-version=$(MODVER) \ --mod-title=$(MODTITLE) $(SRC_SRCS)