summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2008-07-28 01:20:47 +0000
committerTor Lillqvist <tml@src.gnome.org>2008-07-28 01:20:47 +0000
commitf06ebe8f7464deebef0ee20bf5c4b3d3d988733f (patch)
tree123ff9252ca732ca17ff947e1b9557b0757d374a
parent944d486440f96cdbd460e599cebbe96873cfe644 (diff)
downloadatk-f06ebe8f7464deebef0ee20bf5c4b3d3d988733f.tar.gz
Depend on atk.def on Windows so that we build it before trying to use it.
2008-07-28 Tor Lillqvist <tml@novell.com> * atk/Makefile.am (libatk_1_0_la_DEPENDENCIES): Depend on atk.def on Windows so that we build it before trying to use it. svn path=/trunk/; revision=1260
-rw-r--r--ChangeLog5
-rw-r--r--atk/Makefile.am3
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 1e059e7..8a1dda5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-07-28 Tor Lillqvist <tml@novell.com>
+
+ * atk/Makefile.am (libatk_1_0_la_DEPENDENCIES): Depend on atk.def
+ on Windows so that we build it before trying to use it.
+
2008-07-21 Li Yuan <li.yuan@sun.com>
* NEWS:
diff --git a/atk/Makefile.am b/atk/Makefile.am
index 6dead40..b1c1cf0 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -137,9 +137,8 @@ s-enum-types-c: @REBUILD@ $(atk_headers) Makefile
# ---------- Win32 stuff ----------
if OS_WIN32
-atk_def = atk.def
libatk_1_0_la_LDFLAGS += -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o
-libatk_1_0_la_DEPENDENCIES = atk-win32-res.o
+libatk_1_0_la_DEPENDENCIES = atk-win32-res.o atk.def
install-def-file:
$(INSTALL) $(srcdir)/atk.def $(DESTDIR)$(libdir)/atk-1.0.def