diff options
| author | Dan Nicolaescu | 2010-10-10 08:35:04 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-10-10 08:35:04 -0700 |
| commit | a4daeecfef2bf5822f2b514b2878391b90edf741 (patch) | |
| tree | b099f5110bc376c1b4b584112d569e00f870a0db /src/Makefile.in | |
| parent | 4cf3ad3065d38ec51d6da12d50a83d96860f7db8 (diff) | |
| download | emacs-a4daeecfef2bf5822f2b514b2878391b90edf741.tar.gz emacs-a4daeecfef2bf5822f2b514b2878391b90edf741.zip | |
Pass CFLAGS to the linker.
* configure.in (PROFILING_LDFLAGS): Do not define, remove all uses.
* lib-src/Makefile.in (PROFILING_LDFLAGS): Remove, not needed.
* msdos/sed1v2.inp (PROFILING_LDFLAGS):
* msdos/sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore.
* src/Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line.
(PROFILING_LDFLAGS): Remove, not needed anymore.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 8fd163bb185..76fc1e74f38 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -65,7 +65,6 @@ OTHER_FILES = @OTHER_FILES@ | |||
| 65 | 65 | ||
| 66 | ## Flags to pass for profiling builds | 66 | ## Flags to pass for profiling builds |
| 67 | PROFILING_CFLAGS = @PROFILING_CFLAGS@ | 67 | PROFILING_CFLAGS = @PROFILING_CFLAGS@ |
| 68 | PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ | ||
| 69 | 68 | ||
| 70 | ## Flags to pass to the compiler to enable build warnings | 69 | ## Flags to pass to the compiler to enable build warnings |
| 71 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ | 70 | C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ |
| @@ -114,7 +113,7 @@ LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ | |||
| 114 | ## Flags to pass to ld only for temacs. | 113 | ## Flags to pass to ld only for temacs. |
| 115 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) | 114 | TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) |
| 116 | 115 | ||
| 117 | ## $LDFLAGS $PROFILING_LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). | 116 | ## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason). |
| 118 | TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ | 117 | TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ |
| 119 | 118 | ||
| 120 | ## Some systems define this to request special libraries. | 119 | ## Some systems define this to request special libraries. |
| @@ -648,7 +647,7 @@ buildobj.h: Makefile | |||
| 648 | 647 | ||
| 649 | 648 | ||
| 650 | temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) | 649 | temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) |
| 651 | $(CC) $(LD_FIRSTFLAG) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ | 650 | $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ |
| 652 | -o temacs $(START_FILES) $(obj) $(otherobj) $(LIBES) | 651 | -o temacs $(START_FILES) $(obj) $(otherobj) $(LIBES) |
| 653 | 652 | ||
| 654 | ## The following oldxmenu-related rules are only (possibly) used if | 653 | ## The following oldxmenu-related rules are only (possibly) used if |