Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Niefer2008-07-31 16:55:10 +0000
committerAndrew Niefer2008-07-31 16:55:10 +0000
commit6f7653aaf7f4e6e13867862973cc697a69d9aa5a (patch)
tree6cd7c39b0b396dad831e496a99e3dea10b4c3b4d /bundles/org.eclipse.equinox.executable/library/motif
parentfb3912400f623a739c2db854a254ddb1468b7132 (diff)
downloadrt.equinox.framework-6f7653aaf7f4e6e13867862973cc697a69d9aa5a.tar.gz
rt.equinox.framework-6f7653aaf7f4e6e13867862973cc697a69d9aa5a.tar.xz
rt.equinox.framework-6f7653aaf7f4e6e13867862973cc697a69d9aa5a.zip
bug 184468 - some automation
Diffstat (limited to 'bundles/org.eclipse.equinox.executable/library/motif')
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/build.sh5
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak5
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_hpux_ia64_32.mak3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak3
-rw-r--r--bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak3
5 files changed, 13 insertions, 6 deletions
diff --git a/bundles/org.eclipse.equinox.executable/library/motif/build.sh b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
index 0052e3f2b..9d38b1f71 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/build.sh
+++ b/bundles/org.eclipse.equinox.executable/library/motif/build.sh
@@ -136,7 +136,10 @@ DEFAULT_WS="$defaultWS"
JAVA_HOME=$javaHome
DEFAULT_JAVA=$defaultJava
-export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA
+LIBRARY_DIR="../../../org.eclipse.equinox.launcher/fragments/org.eclipse.equinox.launcher.$defaultWS.$defaultOS.$defaultOSArch"
+OUTPUT_DIR="../../bin/$defaultWS/$defaultOS/$defaultOSArch"
+
+export OUTPUT_DIR PROGRAM_OUTPUT DEFAULT_OS DEFAULT_OS_ARCH DEFAULT_WS X11_HOME MOTIF_HOME JAVA_HOME DEFAULT_JAVA LIBRARY_DIR
# If the OS is supported (a makefile exists)
if [ "$makefile" != "" ]; then
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 446bfe53e..023ca65b6 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_aix.mak
@@ -49,7 +49,7 @@ CFLAGS = -O -s \
-I./ \
-I../ \
-I$(MOTIF_HOME)/include \
- -I/usr/java150/include
+ -I/usr/java5/include
all: $(EXEC) $(DLL)
@@ -87,7 +87,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
ld $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
install: all
- cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ cp $(EXEC) $(OUTPUT_DIR)
+ cp $(DLL) $(LIBRARY_DIR)
rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
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 7bd874e88..70fd19415 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
@@ -93,7 +93,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
install: all
- cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ cp $(EXEC) $(OUTPUT_DIR)
+ cp $(DLL) $(LIBRARY_DIR)
rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
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 740a75986..25ccd2b92 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_linux.mak
@@ -100,7 +100,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
install: all
- cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ cp $(EXEC) $(OUTPUT_DIR)
+ cp $(DLL) $(LIBRARY_DIR)
rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:
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 fad1e84a5..d9f752770 100644
--- a/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
+++ b/bundles/org.eclipse.equinox.executable/library/motif/make_solaris.mak
@@ -96,7 +96,8 @@ $(DLL): $(DLL_OBJS) $(COMMON_OBJS)
$(CC) $(LFLAGS) -o $(DLL) $(DLL_OBJS) $(COMMON_OBJS) $(LIBS)
install: all
- cp $(EXEC) $(DLL) $(OUTPUT_DIR)
+ cp $(EXEC) $(OUTPUT_DIR)
+ cp $(DLL) $(LIBRARY_DIR)
rm -f $(EXEC) $(MAIN_OBJS) $(COMMON_OBJS) $(DLL_OBJS)
clean:

Back to the top