summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik van Pienbroek <erik@vanpienbroek.nl>2011-08-12 16:22:19 +0200
committerAlejandro PiƱeiro <apinheiro@igalia.com>2011-08-12 21:23:32 +0200
commitc74091e19b3dbd543dd8bd2756d67ea16d59c1d8 (patch)
tree59eda5172ebd07bda9ad066726ba592319126705
parent6287b2d6e511ff455b9bf6cfcc569a03b493555e (diff)
downloadatk-c74091e19b3dbd543dd8bd2756d67ea16d59c1d8.tar.gz
Fix out of tree compilation on Win32
The Makefile.am file contains some Win32-specific instructions. Two of these instructions contain references to $(srcdir)/atk.def as the location of the file containing a list of symbols which need to be exported in the shared library (DLL on Win32). However, as this file is auto-generated during the build this file will end up in the build dir and not in the source dir. For people who don't use out of tree compilation this won't cause any problems, but for people who are the compilation will fail as this file doesn't exist in the $(srcdir). Fixed this by changing these references from $(srcdir)/atk.def to atk.def
-rw-r--r--atk/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/atk/Makefile.am b/atk/Makefile.am
index e33cc89..8f8edc7 100644
--- a/atk/Makefile.am
+++ b/atk/Makefile.am
@@ -179,11 +179,11 @@ endif
# ---------- Win32 stuff ----------
if OS_WIN32
-libatk_1_0_la_LDFLAGS += -export-symbols $(srcdir)/atk.def -no-undefined -Wl,atk-win32-res.o
+libatk_1_0_la_LDFLAGS += -export-symbols atk.def -no-undefined -Wl,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
+ $(INSTALL) atk.def $(DESTDIR)$(libdir)/atk-1.0.def
uninstall-def-file:
-rm $(DESTDIR)$(libdir)/atk-1.0.def
else