diff options
| author | Stefan Monnier | 2006-09-06 17:53:59 +0000 |
|---|---|---|
| committer | Stefan Monnier | 2006-09-06 17:53:59 +0000 |
| commit | be9b5a607607e3e77815c358274f39b0fbed6bf3 (patch) | |
| tree | e745aa537b6a4d60797d52d84edfdd3caaf1e032 /src | |
| parent | d364dee6ba29f72f1ed1e715043e865af5fc98ef (diff) | |
| download | emacs-be9b5a607607e3e77815c358274f39b0fbed6bf3.tar.gz emacs-be9b5a607607e3e77815c358274f39b0fbed6bf3.zip | |
Avoid double quotes when possible.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/Makefile.in | 34 |
2 files changed, 21 insertions, 17 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 715c8109bf1..e145b2806a9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2006-09-06 Stefan Monnier <monnier@iro.umontreal.ca> | ||
| 2 | |||
| 3 | * Makefile.in: Avoid double quotes when possible. | ||
| 4 | |||
| 1 | 2006-09-06 Kenichi Handa <handa@m17n.org> | 5 | 2006-09-06 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | * editfns.c (Fformat_time_string): Use make_unibyte_string to make | 7 | * editfns.c (Fformat_time_string): Use make_unibyte_string to make |
diff --git a/src/Makefile.in b/src/Makefile.in index f7cd7273f59..0924e9df52b 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -74,13 +74,13 @@ SHELL=/bin/sh | |||
| 74 | #define NOT_C_CODE | 74 | #define NOT_C_CODE |
| 75 | #include "config.h" | 75 | #include "config.h" |
| 76 | 76 | ||
| 77 | /* We won''t really call alloca; | 77 | /* We will not really call alloca; |
| 78 | don''t let the file name alloca.c get messed up. */ | 78 | do not let the file name alloca.c get messed up. */ |
| 79 | #ifdef alloca | 79 | #ifdef alloca |
| 80 | #undef alloca | 80 | #undef alloca |
| 81 | #endif | 81 | #endif |
| 82 | 82 | ||
| 83 | /* Don''t let the file name mktime.c get messed up. */ | 83 | /* Do not let the file name mktime.c get messed up. */ |
| 84 | #ifdef mktime | 84 | #ifdef mktime |
| 85 | #undef mktime | 85 | #undef mktime |
| 86 | #endif | 86 | #endif |
| @@ -95,7 +95,7 @@ SHELL=/bin/sh | |||
| 95 | #endif | 95 | #endif |
| 96 | 96 | ||
| 97 | /* On some machines #define register is done in config; | 97 | /* On some machines #define register is done in config; |
| 98 | don''t let it interfere with this file. */ | 98 | do not let it interfere with this file. */ |
| 99 | #undef register | 99 | #undef register |
| 100 | 100 | ||
| 101 | /* On some systems we may not be able to use the system make command. */ | 101 | /* On some systems we may not be able to use the system make command. */ |
| @@ -115,7 +115,7 @@ CC = C_COMPILER | |||
| 115 | #endif | 115 | #endif |
| 116 | #endif | 116 | #endif |
| 117 | 117 | ||
| 118 | /* Some machines don''t find the standard C libraries in the usual place. */ | 118 | /* Some machines do not find the standard C libraries in the usual place. */ |
| 119 | #ifndef ORDINARY_LINK | 119 | #ifndef ORDINARY_LINK |
| 120 | #ifndef LIB_STANDARD | 120 | #ifndef LIB_STANDARD |
| 121 | #define LIB_STANDARD -lc | 121 | #define LIB_STANDARD -lc |
| @@ -336,7 +336,7 @@ LIBXMENU= -lXMenu | |||
| 336 | 336 | ||
| 337 | #else /* not HAVE_MENUS */ | 337 | #else /* not HAVE_MENUS */ |
| 338 | 338 | ||
| 339 | /* Otherwise, don''t worry about the menu library at all. */ | 339 | /* Otherwise, do not worry about the menu library at all. */ |
| 340 | LIBXMENU= | 340 | LIBXMENU= |
| 341 | #endif /* not HAVE_MENUS */ | 341 | #endif /* not HAVE_MENUS */ |
| 342 | 342 | ||
| @@ -380,7 +380,7 @@ LIBXTR6 = -lSM -lICE | |||
| 380 | #ifdef LIBXT_STATIC | 380 | #ifdef LIBXT_STATIC |
| 381 | /* We assume the config files have defined STATIC_OPTION | 381 | /* We assume the config files have defined STATIC_OPTION |
| 382 | since that might depend on the operating system. | 382 | since that might depend on the operating system. |
| 383 | (Don''t forget you need different definitions with and without __GNUC__.) */ | 383 | (Do not forget you need different definitions with and without __GNUC__.) */ |
| 384 | LIBXT= STATIC_OPTION $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext DYNAMIC_OPTION | 384 | LIBXT= STATIC_OPTION $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext DYNAMIC_OPTION |
| 385 | #else /* not LIBXT_STATIC */ | 385 | #else /* not LIBXT_STATIC */ |
| 386 | LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext | 386 | LIBXT= $(LIBW) LIBXMU -lXt $(LIBXTR6) -lXext |
| @@ -468,9 +468,9 @@ CFLAGS_SOUND= @CFLAGS_SOUND@ | |||
| 468 | /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure | 468 | /* Versions of GCC >= 2.0 put their library, libgcc.a, in obscure |
| 469 | places that are difficult to figure out at make time. Fortunately, | 469 | places that are difficult to figure out at make time. Fortunately, |
| 470 | these same versions allow you to pass arbitrary flags on to the | 470 | these same versions allow you to pass arbitrary flags on to the |
| 471 | linker, so there''s no reason not to use it as a linker. | 471 | linker, so there is no reason not to use it as a linker. |
| 472 | 472 | ||
| 473 | Well, it''s not quite perfect. The ``-nostdlib'' keeps GCC from | 473 | Well, it is not quite perfect. The "-nostdlib" keeps GCC from |
| 474 | searching for libraries in its internal directories, so we have to | 474 | searching for libraries in its internal directories, so we have to |
| 475 | ask GCC explicitly where to find libgcc.a. */ | 475 | ask GCC explicitly where to find libgcc.a. */ |
| 476 | 476 | ||
| @@ -487,9 +487,9 @@ GNULIB_VAR = LIB_GCC | |||
| 487 | 487 | ||
| 488 | #ifndef LINKER_WAS_SPECIFIED | 488 | #ifndef LINKER_WAS_SPECIFIED |
| 489 | /* GCC passes any argument prefixed with -Xlinker directly to the | 489 | /* GCC passes any argument prefixed with -Xlinker directly to the |
| 490 | linker. See prefix-args.c for an explanation of why we don''t do | 490 | linker. See prefix-args.c for an explanation of why we do not do |
| 491 | this with the shell''s ``for'' construct. | 491 | this with the shell''s ``for'' construct. |
| 492 | Note that some people don''t have '.' in their paths, so we must | 492 | Note that some people do not have '.' in their paths, so we must |
| 493 | use ./prefix-args. */ | 493 | use ./prefix-args. */ |
| 494 | #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` | 494 | #define YMF_PASS_LDFLAGS(flags) `./prefix-args -Xlinker flags` |
| 495 | #else | 495 | #else |
| @@ -530,12 +530,12 @@ LD=ld | |||
| 530 | #endif /* not ORDINARY_LINK */ | 530 | #endif /* not ORDINARY_LINK */ |
| 531 | 531 | ||
| 532 | /* Flags to pass to LD only for temacs. */ | 532 | /* Flags to pass to LD only for temacs. */ |
| 533 | /* Don''t split this line with a backslash. That can cause trouble with | 533 | /* Do not split this line with a backslash. That can cause trouble with |
| 534 | some cpps. */ | 534 | some cpps. */ |
| 535 | TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE | 535 | TEMACS_LDFLAGS = LD_SWITCH_SYSTEM LD_SWITCH_SYSTEM_TEMACS LD_SWITCH_MACHINE LD_SWITCH_MACHINE_TEMACS LD_SWITCH_SITE |
| 536 | 536 | ||
| 537 | /* A macro which other sections of Makefile can redefine to munge the | 537 | /* A macro which other sections of Makefile can redefine to munge the |
| 538 | flags before they''re passed to LD. This is helpful if you have | 538 | flags before they are passed to LD. This is helpful if you have |
| 539 | redefined LD to something odd, like "gcc". | 539 | redefined LD to something odd, like "gcc". |
| 540 | (The YMF prefix is a holdover from the old name "ymakefile".) | 540 | (The YMF prefix is a holdover from the old name "ymakefile".) |
| 541 | */ | 541 | */ |
| @@ -705,8 +705,8 @@ otherobj= $(termcapobj) lastfile.o $(mallocobj) $(allocaobj) $(widgetobj) $(LIBO | |||
| 705 | #define TOOLTIP_SUPPORT | 705 | #define TOOLTIP_SUPPORT |
| 706 | #endif | 706 | #endif |
| 707 | 707 | ||
| 708 | /* List of Lisp files loaded into the dumped Emacs. It''s arranged | 708 | /* List of Lisp files loaded into the dumped Emacs. It is arranged |
| 709 | like this because it''s easier to generate it semi-mechanically from | 709 | like this because it is easier to generate it semi-mechanically from |
| 710 | loadup.el this way. | 710 | loadup.el this way. |
| 711 | 711 | ||
| 712 | Note that this list should not include lisp files which might not | 712 | Note that this list should not include lisp files which might not |
| @@ -987,13 +987,13 @@ temacs${EXEEXT}: MAKE_PARALLEL $(LOCALCPP) $(STARTFILES) stamp-oldxmenu ${obj} $ | |||
| 987 | -o temacs ${STARTFILES} ${obj} ${otherobj} \ | 987 | -o temacs ${STARTFILES} ${obj} ${otherobj} \ |
| 988 | OBJECTS_MACHINE ${LIBES} | 988 | OBJECTS_MACHINE ${LIBES} |
| 989 | 989 | ||
| 990 | /* We don''t use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE | 990 | /* We do not use ALL_LDFLAGS because LD_SWITCH_SYSTEM and LD_SWITCH_MACHINE |
| 991 | often contain options that have to do with using Emacs''s crt0, | 991 | often contain options that have to do with using Emacs''s crt0, |
| 992 | which are only good with temacs. */ | 992 | which are only good with temacs. */ |
| 993 | prefix-args${EXEEXT}: prefix-args.c $(config_h) | 993 | prefix-args${EXEEXT}: prefix-args.c $(config_h) |
| 994 | $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args | 994 | $(CC) $(ALL_CFLAGS) $(LDFLAGS) ${srcdir}/prefix-args.c -o prefix-args |
| 995 | 995 | ||
| 996 | /* Don''t lose if this was not defined. */ | 996 | /* Do not lose if this was not defined. */ |
| 997 | #ifndef OLDXMENU_OPTIONS | 997 | #ifndef OLDXMENU_OPTIONS |
| 998 | #define OLDXMENU_OPTIONS | 998 | #define OLDXMENU_OPTIONS |
| 999 | #endif | 999 | #endif |