Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2007-01-19 16:24:22 +0000
committerAndrew Niefer2007-01-19 16:24:22 +0000
commit50d47ca0369db79b085ce7fa8edebdfd77516e17 (patch)
treed368e996d7c8ba1bed793ba9600efbfdbfc321b8 /bundles/org.eclipse.equinox.executable/library/motif
parenta4d8cefc336223c0f6cc3b284860ecbb62e1fd34 (diff)
downloadrt.equinox.framework-50d47ca0369db79b085ce7fa8edebdfd77516e17.tar.gz
rt.equinox.framework-50d47ca0369db79b085ce7fa8edebdfd77516e17.tar.xz
rt.equinox.framework-50d47ca0369db79b085ce7fa8edebdfd77516e17.zip
update make files
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak5
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak11
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak8
3 files changed, 17 insertions, 7 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
index e27e731e6..deedc371b 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
@@ -31,7 +31,7 @@ CC = cc_r
#OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseMotif.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
MAIN_OBJS = eclipseMain.o
COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseMotifCommon.o
-DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
+DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o eclipseShm.o
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
@@ -71,6 +71,9 @@ eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $< -o $@
+eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
index efa14904d..c9b83e89c 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
@@ -21,7 +21,7 @@ include ../make_version.mak
# DEFAULT_WS - the default value of the "-ws" switch
# X11_HOME - the full path to X11 header files
# MOTIF_HOME - the full path to Motif header files
-# JAVA_JNI - the full path to the java jni header files
+# JAVA_HOME - JAVA_HOME for the java jni header files
ifeq ($(PROGRAM_OUTPUT),)
PROGRAM_OUTPUT=eclipse
@@ -33,7 +33,7 @@ PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
CC=gcc
MAIN_OBJS = eclipseMain.o
COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseMotifCommon.o
-DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
+DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o eclipseShm.o
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
@@ -50,7 +50,7 @@ CFLAGS = -g -s -Wall \
-I../ \
-I$(MOTIF_HOME)/include \
-I$(X11_HOME)/include \
- -I$(JAVA_JNI)
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
all: $(EXEC) $(DLL)
@@ -77,7 +77,10 @@ eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
eclipseMozilla.o: ../eclipseMozilla.c ../eclipseMozilla.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $< -o $@
-
+
+eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
+ $(CC) $(CFLAGS) -c $< -o $@
+
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
index 40057c6d4..b9293a9f5 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
@@ -20,6 +20,7 @@ include ../make_version.mak
# DEFAULT_WS - the default value of the "-ws" switch
# X11_HOME - the full path to X11 header files
# MOTIF_HOME - the full path to Motif header files
+# JAVA_HOME - path to java for JNI headers
ifeq ($(PROGRAM_OUTPUT),)
PROGRAM_OUTPUT=eclipse
@@ -30,7 +31,7 @@ PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
# Define the object modules to be compiled and flags.
MAIN_OBJS = eclipseMain.o
COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseMotifCommon.o
-DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
+DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o eclipseShm.o
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
@@ -47,7 +48,7 @@ CFLAGS = -O -s \
-I../ \
-I$(MOTIF_HOME)/include \
-I$(X11_HOME)/include \
- -I$(JAVA_JNI)
+ -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/solaris
all: $(EXEC) $(DLL)
@@ -72,6 +73,9 @@ eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $^ -o $@
+eclipseShm.o: ../eclipseShm.h ../eclipseUnicode.h ../eclipseShm.c
+ $(CC) $(CFLAGS) -c $^ -o $@
+
$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
$(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)

Back to the top