Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2006-12-06 21:26:42 +0000
committerAndrew Niefer2006-12-06 21:26:42 +0000
commit1389cd0392b2af1ac3f57f435832a0e49c20847e (patch)
tree3cd4f3ff888999a87fcff68d08096e9f33dbc7b7 /bundles/org.eclipse.equinox.executable/library/motif
parent5e80fa9414346318d52fa1b723a6dfd0833649b1 (diff)
downloadrt.equinox.framework-1389cd0392b2af1ac3f57f435832a0e49c20847e.tar.gz
rt.equinox.framework-1389cd0392b2af1ac3f57f435832a0e49c20847e.tar.xz
rt.equinox.framework-1389cd0392b2af1ac3f57f435832a0e49c20847e.zip
update make files to version the library
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak49
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak47
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak44
-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.mak47
5 files changed, 141 insertions, 57 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 592731b81..b937b4dd1 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
@@ -9,22 +9,36 @@
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
#*******************************************************************************
-
+include ../make_version.mak
# Makefile for creating the AIX/Motif eclipse launcher program.
# This makefile expects the following environment variables set:
#
# PROGRAM_OUTPUT - the filename of the output executable
+# PROGRAM_LIBRARY - the filename of the output library
# DEFAULT_OS - the default value of the "-os" switch
# DEFAULT_OS_ARCH - the default value of the "-arch" switch
# 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
+
+ifeq ($(PROGRAM_OUTPUT),)
+ PROGRAM_OUTPUT=eclipse
+endif
+
+PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
# Define the object modules to be compiled and flags.
-OBJS = eclipse.o eclipseUtil.o eclipseShm.o eclipseConfig.o eclipseMotif.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
+#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
+
EXEC = $(PROGRAM_OUTPUT)
-LIBS = -L$(MOTIF_HOME)/lib -lXm -lXt -lX11
+DLL = $(PROGRAM_LIBRARY)
+LIBS = -L$(MOTIF_HOME)/lib -lXm -lXt -lX11 -lpthread
+LFLAGS = -shared -fpic -Wl,--export-dynamic
CFLAGS = -O -s \
-DNO_XINERAMA_EXTENSIONS \
-DDEFAULT_OS="\"$(DEFAULT_OS)\"" \
@@ -33,31 +47,42 @@ CFLAGS = -O -s \
-DAIX \
-I./ \
-I../ \
- -I$(MOTIF_HOME)/include
+ -I$(MOTIF_HOME)/include \
+ -I$(JAVA_JNI)
-all: $(EXEC)
+all: $(EXEC) $(DLL)
.c.o:
$(CC) $(CFLAGS) -c $< -o $@
-eclipse.o: ../eclipse.c ../eclipseOS.h
+eclipseMain.o: ../eclipseMain.c ../eclipseUnicode.h ../eclipseCommon.h
+ $(CC) $(CFLAGS) -c $< -o $@
+
+eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c $< -o $@
+eclipseCommon.o: ../eclipseCommon.c ../eclipseCommon.h ../eclipseUnicode.h
+ $(CC) $(CFLAGS) -c $< -o $@
+
eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $< -o $@
-eclipseShm.o: ../eclipseShm.c ../eclipseShm.h ../eclipseOS.h
+eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c $< -o $@
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $< -o $@
-$(EXEC): $(OBJS)
- $(CC) -o $(EXEC) $(OBJS) $(LIBS)
+$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+ $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+
install: all
- cp $(EXEC) $(OUTPUT_DIR)
- rm -f $(EXEC) $(OBJS)
+ cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
- rm -f $(EXEC) $(OBJS)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
+ \ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak
index d43f88416..98bd3707a 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_PA_RISC.mak
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
#*******************************************************************************
-
+include ../make_version.mak
# Makefile for creating the HPUX/Motif eclipse launcher program.
# This makefile expects the following environment variables set:
@@ -21,10 +21,21 @@
# X11_HOME - the full path to X11 header files
# MOTIF_HOME - the full path to Motif header files
+ifeq ($(PROGRAM_OUTPUT),)
+ PROGRAM_OUTPUT=eclipse
+endif
+
+PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
+
# Define the object modules to be compiled and flags.
-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
+
EXEC = $(PROGRAM_OUTPUT)
-LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11
+DLL = $(PROGRAM_LIBRARY)
+LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lpthread
+LFLAGS = -shared -Wl,--export-dynamic
CFLAGS = -O -s \
-DNO_XINERAMA_EXTENSIONS \
-DNETSCAPE_FIX \
@@ -36,6 +47,7 @@ CFLAGS = -O -s \
-I../ \
-I$(MOTIF_HOME)/include \
-I$(X11_HOME)/include \
+ -I$(JAVA_JNI) \
+DAportable
all: $(EXEC)
@@ -43,24 +55,33 @@ all: $(EXEC)
.c.o:
$(CC) $(CFLAGS) -c $< -o $@
-eclipse.o: ../eclipse.c ../eclipseOS.h
+eclipseMain.o: ../eclipseMain.c ../eclipseUnicode.h ../eclipseCommon.h
+ $(CC) $(CFLAGS) -c ../eclipseMain.c -o $@
+
+eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c ../eclipse.c -o $@
+eclipseCommon.o: ../eclipseCommon.c ../eclipseCommon.h ../eclipseUnicode.h
+ $(CC) $(CFLAGS) -c ../eclipseCommon.c -o $@
+
eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
$(CC) $(CFLAGS) -c ../eclipseUtil.c -o $@
-eclipseShm.o: ../eclipseShm.c ../eclipseShm.h ../eclipseOS.h
- $(CC) $(CFLAGS) -c ../eclipseShm.c -o $@
-
+eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
+ $(CC) $(CFLAGS) -c ../eclipseJNI.c -o $@
+
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c ../eclipseConfig.c -o $@
-
-$(EXEC): $(OBJS)
- $(CC) -o $(EXEC) $(OBJS) $(LIBS)
+
+$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+ $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+
install: all
- cp $(EXEC) $(OUTPUT_DIR)
- rm -f $(EXEC) $(OBJS)
+ cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
- rm -f $(EXEC) $(OBJS)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
index 64b701298..d5fbebcdf 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak
@@ -10,7 +10,7 @@
# Kevin Cornell (Rational Software Corporation)
# Sumit Sarkar (Hewlett-Packard)
#*******************************************************************************
-
+include ../make_version.mak
# Makefile for creating the HPUX/Motif eclipse launcher program.
# This makefile expects the following environment variables set:
@@ -22,10 +22,21 @@
# X11_HOME - the full path to X11 header files
# MOTIF_HOME - the full path to Motif header files
+ifeq ($(PROGRAM_OUTPUT),)
+ PROGRAM_OUTPUT=eclipse
+endif
+
+PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
+
# Define the object modules to be compiled and flags.
-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
+
EXEC = $(PROGRAM_OUTPUT)
-LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11
+DLL = $(PROGRAM_LIBRARY)
+LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lpthread
+LFLAGS = -shared -Wl,--export-dynamic
CFLAGS = -O -s \
-DNO_XINERAMA_EXTENSIONS \
-DNETSCAPE_FIX \
@@ -43,24 +54,33 @@ all: $(EXEC)
.c.o:
$(CC) $(CFLAGS) -c $< -o $@
-eclipse.o: ../eclipse.c ../eclipseOS.h
+eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c ../eclipse.c -o $@
+
+eclipseMain.o: ../eclipseMain.c ../eclipseUnicode.h ../eclipseCommon.h
+ $(CC) $(CFLAGS) -c ../eclipseMain.c -o $@
+eclipseCommon.o: ../eclipseCommon.c ../eclipseCommon.h ../eclipseUnicode.h
+ $(CC) $(CFLAGS) -c ../eclipseCommon.c -o $@
+
eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
$(CC) $(CFLAGS) -c ../eclipseUtil.c -o $@
-eclipseShm.o: ../eclipseShm.c ../eclipseShm.h ../eclipseOS.h
- $(CC) $(CFLAGS) -c ../eclipseShm.c -o $@
-
+eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
+ $(CC) $(CFLAGS) -c ../eclipseJNI.c -o $@
+
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c ../eclipseConfig.c -o $@
-$(EXEC): $(OBJS)
- $(CC) -o $(EXEC) $(OBJS) $(LIBS)
+$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+ $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+
install: all
- cp $(EXEC) $(OUTPUT_DIR)
- rm -f $(EXEC) $(OBJS)
+ cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
- rm -f $(EXEC) $(OBJS)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
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 990c7f1dd..48895d85a 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
#*******************************************************************************
-
+include ../make_version.mak
# Makefile for creating the Linux/Motif eclipse launcher program.
# This makefile expects the following environment variables set:
@@ -26,13 +26,10 @@
ifeq ($(PROGRAM_OUTPUT),)
PROGRAM_OUTPUT=eclipse
endif
-ifeq ($(PROGRAM_LIBRARY),)
- PROGRAM_LIBRARY=eclipse_001.so
-endif
-# Define the object modules to be compiled and flags.
-#OBJS = eclipse.o eclipseUtil.o eclipseJNI.o eclipseConfig.o eclipseMozilla.o eclipseMotif.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
+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 eclipseMozilla.o NgCommon.o NgImage.o NgImageData.o NgWinBMPFileFormat.o
@@ -40,7 +37,7 @@ DLL_OBJS = eclipse.o eclipseMotif.o eclipseUtil.o eclipseJNI.o eclipseMozilla.o
EXEC = $(PROGRAM_OUTPUT)
DLL = $(PROGRAM_LIBRARY)
-LIBS = -Xlinker -rpath -Xlinker . -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lXinerama
+LIBS = -Xlinker -rpath -Xlinker . -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lXinerama -lpthread
LFLAGS = -shared -fpic -Wl,--export-dynamic
CFLAGS = -g -s -Wall \
-DLINUX \
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 2bcdd5af0..40057c6d4 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
@@ -9,7 +9,7 @@
# IBM Corporation - initial API and implementation
# Kevin Cornell (Rational Software Corporation)
#*******************************************************************************
-
+include ../make_version.mak
# Makefile for creating the Solaris/Motif eclipse launcher program.
# This makefile expects the following environment variables set:
@@ -21,10 +21,21 @@
# X11_HOME - the full path to X11 header files
# MOTIF_HOME - the full path to Motif header files
+ifeq ($(PROGRAM_OUTPUT),)
+ PROGRAM_OUTPUT=eclipse
+endif
+
+PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so
+
# Define the object modules to be compiled and flags.
-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
+
EXEC = $(PROGRAM_OUTPUT)
-LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lintl
+DLL = $(PROGRAM_LIBRARY)
+LIBS = -L$(MOTIF_HOME)/lib -L$(X11_HOME)/lib -lXm -lXt -lX11 -lintl -lpthread
+LFLAGS = -shared -Wl,--export-dynamic
CFLAGS = -O -s \
-DSOLARIS \
-DNO_XINERAMA_EXTENSIONS \
@@ -35,31 +46,41 @@ CFLAGS = -O -s \
-I./ \
-I../ \
-I$(MOTIF_HOME)/include \
- -I$(X11_HOME)/include
+ -I$(X11_HOME)/include \
+ -I$(JAVA_JNI)
-all: $(EXEC)
+all: $(EXEC) $(DLL)
.c.o:
$(CC) $(CFLAGS) -c $< -o $@
-eclipse.o: ../eclipse.c ../eclipseOS.h
+eclipseMain.o: ../eclipseMain.c ../eclipseUnicode.h ../eclipseCommon.h
+ $(CC) $(CFLAGS) -c $^ -o $@
+
+eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c $^ -o $@
+eclipseCommon.o: ../eclipseCommon.c ../eclipseCommon.h ../eclipseUnicode.h
+ $(CC) $(CFLAGS) -c $^ -o $@
+
eclipseUtil.o: ../eclipseUtil.c ../eclipseUtil.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $^ -o $@
-eclipseShm.o: ../eclipseShm.c ../eclipseShm.h ../eclipseOS.h
+eclipseJNI.o: ../eclipseJNI.c ../eclipseCommon.h ../eclipseOS.h ../eclipseJNI.h
$(CC) $(CFLAGS) -c $^ -o $@
-
+
eclipseConfig.o: ../eclipseConfig.c ../eclipseConfig.h ../eclipseOS.h
$(CC) $(CFLAGS) -c $^ -o $@
-$(EXEC): $(OBJS)
- $(CC) -o $(EXEC) $(OBJS) $(LIBS)
+$(EXEC): $(MAIN_OBJS) $(COMMON_OBJS)
+ $(CC) -o $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(LIBS)
+$(DLL): $(DLL_OBJS) $(COMMON_OBJS)
+ $(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
+
install: all
- cp $(EXEC) $(OUTPUT_DIR)
- rm -f $(EXEC) $(OBJS)
+ cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
- rm -f $(EXEC) $(OBJS)
+ rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS) \ No newline at end of file

Back to the top