[Emacs-diffs] /srv/bzr/emacs/trunk r99797: Cosmetic change to src/Makefile.in.

[Glenn Morris]

------------------------------------------------------------
revno: 99797
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2010-04-01 00:10:31 -0700
message:
  Cosmetic change to src/Makefile.in.
  
  * Makefile.in (LIBTIFF, LIBJPEG, LIBPNG, LIBGIF, LIBXPM, XFT_LIBS):
  Define as Makefile variables.
  (LIBX): Use above variables rather than directly using autoconf.
modified:
  src/ChangeLog
  src/Makefile.in

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-31 22:28:12 +0000
+++ b/src/ChangeLog     2010-04-01 07:10:31 +0000
@@ -1,3 +1,9 @@
+2010-04-01  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        Clean up BSD_SYSTEM use.

=== modified file 'src/Makefile.in'
--- a/src/Makefile.in   2010-03-31 02:37:57 +0000
+++ b/src/Makefile.in   2010-04-01 07:10:31 +0000
@@ -68,6 +68,13 @@
 
 OTHER_FILES = @OTHER_FILES@
 
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
address@hidden@
+
 # ========================== 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 */