idk

git-svn-id: file:///raid/svn-main/nishi-dataworks/trunk@40 d4a5a174-5a4a-5b4b-b672-37683c10d7d5

diff --git a/Library/Makefile b/Library/Makefile
index cd7c7338293b67972c5d0fa593cbafa90eccb378..9957f5c3fad7562964386dc1b7c489bb1778a921 100644 (file)
--- a/Library/Makefile
+++ b/Library/Makefile
@@ -12,6 +12,7 @@ $(LIB_PREFIX)dataworks$(LIB_SUFFIX): $(OBJS)
 
 $(STATICLIB_PREFIX)dataworks$(STATICLIB_SUFFIX): $(OBJS)
        $(AR) rcs $@ $(OBJS)
+       $(RANLIB) $@
 
 .c.o:
        $(CC) $(CFLAGS) -DPLATFORM_M=\"$(PLATFORM_M)\" -DPLATFORM_P=\"$(PLATFORM_P)\" -fPIC -c -o $@ $<

diff --git a/Platforms/win32.mk b/Platforms/win32.mk
index 41051fab50aebbf83ed06206db852590757d21bc..d316dfea108cd7525384795a989ab5471ae42d8b 100644 (file)
--- a/Platforms/win32.mk
+++ b/Platforms/win32.mk
@@ -1,5 +1,6 @@
 CC = i686-w64-mingw32-gcc
-AR = i686-w64-mingw32-gcc-ar
+AR = i686-w64-mingw32-ar
+RANLIB = i686-w64-mingw32-ranlib
 LIB_PREFIX =
 LIB_SUFFIX = .dll
 EXEC_SUFFIX = .exe

diff --git a/Platforms/win64.mk b/Platforms/win64.mk
index 5b8ecb163631e385e8e58d3d6cac878224a360c1..81c23bdf16aab7224c9b97598c50db877fca85bd 100644 (file)
--- a/Platforms/win64.mk
+++ b/Platforms/win64.mk
@@ -1,5 +1,6 @@
 CC = x86_64-w64-mingw32-gcc
-AR = x86_64-w64-mingw32-gcc-ar
+AR = x86_64-w64-mingw32-ar
+RANLIB = x86_64-w64-mingw32-ranlib
 LIB_PREFIX =
 LIB_SUFFIX = .dll
 EXEC_SUFFIX = .exe

diff --git a/common-decl.mk b/common-decl.mk
index 0207893ab440cb82fdada6bcc1206ee295c7d204..14e7d06b8ebaed6272aa97f52bffb48380285eb6 100644 (file)
--- a/common-decl.mk
+++ b/common-decl.mk
@@ -1,7 +1,8 @@
 # $Id$
 
 CC = cc
-AR = gcc-ar
+AR = ar
+RANLIB = ranlib
 CFLAGS = -std=c99 -D_DEFAULT_SOURCE
 LDFLAGS = -L`pwd`/Library
 LIBS =

diff --git a/common.mk b/common.mk
index 5a6aff10c856a935e3f6d8537641c36fc3944413..2ee43e74170025f42072dc1e572efc40076d18ba 100644 (file)
--- a/common.mk
+++ b/common.mk
@@ -1,6 +1,6 @@
 # $Id$
 
-COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)"
+COMPILE_FLAGS = CC="$(CC)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" LIBS="$(LIBS)" LIB_PREFIX="$(LIB_PREFIX)" LIB_SUFFIX="$(LIB_SUFFIX)" EXEC_SUFFIX="$(EXEC_SUFFIX)" PLATFORM_M="$(PLATFORM_M)" PLATFORM_P="$(PLATFORM_P)" STATICLIB_PREFIX="$(STATICLIB_PREFIX)" STATICLIB_SUFFIX="$(STATICLIB_SUFFIX)" AR="$(AR)" RANLIB="$(RANLIB)"
 
 .PHONY: all no-doc replace format clean ./Library ./Client ./Document archive archive-prepare archive-cleanup archive-targz archive-zip