1 files changed, 8 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am
index ae0b2d5..4316454 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,13 @@
 AM_CPPFLAGS = -I$(top_srcdir)/include
-AM_CFLAGS = $(LIBIRECOVERY_CFLAGS)
+AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS)
-AM_LDFLAGS = $(LIBIRECOVERY_LDFLAGS)
+AM_LDFLAGS = $(libusb_LIBS) $(LIBIRECOVERYLDFLAGS)
-AM_LIBS = $(LIBIRECOVERY_LIBS)
 lib_LTLIBRARIES = libirecovery.la
-libirecovery_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIRECOVERY_SO_VERSION) -no-undefined $(AM_LIBS)
+libirecovery_la_CFLAGS = $(AM_CFLAGS)
-libirecovery_la_SOURCES = \
+libirecovery_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIRECOVERY_SO_VERSION) -no-undefined
-                libirecovery.c
+libirecovery_la_SOURCES = libirecovery.c
+if WIN32
+libirecovery_la_LDFLAGS += -avoid-version
+endif
+\ No newline at end of file

diff --git a/src/Makefile.am b/src/Makefile.am index ae0b2d5..4316454 100644 --- a/src/Makefile.am +++ b/src/Makefile.am
@@ -1,11 +1,13 @@
1	AM_CPPFLAGS = -I$(top_srcdir)/include	1	AM_CPPFLAGS = -I$(top_srcdir)/include
2		2
3	AM_CFLAGS = $(LIBIRECOVERY_CFLAGS)	3	AM_CFLAGS = $(GLOBAL_CFLAGS) $(libusb_CFLAGS)
4	AM_LDFLAGS = $(LIBIRECOVERY_LDFLAGS)	4	AM_LDFLAGS = $(libusb_LIBS) $(LIBIRECOVERYLDFLAGS)
5	AM_LIBS = $(LIBIRECOVERY_LIBS)
6		5
7	lib_LTLIBRARIES = libirecovery.la	6	lib_LTLIBRARIES = libirecovery.la
8	libirecovery_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIRECOVERY_SO_VERSION) -no-undefined $(AM_LIBS)	7	libirecovery_la_CFLAGS = $(AM_CFLAGS)
9	libirecovery_la_SOURCES = \	8	libirecovery_la_LDFLAGS = $(AM_LDFLAGS) -version-info $(LIBIRECOVERY_SO_VERSION) -no-undefined
10	libirecovery.c	9	libirecovery_la_SOURCES = libirecovery.c
11		10
		11	if WIN32
		12	libirecovery_la_LDFLAGS += -avoid-version
		13	endif \ No newline at end of file