diff options
| author | Glenn Morris | 2014-03-22 16:06:29 -0700 |
|---|---|---|
| committer | Glenn Morris | 2014-03-22 16:06:29 -0700 |
| commit | df199e5601dd89b94643946a3edcdabfafc53913 (patch) | |
| tree | 324810a9780babc04559b462a6bd36699a0cc0cf /lib-src | |
| parent | 01b0f2f4b1b333969b9013156b55f1779d0f593a (diff) | |
| download | emacs-df199e5601dd89b94643946a3edcdabfafc53913.tar.gz emacs-df199e5601dd89b94643946a3edcdabfafc53913.zip | |
Use $@ more in lib-src/Makefile.in
* lib-src/Makefile.in (etags${EXEEXT}, ebrowse${EXEEXT}, ctags${EXEEXT})
(profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT})
(emacsclient${EXEEXT}, emacsclientw${EXEEXT}, hexl${EXEEXT})
(update-game-score${EXEEXT}, emacsclient.res): Use $@.
Diffstat (limited to 'lib-src')
| -rw-r--r-- | lib-src/ChangeLog | 5 | ||||
| -rw-r--r-- | lib-src/Makefile.in | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index 9cbe55fe382..3472f54b0aa 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -1,5 +1,10 @@ | |||
| 1 | 2014-03-22 Glenn Morris <rgm@gnu.org> | 1 | 2014-03-22 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (etags${EXEEXT}, ebrowse${EXEEXT}, ctags${EXEEXT}) | ||
| 4 | (profile${EXEEXT}, make-docfile${EXEEXT}, movemail${EXEEXT}) | ||
| 5 | (emacsclient${EXEEXT}, emacsclientw${EXEEXT}, hexl${EXEEXT}) | ||
| 6 | (update-game-score${EXEEXT}, emacsclient.res): Use $@. | ||
| 7 | |||
| 3 | * Makefile.in (../lib/libgnu.a): Explicitly pass MFLAGS. | 8 | * Makefile.in (../lib/libgnu.a): Explicitly pass MFLAGS. |
| 4 | 9 | ||
| 5 | * Makefile.in (DONT_INSTALL): Remove test-distrib. | 10 | * Makefile.in (DONT_INSTALL): Remove test-distrib. |
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in index f16e0705b47..7f22ee72602 100644 --- a/lib-src/Makefile.in +++ b/lib-src/Makefile.in | |||
| @@ -312,31 +312,31 @@ regex.o: $(srcdir)/../src/regex.c $(srcdir)/../src/regex.h $(config_h) | |||
| 312 | etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h) | 312 | etags${EXEEXT}: ${srcdir}/etags.c regex.o $(NTLIB) $(config_h) |
| 313 | $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ | 313 | $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ |
| 314 | -DVERSION="\"${version}\"" ${srcdir}/etags.c \ | 314 | -DVERSION="\"${version}\"" ${srcdir}/etags.c \ |
| 315 | regex.o $(LOADLIBES) $(NTLIB) -o etags${EXEEXT} | 315 | regex.o $(LOADLIBES) $(NTLIB) -o $@ |
| 316 | 316 | ||
| 317 | ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ | 317 | ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ${srcdir}/../lib/min-max.h $(NTLIB) \ |
| 318 | $(config_h) | 318 | $(config_h) |
| 319 | $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ | 319 | $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ |
| 320 | ${srcdir}/ebrowse.c $(LOADLIBES) $(NTLIB) -o ebrowse${EXEEXT} | 320 | ${srcdir}/ebrowse.c $(LOADLIBES) $(NTLIB) -o $@ |
| 321 | 321 | ||
| 322 | ## We depend on etags to assure that parallel makes do not write two | 322 | ## We depend on etags to assure that parallel makes do not write two |
| 323 | ## etags.o files on top of each other. | 323 | ## etags.o files on top of each other. |
| 324 | ctags${EXEEXT}: etags${EXEEXT} | 324 | ctags${EXEEXT}: etags${EXEEXT} |
| 325 | $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ | 325 | $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ |
| 326 | -DVERSION="\"${version}\"" ${srcdir}/etags.c \ | 326 | -DVERSION="\"${version}\"" ${srcdir}/etags.c \ |
| 327 | regex.o $(LOADLIBES) $(NTLIB) -o ctags${EXEEXT} | 327 | regex.o $(LOADLIBES) $(NTLIB) -o $@ |
| 328 | 328 | ||
| 329 | profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) | 329 | profile${EXEEXT}: ${srcdir}/profile.c $(NTLIB) $(config_h) |
| 330 | $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \ | 330 | $(CC) ${ALL_CFLAGS} ${srcdir}/profile.c \ |
| 331 | $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o profile${EXEEXT} | 331 | $(LOADLIBES) $(NTLIB) $(LIB_CLOCK_GETTIME) -o $@ |
| 332 | 332 | ||
| 333 | make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h) | 333 | make-docfile${EXEEXT}: ${srcdir}/make-docfile.c $(NTLIB) $(config_h) |
| 334 | $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) $(NTLIB) \ | 334 | $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) $(NTLIB) \ |
| 335 | -o make-docfile${EXEEXT} | 335 | -o $@ |
| 336 | 336 | ||
| 337 | movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h) | 337 | movemail${EXEEXT}: ${srcdir}/movemail.c pop.o $(NTLIB) $(config_h) |
| 338 | $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \ | 338 | $(CC) ${ALL_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o \ |
| 339 | $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o movemail${EXEEXT} | 339 | $(LOADLIBES) $(NTLIB) $(LIBS_MOVE) -o $@ |
| 340 | 340 | ||
| 341 | pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) | 341 | pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) |
| 342 | $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c | 342 | $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/pop.c |
| @@ -344,12 +344,12 @@ pop.o: ${srcdir}/pop.c ${srcdir}/pop.h ${srcdir}/../lib/min-max.h $(config_h) | |||
| 344 | emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) | 344 | emacsclient${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(config_h) |
| 345 | $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ | 345 | $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ |
| 346 | -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \ | 346 | -DVERSION="\"${version}\"" $(NTLIB) $(LOADLIBES) $(LIB_FDATASYNC) \ |
| 347 | $(LIB_WSOCK32) $(LIBS_ECLIENT) -o emacsclient${EXEEXT} | 347 | $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@ |
| 348 | 348 | ||
| 349 | emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) | 349 | emacsclientw${EXEEXT}: ${srcdir}/emacsclient.c $(NTLIB) $(CLIENTRES) $(config_h) |
| 350 | $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows ${srcdir}/emacsclient.c \ | 350 | $(CC) ${ALL_CFLAGS} $(CLIENTRES) -mwindows ${srcdir}/emacsclient.c \ |
| 351 | -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \ | 351 | -DVERSION="\"${version}\"" $(LOADLIBES) $(LIB_FDATASYNC) \ |
| 352 | $(LIB_WSOCK32) $(LIBS_ECLIENT) -o emacsclientw${EXEEXT} | 352 | $(LIB_WSOCK32) $(LIBS_ECLIENT) -o $@ |
| 353 | 353 | ||
| 354 | NTINC = ${srcdir}/../nt/inc | 354 | NTINC = ${srcdir}/../nt/inc |
| 355 | NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \ | 355 | NTDEPS = $(NTINC)/ms-w32.h $(NTINC)/sys/stat.h $(NTINC)/inttypes.h \ |
| @@ -362,15 +362,15 @@ ntlib.o: ${srcdir}/ntlib.c ${srcdir}/ntlib.h $(NTDEPS) | |||
| 362 | $(CC) -c ${CPP_CFLAGS} ${srcdir}/ntlib.c | 362 | $(CC) -c ${CPP_CFLAGS} ${srcdir}/ntlib.c |
| 363 | 363 | ||
| 364 | hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h) | 364 | hexl${EXEEXT}: ${srcdir}/hexl.c $(NTLIB) $(config_h) |
| 365 | $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl${EXEEXT} | 365 | $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o $@ |
| 366 | 366 | ||
| 367 | update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) | 367 | update-game-score${EXEEXT}: ${srcdir}/update-game-score.c $(NTLIB) $(config_h) |
| 368 | $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ | 368 | $(CC) ${ALL_CFLAGS} -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" \ |
| 369 | ${srcdir}/update-game-score.c $(LOADLIBES) $(NTLIB) \ | 369 | ${srcdir}/update-game-score.c $(LOADLIBES) $(NTLIB) \ |
| 370 | -o update-game-score${EXEEXT} | 370 | -o $@ |
| 371 | 371 | ||
| 372 | emacsclient.res: $(NTINC)/../emacsclient.rc | 372 | emacsclient.res: $(NTINC)/../emacsclient.rc |
| 373 | $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o emacsclient.res \ | 373 | $(WINDRES) -O coff --include-dir=$(NTINC)/.. -o $@ \ |
| 374 | $(NTINC)/../emacsclient.rc | 374 | $(NTINC)/../emacsclient.rc |
| 375 | 375 | ||
| 376 | ## Makefile ends here. | 376 | ## Makefile ends here. |