added "s" to ARFLAGS so that ranlib is no longer necessary

5 files changed, 73 insertions, 77 deletions

diff --git a/include/makeinclude/platform_linux.GNU b/include/makeinclude/platform_linux.GNU
index b05ac53095b..f50bb19ba6b 100644
--- a/include/makeinclude/platform_linux.GNU
+++ b/include/makeinclude/platform_linux.GNU
@@ -6,20 +6,19 @@
 debug = 1
 optimize = 1
 
-CC              = gcc
-CXX             = g++
-CFLAGS          += -Wall -Wpointer-arith -pipe
-CCFLAGS         += $(CFLAGS) -fno-implicit-templates
-DCFLAGS         += -g
-DLD             = $(CXX)
-LD              = $(CXX)
-LIBS            += -ldl
-OCFLAGS         += -O3
-PIC             = -fPIC
-AR              = ar
-ARFLAGS         = ruv
-RANLIB          = ranlib
-
+CC      = gcc
+CXX     = g++
+CFLAGS  += -Wall -Wpointer-arith -pipe
+CCFLAGS += $(CFLAGS) -fno-implicit-templates
+DCFLAGS += -g
+DLD     = $(CXX)
+LD      = $(CXX)
+LIBS    += -ldl
+OCFLAGS += -O3
+PIC     = -fPIC
+AR      = ar
+ARFLAGS = rsuv
+RANLIB  = @true
 SOFLAGS = $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true
diff --git a/include/makeinclude/platform_linux_kcc.GNU b/include/makeinclude/platform_linux_kcc.GNU
index 0c5e937f811..ad6955d6e54 100644
--- a/include/makeinclude/platform_linux_kcc.GNU
+++ b/include/makeinclude/platform_linux_kcc.GNU
@@ -1,26 +1,25 @@
 # $Id$
- 
+
 # According to Ben Eng <ben@jetpen.com>, this file
 # should allow ACE to be built on Linux using KAI C++.
 
 debug = 1
 optimize = 0
 
-CC              = KCC
-CXX		= KCC --no_auto_instantiation -x
-CFLAGS	  += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
-CCFLAGS		+= $(CFLAGS) -DNULL=0
-DCFLAGS		+= +K0 -g
-DLD             = $(CXX)
-LD		= $(CXX)
-LIBS		+= -ldl -lpthread
-OCFLAGS		+= +K3 -O
-PIC             = -fPIC
-AR              = $(CXX)
-ARFLAGS         = -o
-RANLIB          = true
-
-SOFLAGS = $(CPPFLAGS) 
+CC      = KCC
+CXX     = KCC --no_auto_instantiation -x
+CFLAGS  += -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
+CCFLAGS += $(CFLAGS) -DNULL=0
+DCFLAGS += +K0 -g
+DLD     = $(CXX)
+LD      = $(CXX)
+LIBS    += -ldl -lpthread
+OCFLAGS += +K3 -O
+PIC     = -fPIC
+AR      = $(CXX)
+ARFLAGS = -o
+RANLIB  = @true
+SOFLAGS = $(CPPFLAGS)
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<
 PRELIB  = @true
 PRELIB_USES_OBJ_ONLY = 1
diff --git a/include/makeinclude/platform_linux_lxpthread.GNU b/include/makeinclude/platform_linux_lxpthread.GNU
index 68f14e3d094..09cf8b793f3 100644
--- a/include/makeinclude/platform_linux_lxpthread.GNU
+++ b/include/makeinclude/platform_linux_lxpthread.GNU
@@ -11,21 +11,20 @@
 debug = 1
 optimize = 1
 
-CC              = gcc
-CXX             = g++
-CFLAGS          += -Wall -pipe \
-                   -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
-CCFLAGS         += $(CFLAGS) -fno-implicit-templates
-DCFLAGS         += -g
-DLD             = $(CXX)
-LD              = $(CXX)
-LIBS            += -ldl -lpthread
-OCFLAGS         += -O3
-PIC             = -fPIC
-AR              = ar
-ARFLAGS         = ruv
-RANLIB          = ranlib
-
+CC      = gcc
+CXX     = g++
+CFLAGS  += -Wall -pipe \
+           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
+CCFLAGS += $(CFLAGS) -fno-implicit-templates
+DCFLAGS += -g
+DLD     = $(CXX)
+LD      = $(CXX)
+LIBS    += -ldl -lpthread
+OCFLAGS += -O3
+PIC     = -fPIC
+AR      = ar
+ARFLAGS = rsuv
+RANLIB  = @true
 SOFLAGS = $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
           $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_linux_lxpthreads.GNU b/include/makeinclude/platform_linux_lxpthreads.GNU
index 68f14e3d094..09cf8b793f3 100644
--- a/include/makeinclude/platform_linux_lxpthreads.GNU
+++ b/include/makeinclude/platform_linux_lxpthreads.GNU
@@ -11,21 +11,20 @@
 debug = 1
 optimize = 1
 
-CC              = gcc
-CXX             = g++
-CFLAGS          += -Wall -pipe \
-                   -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
-CCFLAGS         += $(CFLAGS) -fno-implicit-templates
-DCFLAGS         += -g
-DLD             = $(CXX)
-LD              = $(CXX)
-LIBS            += -ldl -lpthread
-OCFLAGS         += -O3
-PIC             = -fPIC
-AR              = ar
-ARFLAGS         = ruv
-RANLIB          = ranlib
-
+CC      = gcc
+CXX     = g++
+CFLAGS  += -Wall -pipe \
+           -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -D_REENTRANT
+CCFLAGS += $(CFLAGS) -fno-implicit-templates
+DCFLAGS += -g
+DLD     = $(CXX)
+LD      = $(CXX)
+LIBS    += -ldl -lpthread
+OCFLAGS += -O3
+PIC     = -fPIC
+AR      = ar
+ARFLAGS = rsuv
+RANLIB  = @true
 SOFLAGS = $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.o $<; \
           $(SOLINK.cc) -o $@ $(LDFLAGS) $(VSHDIR)$*.o
diff --git a/include/makeinclude/platform_linux_pthread.GNU b/include/makeinclude/platform_linux_pthread.GNU
index 52d8045787f..5ea573914b4 100644
--- a/include/makeinclude/platform_linux_pthread.GNU
+++ b/include/makeinclude/platform_linux_pthread.GNU
@@ -1,31 +1,31 @@
 # $Id$
 
 # For pthreads support on Linux, you need
-# -D_MIT_POSIX_THREADS 
+# -D_MIT_POSIX_THREADS
 # -D_POSIX_THREADS
-# -D_POSIX_THREAD_SAFE_FUNCTIONS 
+# -D_POSIX_THREAD_SAFE_FUNCTIONS
 # in the CXX command line. Also, add -lpthreads to the LIBS.
 # libpthreads.so comes with the sources of Linux libc-5.3.*, you need
-# to compile it yourself (no binaries included) -- 
+# to compile it yourself (no binaries included) --
 # Jan Rychter <jwr@icm.edu.pl>
 
 debug = 1
 optimize = 1
 
-CC              = gcc
-CXX		= g++
-CFLAGS		+= -w -fno-strict-prototypes -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS
-CCFLAGS		+= $(CFLAGS) -fno-implicit-templates
-DCFLAGS		+= -g
-DLD             = $(CXX)
-LD		= $(CXX) 
-LIBS            += -lpthreads
-OCFLAGS		+= -O2
-PIC             = -fPIC
-AR              = ar
-ARFLAGS         = ruv
-RANLIB          = ranlib
-
+CC      = gcc
+CXX     = g++
+CFLAGS  += -w -fno-strict-prototypes \
+           -D_MIT_POSIX_THREADS -D_POSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS
+CCFLAGS += $(CFLAGS) -fno-implicit-templates
+DCFLAGS += -g
+DLD     = $(CXX)
+LD      = $(CXX)
+LIBS    += -lpthreads
+OCFLAGS += -O2
+PIC     = -fPIC
+AR      = ar
+ARFLAGS = rsuv
+RANLIB  = @true
 SOFLAGS = $(CPPFLAGS) -shared
 SOBUILD = $(COMPILE.cc) $(PIC) -o $(VSHDIR)$*.so $<
 PRELIB  = @true