From: Uwe Hermann <redacted>
Date: Wed, 15 Apr 2015 22:40:49 +0000 (+0200)
Subject: windows: Drop no longer needed -luuid.
X-Git-Tag: libserialport-0.1.1~56
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=777347a6bdea22744132af94f515c3c4b0d9ee41;p=libserialport.git

windows: Drop no longer needed -luuid.

Also, use SP_LIBS in Makefile.am.

This is build-tested using a native MinGW-w64 based toolchain
as well as a MinGW-w64 based cross-compile setup.
---

diff --git a/Makefile.am b/Makefile.am
index 1833905..4656427 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,7 +43,7 @@ libserialport_la_LIBADD = $(LIBOBJS)
 libserialport_la_LDFLAGS = $(SP_LIB_LDFLAGS)
 
 if WIN32
-libserialport_la_LIBADD += -lsetupapi
+libserialport_la_LIBADD += $(SP_LIBS)
 endif
 
 libserialport_la_LDFLAGS += -no-undefined
diff --git a/configure.ac b/configure.ac
index 99c43bb..6a0152f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ mingw* | cygwin*)
 	AM_CONDITIONAL([WIN32], true)
 	AM_CONDITIONAL([MACOSX], false)
 	AM_CONDITIONAL([FREEBSD], false)
-	SP_LIBS="-lsetupapi -luuid"
+	SP_LIBS="-lsetupapi"
 	;;
 *freebsd*)
 	AM_CONDITIONAL([LINUX], false)