Browse Source

yet more win32 stuff

Samuel Thibault 15 years ago
parent
commit
74cb9f96d2
2 changed files with 27 additions and 9 deletions
  1. 4 0
      configure.ac
  2. 23 9
      src/Makefile.am

+ 4 - 0
configure.ac

@@ -44,6 +44,10 @@ AC_C_RESTRICT
 AC_PATH_PROGS([STARPU_MS_LIB], [lib])
 AC_ARG_VAR([STARPU_MS_LIB], [Path to Microsoft's Visual Studio `lib' tool])
 AM_CONDITIONAL([STARPU_HAVE_MS_LIB], [test "x$STARPU_MS_LIB" != "x"])
+case "$target" in
+*-*-mingw*|*-*-cygwin*) starpu_windows=yes ;;
+esac
+AM_CONDITIONAL([STARPU_HAVE_WINDOWS], [test "x$starpu_windows" = "xyes"])
 
 # on Darwin, GCC targets i386 by default, so we don't have atomic ops
 case "$target" in

+ 23 - 9
src/Makefile.am

@@ -18,13 +18,35 @@ SUBDIRS =
 
 CLEANFILES = *.gcno *.gcda *.linkinfo
 
+EXTRA_DIST = dolib.c
+
+ldflags =
+
+if STARPU_HAVE_WINDOWS
+ldflags += -Xlinker --output-def .Xlinker .libs/libstarpu.def
+
+if STARPU_HAVE_MS_LIB
+.libs/libstarpu.lib: libstarpu.la dolib
+	./dolib "$(STARPU_MS_LIB)" X86 .libs/libstarpu.def libstarpu-0 .libs/libstarpu.lib
+all-local: .libs/libstarpu.lib
+endif HWLOC_HAVE_MS_LIB
+
+install-exec-hook:
+	$(INSTALL) .libs/libstarpu.def $(DESTDIR)$(libdir)
+if STARPU_HAVE_MS_LIB
+	$(INSTALL) .libs/libstarpu.lib $(DESTDIR)$(libdir)
+	$(INSTALL) .libs/libstarpu.exp $(DESTDIR)$(libdir)
+endif STARPU_HAVE_MS_LIB
+
+endif STARPU_HAVE_WINDOWS
+
 lib_LTLIBRARIES = libstarpu.la
 
 libstarpu_la_CPPFLAGS = -I$(top_srcdir)/include/
 
 libstarpu_la_CFLAGS = -W -Wall -Wextra $(HWLOC_CFLAGS)
 libstarpu_la_LIBADD = -lm $(HWLOC_LIBS)
-libstarpu_la_LDFLAGS = --no-undefined
+libstarpu_la_LDFLAGS = $(ldflags) -version-number 0:0:0 -no-undefined
 
 noinst_HEADERS = 						\
 	core/dependencies/data_concurrency.h			\
@@ -164,11 +186,3 @@ if STARPU_USE_OPENCL
 libstarpu_la_SOURCES += drivers/opencl/driver_opencl.c
 libstarpu_la_SOURCES += drivers/opencl/driver_opencl_utils.c
 endif
-
-EXTRA_DIST = dolib.c
-
-if STARPU_HAVE_MS_LIB
-.libs/libstarpu.lib: libstarpu.la dolib
-	./dolib "$(STARPU_MS_LIB)" X86 .libs/libstarpu.def libstarpu-$(STARPU_SOVERSION) .libs/libstarpu.lib
-all-local: .libs/libstarpu.lib
-endif HWLOC_HAVE_MS_LIB