From 8f604ca7e10cbc090335bc6d3d884bdcf6d1eaa8 Mon Sep 17 00:00:00 2001
From: Eric Scharff <eric.scharff@readytalk.com>
Date: Fri, 26 Oct 2007 16:16:47 -0600
Subject: [PATCH] makefile cleanups

---
 makefile | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/makefile b/makefile
index ccde353083..84b1123dd9 100644
--- a/makefile
+++ b/makefile
@@ -33,14 +33,6 @@ input = $(test-build)/Hello.class
 build-cxx = g++
 build-cc = gcc
 
-pthread = -pthread
-lpthread = -lpthread
-
-ifeq ($(platform),darwin)
-	pthread =
-	lpthread =
-endif
-
 cxx = $(build-cxx)
 cc = $(build-cc)
 ar = ar
@@ -64,13 +56,13 @@ common-cflags = $(warnings) -fno-rtti -fno-exceptions \
 	-D__STDC_LIMIT_MACROS -D_JNI_IMPLEMENTATION_
 
 build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
-	-I$(JAVA_HOME)/include/linux -I$(src) $(pthread)
+	-I$(JAVA_HOME)/include/linux -I$(src) -pthread
 
 cflags = $(build-cflags)
 
 common-lflags = -lm -lz
 
-lflags = $(common-lflags) $(lpthread) -ldl -rdynamic
+lflags = $(common-lflags) -lpthread -ldl -rdynamic
 
 system = posix
 asm = x86
@@ -86,8 +78,9 @@ ifeq ($(arch),i386)
 endif
 
 ifeq ($(platform),darwin)
+	build-cflags = $(common-cflags) -fPIC -fvisibility=hidden \
+		-I$(JAVA_HOME)/include/linux -I$(src)
 	lflags = $(common-lflags) -ldl
-	objcopy = gobjcopy
 endif
 
 ifeq ($(platform),windows)