diff options
| author | Glenn Morris | 2010-05-15 17:21:58 -0700 |
|---|---|---|
| committer | Glenn Morris | 2010-05-15 17:21:58 -0700 |
| commit | 8a95f0e78ca60d58d41aa3224b6912393a98ca1f (patch) | |
| tree | d7d2b35635538cbee6efef909cd97f095aa85823 | |
| parent | 676b630493f1298ded115d1a2762221c72e09cdc (diff) | |
| download | emacs-8a95f0e78ca60d58d41aa3224b6912393a98ca1f.tar.gz emacs-8a95f0e78ca60d58d41aa3224b6912393a98ca1f.zip | |
* src/Makefile.in (LIBX_OTHER): Move out of cpp section.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 90d089db9cd..3ead531896c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-05-16 Glenn Morris <rgm@gnu.org> | 1 | 2010-05-16 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * Makefile.in (LIBX_OTHER): Move out of cpp section. | ||
| 4 | |||
| 3 | * Makefile.in (LIBXT): Always define. | 5 | * Makefile.in (LIBXT): Always define. |
| 4 | 6 | ||
| 5 | 2010-05-15 Glenn Morris <rgm@gnu.org> | 7 | 2010-05-15 Glenn Morris <rgm@gnu.org> |
diff --git a/src/Makefile.in b/src/Makefile.in index 6031e159da8..61e2fbb671c 100644 --- a/src/Makefile.in +++ b/src/Makefile.in | |||
| @@ -190,6 +190,9 @@ TOOLKIT_LIBW=@TOOLKIT_LIBW@ | |||
| 190 | ## Only used if HAVE_X11, in LIBX_OTHER. | 190 | ## Only used if HAVE_X11, in LIBX_OTHER. |
| 191 | LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) | 191 | LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER) |
| 192 | 192 | ||
| 193 | ## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. | ||
| 194 | LIBX_OTHER=@LIBX_OTHER@ | ||
| 195 | |||
| 193 | LIBSOUND= @LIBSOUND@ | 196 | LIBSOUND= @LIBSOUND@ |
| 194 | CFLAGS_SOUND= @CFLAGS_SOUND@ | 197 | CFLAGS_SOUND= @CFLAGS_SOUND@ |
| 195 | 198 | ||
| @@ -311,9 +314,6 @@ ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) | |||
| 311 | LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) | 314 | LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE) |
| 312 | #endif /* HAVE_X_WINDOWS */ | 315 | #endif /* HAVE_X_WINDOWS */ |
| 313 | 316 | ||
| 314 | /* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. */ | ||
| 315 | LIBX_OTHER=@LIBX_OTHER@ | ||
| 316 | |||
| 317 | /* A macro which other sections of Makefile can redefine to munge the | 317 | /* A macro which other sections of Makefile can redefine to munge the |
| 318 | flags before they are passed to LD. This is helpful if you have | 318 | flags before they are passed to LD. This is helpful if you have |
| 319 | redefined LD to something odd, like "gcc". | 319 | redefined LD to something odd, like "gcc". |