diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 3 | ||||
| -rw-r--r-- | src/Makefile.in | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 181c6c55c10..2e0aeef2971 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,8 @@ 2010-10-10 Dan Nicolaescu <dann@ics.uci.edu> + * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line. + (PROFILING_LDFLAGS): Remove, not needed anymore. + * Makefile.in: Use $(...) everywhere instead of ${...} (CRT_DIR): Move near potential user. (START_FILE): Move near CRT_DIR, it might use it. 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@ ## Flags to pass for profiling builds PROFILING_CFLAGS = @PROFILING_CFLAGS@ -PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ ## Flags to pass to the compiler to enable build warnings C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ @@ -114,7 +113,7 @@ LD_SWITCH_SYSTEM_TEMACS=@LD_SWITCH_SYSTEM_TEMACS@ ## Flags to pass to ld only for temacs. TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) -## $LDFLAGS $PROFILING_LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). +## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason). TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ ## Some systems define this to request special libraries. @@ -648,7 +647,7 @@ buildobj.h: Makefile temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) - $(CC) $(LD_FIRSTFLAG) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ + $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ -o temacs $(START_FILES) $(obj) $(otherobj) $(LIBES) ## The following oldxmenu-related rules are only (possibly) used if |