--- eclipse-3.3RC4/plugins/org.eclipse.core.filesystem/natives/unix/solaris/Makefile.orig	Sat Jun  9 00:24:04 2007
+++ eclipse-3.3RC4/plugins/org.eclipse.core.filesystem/natives/unix/solaris/Makefile	Fri Jun 22 18:45:06 2007
@@ -7,7 +7,6 @@
 # 
 # Contributors:
 #     IBM Corporation - initial API and implementation
-# Martin Oberhuber (Wind River) - [183137] adapted from Linux for Solaris
 #********************************************************************** 
 #
 # makefile for liblocalfile.so
@@ -17,26 +16,13 @@
 LIB_NAME = liblocalfile.so
 LIB_NAME_FULL = liblocalfile_1_0_0.so
 
-#Set this to be your OS type
-OS_TYPE = solaris
-
-#Set this to be the location of your JRE
-JAVA_HOME = ~/vm/sun142
-
-JDK_INCLUDE = -I ${JAVA_HOME}/include -I ${JAVA_HOME}/include/${OS_TYPE}
+JDK_INCLUDE = -I $(JAVA_HOME)/include -I $(JAVA_HOME)/include/solaris
 COMMON_INCLUDE = -I include
-#Solaris native cc uses -K PIC, gcc uses -fPIC
-#To build native, use:     make
-#To build with debug, use: make OPT_FLAGS=-g
-#To build with gcc, use:   make CC=gcc PICFLAG=-fPIC
 PICFLAG=-K PIC
-#PICFLAG=-fPIC
-OPT_FLAGS=-O -s
-#OPT_FLAGS=-g
 
 $(LIB_NAME_FULL) : $(CORE.C)
-	$(CC) $(OPT_FLAGS) $(PICFLAG) -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C)
-	$(CC) $(OPT_FLAGS) -G -o $(LIB_NAME_FULL) $(CORE.O) -lc
+	$(CC) $(L_CFLAGS) $(PICFLAG) -c $(JDK_INCLUDE) $(COMMON_INCLUDE) -o $(CORE.O) $(CORE.C)
+	$(CC) $(L_LDFLAGS) -G -h $(LIB_NAME_FULL) -o $(LIB_NAME_FULL) $(CORE.O) -lc
 
 core : $(LIB_NAME_FULL)