[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r100316: * src/Makefile.in (LIBX_OTHE
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r100316: * src/Makefile.in (LIBX_OTHER): Move out of cpp section. |
Date: |
Sat, 15 May 2010 17:21:58 -0700 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 100316
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2010-05-15 17:21:58 -0700
message:
* src/Makefile.in (LIBX_OTHER): Move out of cpp section.
modified:
src/ChangeLog
src/Makefile.in
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2010-05-16 00:02:13 +0000
+++ b/src/ChangeLog 2010-05-16 00:21:58 +0000
@@ -1,5 +1,7 @@
2010-05-16 Glenn Morris <address@hidden>
+ * Makefile.in (LIBX_OTHER): Move out of cpp section.
+
* Makefile.in (LIBXT): Always define.
2010-05-15 Glenn Morris <address@hidden>
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2010-05-16 00:02:13 +0000
+++ b/src/Makefile.in 2010-05-16 00:21:58 +0000
@@ -190,6 +190,9 @@
## Only used if HAVE_X11, in LIBX_OTHER.
LIBXT=$(TOOLKIT_LIBW) $(LIBXT_OTHER)
+## If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty.
address@hidden@
+
LIBSOUND= @LIBSOUND@
CFLAGS_SOUND= @CFLAGS_SOUND@
@@ -311,9 +314,6 @@
LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
#endif /* HAVE_X_WINDOWS */
-/* If HAVE_X11, $(LIBXT) $(LIBX_EXTRA), else empty. */
address@hidden@
-
/* A macro which other sections of Makefile can redefine to munge the
flags before they are passed to LD. This is helpful if you have
redefined LD to something odd, like "gcc".
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r100316: * src/Makefile.in (LIBX_OTHER): Move out of cpp section.,
Glenn Morris <=