Mercurial > emacs
changeset 107729:f449a4ebd49f
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Thu, 01 Apr 2010 10:52:55 +0000 |
| parents | 56e62ae17d17 (current diff) cb51e74aafd2 (diff) |
| children | 1b846efce2d2 |
| files | |
| diffstat | 2 files changed, 14 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Apr 01 00:00:14 2010 +0000 +++ b/src/ChangeLog Thu Apr 01 10:52:55 2010 +0000 @@ -1,3 +1,9 @@ +2010-04-01 Glenn Morris <rgm@gnu.org> + + * Makefile.in (LIBTIFF, LIBJPEG, LIBPNG, LIBGIF, LIBXPM, XFT_LIBS): + Define as Makefile variables. + (LIBX): Use above variables rather than directly using autoconf. + 2010-03-31 Dan Nicolaescu <dann@ics.uci.edu> Clean up BSD_SYSTEM use.
--- a/src/Makefile.in Thu Apr 01 00:00:14 2010 +0000 +++ b/src/Makefile.in Thu Apr 01 10:52:55 2010 +0000 @@ -68,6 +68,13 @@ OTHER_FILES = @OTHER_FILES@ +LIBTIFF=@LIBTIFF@ +LIBJPEG=@LIBJPEG@ +LIBPNG=@LIBPNG@ +LIBGIF=@LIBGIF@ +LIBXPM=@LIBXPM@ +XFT_LIBS=@XFT_LIBS@ + # ========================== start of cpp stuff ======================= /* From here on, comments must be done in C syntax. */ @@ -369,7 +376,7 @@ /* LD_SWITCH_X_DEFAULT comes after everything else that specifies options for where to find X libraries, but before those libraries. */ X11_LDFLAGS = LD_SWITCH_X_SITE LD_SWITCH_X_DEFAULT -LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) @LIBTIFF@ @LIBJPEG@ @LIBPNG@ @LIBGIF@ @LIBXPM@ LIB_X11_LIB LIBX11_SYSTEM @XFT_LIBS@ +LIBX= $(LIBXMENU) $(X11_LDFLAGS) $(LIBXT) $(LIBTIFF) $(LIBJPEG) $(LIBPNG) $(LIBGIF) $(LIBXPM) LIB_X11_LIB LIBX11_SYSTEM $(XFT_LIBS) #else /* not HAVE_X11 */ LIBX= $(LIBXMENU) LD_SWITCH_X_SITE #endif /* not HAVE_X11 */