aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGlenn Morris2010-05-27 20:29:09 -0700
committerGlenn Morris2010-05-27 20:29:09 -0700
commite58d4ff7f4409e95545bff1440b70bb88983c052 (patch)
tree3085cb976b6d87145ed1f251f0d53e5eff9652f6 /src
parentad5a72094e7a4835785d3959edf4d17b97a349bd (diff)
downloademacs-e58d4ff7f4409e95545bff1440b70bb88983c052.tar.gz
emacs-e58d4ff7f4409e95545bff1440b70bb88983c052.zip
* src/Makefile.in (LIBES): Remove $LOADLIBES, it is never set.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 8c9e1568008..462eded2b20 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12010-05-28 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in (LIBES): Remove $LOADLIBES, it is never set.
4
12010-05-27 Chong Yidong <cyd@stupidchicken.com> 52010-05-27 Chong Yidong <cyd@stupidchicken.com>
2 6
3 * fileio.c (Fdelete_file): Change meaning of optional arg to mean 7 * fileio.c (Fdelete_file): Change meaning of optional arg to mean
diff --git a/src/Makefile.in b/src/Makefile.in
index 0b23606a921..336980f4285 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -581,7 +581,7 @@ SOME_MACHINE_LISP = ../lisp/mouse.elc \
581## Note that SunOS needs -lm to come before -lc; otherwise, you get 581## Note that SunOS needs -lm to come before -lc; otherwise, you get
582## duplicated symbols. If the standard libraries were compiled 582## duplicated symbols. If the standard libraries were compiled
583## with GCC, we might need LIB_GCC again after them. 583## with GCC, we might need LIB_GCC again after them.
584LIBES = $(LOADLIBES) $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ 584LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \
585 $(RSVG_LIBS) $(DBUS_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ 585 $(RSVG_LIBS) $(DBUS_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
586 $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ 586 $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \
587 $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ 587 $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \