New w32api and cross build fixes

diff --git a/ChangeLog b/ChangeLog
index d22c35a52abc825729c1c46a8afa17565f679a3b..83ffbf2229d8ad62194a2059e607b9256a00b11b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2013-02-20  Yaakov Selkowitz  <yselkowitz@...>
+
+       New w32api and cross build fixes
+       * Makefile.am: Use $CC -print-file-name to find the location
+       of w32api libuuid.a, to allow cross-compiling.
+
 2012-04-13  Charles Wilson  <cwilson@...>
 
        lpr and readshortcut bugfixes

diff --git a/Makefile.am b/Makefile.am
index f62e32f4217ff9742085abfebd9339f219baedb7..bbcbcc99414c4ff4f03de9a8ef62495e84228a97 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -112,6 +112,7 @@ DISTCLEANFILES = \
        po/remove-potcdate.sed \
        src/cygicons/cygicons.rc
 
+libuuid = `${CC} -print-file-name=w32api/libuuid.a`
 src_banner_banner_LDADD             = -lpopt -lkernel32 -lgdi32
 src_clip_getclip_LDADD              = -lpopt
 src_clip_putclip_LDADD              = -lpopt
@@ -119,8 +120,10 @@ src_conv_conv_LDADD                 = -lpopt
 src_cygstart_cygstart_LDADD         = -lpopt
 src_dump_dump_LDADD                 = -lpopt
 src_lpr_lpr_LDADD                   = -lwinspool
-src_mkshortcut_mkshortcut_LDADD     = -lpopt -lole32 /usr/lib/w32api/libuuid.a
-src_readshortcut_readshortcut_LDADD = -lpopt -lole32 /usr/lib/w32api/libuuid.a
+src_mkshortcut_mkshortcut_LDADD     = -lpopt -lole32
+src_mkshortcut_mkshortcut_LDFLAGS   = ${libuuid}
+src_readshortcut_readshortcut_LDADD = -lpopt -lole32
+src_readshortcut_readshortcut_LDFLAGS = ${libuuid}
 
 src_lpr_lpr_SOURCES = \
        src/lpr/Printer.cc    src/lpr/Win32Utils.cc \