MinGW fixes, thanks to LRN on #gnunet

diff --git a/src/dht/Makefile.am b/src/dht/Makefile.am
index 333034ecd5fcd361791e8c9085b449a8bfeb7f4d..5b323d489e59e0407ee759eeb32c3302bf8322aa 100644 (file)
--- a/src/dht/Makefile.am
+++ b/src/dht/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
 
 if USE_COVERAGE

diff --git a/src/peerinfo-tool/Makefile.am b/src/peerinfo-tool/Makefile.am
index b9e6d7d076e1e7ca75090eb025b8cdd4981bba63..c10440f92f93c9484c8e9dc07bb0857820f340cf 100644 (file)
--- a/src/peerinfo-tool/Makefile.am
+++ b/src/peerinfo-tool/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
 
 if USE_COVERAGE

diff --git a/src/peerinfo/Makefile.am b/src/peerinfo/Makefile.am
index 42396e3e7e98b6fc4a07e9d4eae20773448900b8..632a942deff6b08537d7139afaf65a469195272f 100644 (file)
--- a/src/peerinfo/Makefile.am
+++ b/src/peerinfo/Makefile.am
@@ -1,7 +1,7 @@
 INCLUDES = -I$(top_srcdir)/src/include
 
 if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
+ WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32 -liconv -lstdc++ -lcomdlg32 -lgdi32
 endif
 
 if USE_COVERAGE

diff --git a/src/util/Makefile.am b/src/util/Makefile.am
index d3f72091c9a44365f863bd302ec4653e560ed3f6..13bef97e0fb94895da61c8e9ce48bd65f6866f9d 100644 (file)
--- a/src/util/Makefile.am
+++ b/src/util/Makefile.am
@@ -11,7 +11,7 @@ libgnunetutilwin_la_SOURCES = \
 libgnunetutilwin_la_LDFLAGS = \
   -Wl,--no-undefined -Wl,--export-all-symbols 
 libgnunetutilwin_la_LIBADD = \
-  -lshell32 -luuid -liconv -lstdc++ \
+  -lshell32 -liconv -lstdc++ \
   -lcomdlg32 -lgdi32
 WINLIB = libgnunetutilwin.la
 endif
@@ -65,8 +65,7 @@ libgnunetutil_la_SOURCES = \
   service.c \
   signal.c \
   strings.c \
-  time.c \
-  $(WINSRC)
+  time.c
 
 
 libgnunetutil_la_LIBADD = \