*** keyword substitution change ***

1 files changed, 43 insertions, 43 deletions

diff --git a/core/org.eclipse.cdt.core.linux/library/Makefile b/core/org.eclipse.cdt.core.linux/library/Makefile
index d03499935e7..4318834f0eb 100644
--- a/core/org.eclipse.cdt.core.linux/library/Makefile
+++ b/core/org.eclipse.cdt.core.linux/library/Makefile
@@ -1,43 +1,43 @@
-# makefile for libspawner.so

-

-# set JDK_INCLUDES if they are not already set in the environment

-# spit out a warning if the make script will be using the default values

-ifeq ($(JDK_INCLUDES),)

-$(warning JDK_INCLUDES not set in environment, using default: $(JDK_INCLUDES))

-endif

-

-ifeq ($(JDK_OS_INCLUDES),)

-$(warning JDK_OS_INCLUDES not set in environment, using default: $(JDK_OS_INCLUDES))

-endif

-

-

-JDK_INCLUDES=/usr/local/jdk/include

-JDK_OS_INCLUDES=/usr/local/jdk/include/linux

-

-CC=gcc

-CPPFLAGS = -I. -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)

-CFLAGS +=-fpic -D_REENTRANT

-

-LIB_NAME_SPAWNER = libspawner.so

-LIB_NAME_FULL_SPAWNER = ../os/linux/x86/libspawner.so

-OBJS_SPAWNER=spawner.o io.o exec_unix.o pfind.o

-

-LIB_NAME_PTY = libpty.so

-LIB_NAME_FULL_PTY = ../os/linux/x86/libpty.so

-OBJS_PTY= openpty.o pty.o ptyio.o

-

-OBJS = $(OBJS_SPAWNER) $(OBJS_PTY)

-

-all: $(LIB_NAME_FULL_SPAWNER) $(LIB_NAME_FULL_PTY)

-

-rebuild: clean all

-

-$(LIB_NAME_FULL_SPAWNER) : $(OBJS_SPAWNER)

-	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_SPAWNER) -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc

-

-$(LIB_NAME_FULL_PTY): $(OBJS_PTY)

-	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_PTY) -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY)

-

-clean :

-	$(RM) $(OBJS_SPAWNER) $(LIB_NAME_FULL_SPAWNER)

-	$(RM) $(OBJS_PTY) $(LIB_NAME_FULL_PTY)

+# makefile for libspawner.so
+
+# set JDK_INCLUDES if they are not already set in the environment
+# spit out a warning if the make script will be using the default values
+ifeq ($(JDK_INCLUDES),)
+$(warning JDK_INCLUDES not set in environment, using default: $(JDK_INCLUDES))
+endif
+
+ifeq ($(JDK_OS_INCLUDES),)
+$(warning JDK_OS_INCLUDES not set in environment, using default: $(JDK_OS_INCLUDES))
+endif
+
+
+JDK_INCLUDES=/usr/local/jdk/include
+JDK_OS_INCLUDES=/usr/local/jdk/include/linux
+
+CC=gcc
+CPPFLAGS = -I. -I$(JDK_INCLUDES) -I$(JDK_OS_INCLUDES)
+CFLAGS +=-fpic -D_REENTRANT
+
+LIB_NAME_SPAWNER = libspawner.so
+LIB_NAME_FULL_SPAWNER = ../os/linux/x86/libspawner.so
+OBJS_SPAWNER=spawner.o io.o exec_unix.o pfind.o
+
+LIB_NAME_PTY = libpty.so
+LIB_NAME_FULL_PTY = ../os/linux/x86/libpty.so
+OBJS_PTY= openpty.o pty.o ptyio.o
+
+OBJS = $(OBJS_SPAWNER) $(OBJS_PTY)
+
+all: $(LIB_NAME_FULL_SPAWNER) $(LIB_NAME_FULL_PTY)
+
+rebuild: clean all
+
+$(LIB_NAME_FULL_SPAWNER) : $(OBJS_SPAWNER)
+	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_SPAWNER) -o $(LIB_NAME_FULL_SPAWNER) $(OBJS_SPAWNER) -lc
+
+$(LIB_NAME_FULL_PTY): $(OBJS_PTY)
+	$(CC) -g -shared -Wl,-soname,$(LIB_NAME_PTY) -o $(LIB_NAME_FULL_PTY) $(OBJS_PTY)
+
+clean :
+	$(RM) $(OBJS_SPAWNER) $(LIB_NAME_FULL_SPAWNER)
+	$(RM) $(OBJS_PTY) $(LIB_NAME_FULL_PTY)