diff options
| author | Pawel Pogorzelski | 2010-03-29 11:56:55 +0000 |
|---|---|---|
| committer | Pawel Pogorzelski | 2010-03-29 11:56:55 +0000 |
| commit | 866720480e1780b81fd18d03f61de31353f59cec (patch) | |
| tree | ab393d9d65ec4ed4e067f4c956106e2c22e4220e /bundles/org.eclipse.core.net/natives/unix | |
| parent | df289f10b44918b141286e030e3dc4332d70b9a0 (diff) | |
| download | eclipse.platform.team-866720480e1780b81fd18d03f61de31353f59cec.tar.gz eclipse.platform.team-866720480e1780b81fd18d03f61de31353f59cec.tar.xz eclipse.platform.team-866720480e1780b81fd18d03f61de31353f59cec.zip | |
Bug 292994 - Please add -I$(JAVA_HOME)/include to libgnomeproxy's Makefiles
Diffstat (limited to 'bundles/org.eclipse.core.net/natives/unix')
| -rw-r--r-- | bundles/org.eclipse.core.net/natives/unix/linux/makefile | 9 | ||||
| -rw-r--r-- | bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile | 7 |
2 files changed, 11 insertions, 5 deletions
diff --git a/bundles/org.eclipse.core.net/natives/unix/linux/makefile b/bundles/org.eclipse.core.net/natives/unix/linux/makefile index daab01dff..0b4c14153 100644 --- a/bundles/org.eclipse.core.net/natives/unix/linux/makefile +++ b/bundles/org.eclipse.core.net/natives/unix/linux/makefile @@ -1,5 +1,5 @@ #********************************************************************** -# Copyright (c) 2008 Oakland Software Incorporated and others. +# Copyright (c) 2008, 2010 Oakland Software Incorporated and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -18,8 +18,11 @@ GNOMEPROXY.O = gnomeproxy.o LIB_NAME = gnomeproxy.so LIB_NAME_FULL = libgnomeproxy-1.0.0.so +OS_TYPE = linux +JAVA_HOME = +JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE} INCLUDE = -I/usr/include/gconf/2/ -I/usr/include/orbit-2.0/ -I/usr/include/glib-2.0/ -I/usr/lib/glib-2.0/include/ -COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 +COMPILER_FLAGS = -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m32 LIBS := -lgconf-2 -lORBit-2 -lgthread-2.0 -lrt -lgobject-2.0 -lglib-2.0 LINKER_FLAGS= -m32 @@ -29,7 +32,7 @@ all: link compile: @echo "Building file: $(GNOMEPROXY.O)" @echo "Invoking: GCC C Compiler" - gcc $(INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) + gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) @echo "Finished building: $(GNOMEPROXY.O)" @echo " " diff --git a/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile b/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile index e38c84ed0..7a84d7192 100644 --- a/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile +++ b/bundles/org.eclipse.core.net/natives/unix/linux/x86_64/makefile @@ -1,5 +1,5 @@ #********************************************************************** -# Copyright (c) 2008 Oakland Software Incorporated and others. +# Copyright (c) 2008, 2010 Oakland Software Incorporated and others. # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at @@ -19,6 +19,9 @@ GNOMEPROXY.O = gnomeproxy.o LIB_NAME = gnomeproxy.so LIB_NAME_FULL = libgnomeproxy-1.0.0.so +OS_TYPE = +JAVA_HOME = +JDK_INCLUDE = -I${JAVA_HOME}/include -I${JAVA_HOME}/include/${OS_TYPE} INCLUDE = `pkg-config --cflags gconf-2.0` COMPILER_FLAGS= -O0 -fPIC -g3 -Wall -c -fmessage-length=0 -m64 @@ -30,7 +33,7 @@ all: link compile: @echo "Building file: $(GNOMEPROXY.O)" @echo "Invoking: GCC C Compiler" - gcc $(INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) + gcc $(INCLUDE) $(JDK_INCLUDE) $(COMPILER_FLAGS) -o $(GNOMEPROXY.O) $(GNOMEPROXY.C) @echo "Finished building: $(GNOMEPROXY.O)" @echo " " |