summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-03 19:42:16 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-03 19:42:16 +0000
commit86e42e7030394b58d9b16eddd9ccc90efa3a11b2 (patch)
tree039b597cd4de16cd81671776bca8d4023072e17b
parentbeae4e7a8875dfe3bdae54bd3f48b922a8f8a3c1 (diff)
Bug #6480: Cygwin build fix. (Yaakov Selkowitz)XORG-7_0_99_901
-rw-r--r--ChangeLog5
-rw-r--r--Makefile.am2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 40069ff..9af75f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-03 Adam Jackson <ajax@freedesktop.org>
+
+ * Makefile.am:
+ Bug #6480: Cygwin build fix. (Yaakov Selkowitz)
+
2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
* configure.ac:
diff --git a/Makefile.am b/Makefile.am
index 4f4c8a5..e2acfbb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -105,7 +105,7 @@ libre_a_SOURCES = \
#
xedit_CFLAGS = $(XEDIT_CFLAGS) -I$(top_srcdir)/lisp/re -D_BSD_SOURCE -DXEDIT
-xedit_LDADD = $(XEDIT_LIBS) libre.a liblisp.a libmp.a -lm
+xedit_LDADD = libre.a liblisp.a libmp.a $(XEDIT_LIBS) -lm
xedit_SOURCES = \
commands.c \