aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2014-09-01 02:49:51 -0700
committerPaul Eggert2014-09-01 02:49:51 -0700
commitbc12381e609621f4f87a290a4b8abc9d826528df (patch)
treeb0506d9a6c7dc1873277027a7c02f59bd7ffba8d /lib-src
parent1564080f0b24551765d7068b9fc02f6e5a78fea3 (diff)
downloademacs-bc12381e609621f4f87a290a4b8abc9d826528df.tar.gz
emacs-bc12381e609621f4f87a290a4b8abc9d826528df.zip
--enable-silent-warnings now suppresses more chatter.
* INSTALL, etc/NEWS: Document this. * lib-src/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) (am__v_CCLD_1): New macros, taken from Automake. (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT}) (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT}) (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT}) (update-game-score${EXEEXT}): Use them. * lwlib/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. (.c.o): Use them. * oldXMenu/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1): New macros, taken from Automake. (.c.o): Use them. * src/Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_) (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0) (am__v_CCLD_1): New macros, taken from Automake. (.c.o, .m.o, temacs$(EXEEXT)): Use them.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog10
-rw-r--r--lib-src/Makefile.in40
2 files changed, 37 insertions, 13 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index bf4d500921b..b96fb192027 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -1,5 +1,15 @@
12014-09-01 Paul Eggert <eggert@cs.ucla.edu> 12014-09-01 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 --enable-silent-warnings now suppresses more chatter.
4 * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_CC, am__v_CC_)
5 (am__v_CC_0, am__v_CC_1, AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0)
6 (am__v_CCLD_1): New macros, taken from Automake.
7 (regex.o, etags${EXEEXT}, ctags${EXEEXT}, ebrowse${EXEEXT})
8 (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
9 (pop.o, emacsclient${EXEEXT}, emacsclientw${EXEEXT})
10 (emacsclientw${EXEEXT}, ntlib.o, hexl${EXEEXT})
11 (update-game-score${EXEEXT}): Use them.
12
3 * etags.c (emacs_strchr, emacs_strrchr): Remove. 13 * etags.c (emacs_strchr, emacs_strrchr): Remove.
4 All uses replaced by strchr and strrchr, which are on all 14 All uses replaced by strchr and strrchr, which are on all
5 target platforms now. 15 target platforms now.
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index 7eb13f667ec..fe101047dea 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -45,6 +45,19 @@ UPDATE_MANIFEST = @UPDATE_MANIFEST@
45# Program name transformation. 45# Program name transformation.
46TRANSFORM = @program_transform_name@ 46TRANSFORM = @program_transform_name@
47 47
48# 'make' verbosity.
49AM_DEFAULT_VERBOSITY = @AM_DEFAULT_VERBOSITY@
50
51AM_V_CC = $(am__v_CC_@AM_V@)
52am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
53am__v_CC_0 = @echo " CC " $@;
54am__v_CC_1 =
55
56AM_V_CCLD = $(am__v_CCLD_@AM_V@)
57am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
58am__v_CCLD_0 = @echo " CCLD " $@;
59am__v_CCLD_1 =
60
48# ==================== Where To Install Things ==================== 61# ==================== Where To Install Things ====================
49 62
50# Location to install Emacs.app under GNUstep / Mac OS X. 63# Location to install Emacs.app under GNUstep / Mac OS X.
@@ -311,7 +324,7 @@ TAGS: etags${EXEEXT}
311 $(MAKE) -C ../lib libgnu.a 324 $(MAKE) -C ../lib libgnu.a
312 325
313regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) 326regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h)
314 ${CC} -c ${CPP_CFLAGS} $< 327 $(AM_V_CC)$(CC) -c $(CPP_CFLAGS) $<
315 328
316 329
317etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h) 330etags_deps = ${srcdir}/etags.c regex.o $(NTLIB) $(config_h)
@@ -319,41 +332,41 @@ etags_cflags = -DEMACS_NAME="\"GNU Emacs\"" -DVERSION="\"${version}\"" -o $@
319etags_libs = regex.o $(LOADLIBES) $(NTLIB) 332etags_libs = regex.o $(LOADLIBES) $(NTLIB)
320 333
321etags${EXEEXT}: ${etags_deps} 334etags${EXEEXT}: ${etags_deps}
322 $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) 335 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
323 336
324## ctags.c is distinct from etags.c so that parallel makes do not write two 337## ctags.c is distinct from etags.c so that parallel makes do not write two
325## etags.o files on top of each other. 338## etags.o files on top of each other.
326## FIXME? 339## FIXME?
327## Can't we use a wrapper that calls 'etags --ctags'? 340## Can't we use a wrapper that calls 'etags --ctags'?
328ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps} 341ctags${EXEEXT}: ${srcdir}/ctags.c ${etags_deps}
329 $(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs) 342 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(etags_cflags) $< $(etags_libs)
330 343
331ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ 344ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \
332 $(config_h) 345 $(config_h)
333 $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ 346 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \
334 $< $(LOADLIBES) $(NTLIB) -o $@ 347 $< $(LOADLIBES) $(NTLIB) -o $@
335 348
336profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) 349profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h)
337 $(CC) ${ALL_CFLAGS} $< \ 350 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
338 $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@ 351 $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@
339 352
340make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h) 353make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h)
341 $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@ 354 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) $(NTLIB) -o $@
342 355
343movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h) 356movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h)
344 $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \ 357 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} $< pop.o \
345 $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@ 358 $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@
346 359
347pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) 360pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h)
348 $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $< 361 $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} $<
349 362
350emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) 363emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h)
351 $(CC) ${ALL_CFLAGS} $< \ 364 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< \
352 -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \ 365 -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \
353 $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@ 366 $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
354 367
355emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) 368emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h)
356 $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \ 369 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows $< \
357 -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \ 370 -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \
358 $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@ 371 $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@
359 372
@@ -365,13 +378,14 @@ NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \
365# The dependency on $(NTDEPS) is a trick intended to cause recompile of 378# The dependency on $(NTDEPS) is a trick intended to cause recompile of
366# programs on MinGW whenever some private header in nt/inc is modified. 379# programs on MinGW whenever some private header in nt/inc is modified.
367ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS) 380ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS)
368 $(CC) -c ${CPP_CFLAGS} $< 381 $(AM_V_CC)$(CC) -c ${CPP_CFLAGS} $<
369 382
370hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h) 383hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h)
371 $(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@ 384 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} $< $(LOADLIBES) -o $@
372 385
373update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) 386update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h)
374 $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ 387 $(AM_V_CCLD)$(CC) ${ALL_CFLAGS} \
388 -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \
375 $< $(LOADLIBES) $(NTLIB) -o $@ 389 $< $(LOADLIBES) $(NTLIB) -o $@
376 390
377emacsclient.res: $(NTINC)/../emacsclient.rc 391emacsclient.res: $(NTINC)/../emacsclient.rc