aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorJim Blandy1993-05-24 15:39:31 +0000
committerJim Blandy1993-05-24 15:39:31 +0000
commit9ff5de0791b4ed4fb2ed11f7c27002763e974d91 (patch)
tree2133efa9e841c5f62358a426fdf7df980508d9dc /lib-src
parente7c7295c919d939c9b21adeecff89336318c6578 (diff)
downloademacs-9ff5de0791b4ed4fb2ed11f7c27002763e974d91.tar.gz
emacs-9ff5de0791b4ed4fb2ed11f7c27002763e974d91.zip
* timer.c (xmalloc): Include definition for this, to placate the C
version of alloca. * Makefile.in (timer.o): Link with alloca.o, if it's appropriate.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/Makefile.in5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 5917a181e73..c940551231c 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -233,14 +233,15 @@ emacsclient: ${srcdir}/emacsclient.c ../src/config.h
233hexl: ${srcdir}/hexl.c 233hexl: ${srcdir}/hexl.c
234 $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl 234 $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl
235 235
236TIMEROBJS=getdate.o timer.o $(ALLOCA)
236getdate.o: ${srcdir}/getdate.y ../src/config.h 237getdate.o: ${srcdir}/getdate.y ../src/config.h
237 ${YACC} ${YFLAGS} ${srcdir}/getdate.y 238 ${YACC} ${YFLAGS} ${srcdir}/getdate.y
238 $(CC) -I${srcdir}/../src $(ALL_CFLAGS) -c y.tab.c 239 $(CC) -I${srcdir}/../src $(ALL_CFLAGS) -c y.tab.c
239 mv y.tab.o getdate.o 240 mv y.tab.o getdate.o
240timer.o: ${srcdir}/timer.c ../src/config.h 241timer.o: ${srcdir}/timer.c ../src/config.h
241 $(CC) -c -I${srcdir}/../src $(ALL_CFLAGS) ${srcdir}/timer.c 242 $(CC) -c -I${srcdir}/../src $(ALL_CFLAGS) ${srcdir}/timer.c
242timer: getdate.o timer.o 243timer: ${TIMEROBJS}
243 $(CC) -I${srcdir}/../src $(ALL_CFLAGS) getdate.o timer.o -o timer 244 $(CC) -I${srcdir}/../src $(ALL_CFLAGS) ${TIMEROBJS} -o timer
244 245
245make-path: ${srcdir}/make-path.c 246make-path: ${srcdir}/make-path.c
246 $(CC) $(ALL_CFLAGS) ${srcdir}/make-path.c -o make-path 247 $(CC) $(ALL_CFLAGS) ${srcdir}/make-path.c -o make-path