[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r9380 - gnunet/src/util
From: |
gnunet |
Subject: |
[GNUnet-SVN] r9380 - gnunet/src/util |
Date: |
Sun, 1 Nov 2009 14:00:20 -0700 |
Author: grothoff
Date: 2009-11-01 14:00:19 -0700 (Sun, 01 Nov 2009)
New Revision: 9380
Modified:
gnunet/src/util/Makefile.am
Log:
trick automake/libtool into NOT linking with g++ on non-W32 systems --
hopefully without breaking W32 build
Modified: gnunet/src/util/Makefile.am
===================================================================
--- gnunet/src/util/Makefile.am 2009-11-01 20:47:52 UTC (rev 9379)
+++ gnunet/src/util/Makefile.am 2009-11-01 21:00:19 UTC (rev 9380)
@@ -3,8 +3,17 @@
plugindir = $(libdir)/gnunet
if MINGW
- WINFLAGS = -Wl,--no-undefined -Wl,--export-all-symbols -lole32 -lshell32
-luuid -liconv -lstdc++ -lcomdlg32 -lgdi32
- WINSRC = win.cc winproc.c
+noinst_LIBRARIES = \
+ libgnunetutilwin.a
+libgnunetutilwin_a_SOURCES = \
+ win.cc \
+ winproc.c
+libgnunetutilwin_a_LDFLAGS = \
+ -Wl,--no-undefined -Wl,--export-all-symbols
+libgnunetutilwin_a_LIBADD = \
+ -lole32 -lshell32 -luuid -liconv -lstdc++ \
+ -lcomdlg32 -lgdi32
+WINLIB = libgnunetutilwin.a
endif
if USE_COVERAGE
@@ -59,12 +68,12 @@
libgnunetutil_la_LIBADD = \
- $(GCLIBADD) \
+ $(GCLIBADD) $(WINLIB) \
$(LIBGCRYPT_LIBS) \
-lgmp -lltdl -lz -lextractor $(XLIB)
libgnunetutil_la_LDFLAGS = \
- $(GN_LIB_LDFLAGS) $(WINFLAGS) \
+ $(GN_LIB_LDFLAGS) \
-version-info 4:0:0
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r9380 - gnunet/src/util,
gnunet <=