diff options
| author | Mikael Barbero | 2015-09-25 15:40:29 +0000 |
|---|---|---|
| committer | Arun Thondapu | 2015-12-21 19:08:35 +0000 |
| commit | 435dd2d09782e46095f4599e32318316a5459ab0 (patch) | |
| tree | 274e1f3a797c7a9511c9040c8eefda664d717cf1 /features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak | |
| parent | 15d56969726892d8f960f4b0562575446c550957 (diff) | |
| download | rt.equinox.framework-435dd2d09782e46095f4599e32318316a5459ab0.tar.gz rt.equinox.framework-435dd2d09782e46095f4599e32318316a5459ab0.tar.xz rt.equinox.framework-435dd2d09782e46095f4599e32318316a5459ab0.zip | |
Bug 383545 - Rename *Carbon* files to *Cocoa*
Change-Id: Ibfabae9b359217acc27adf8d49a923b5a496e0d6
Signed-off-by: Mikael Barbero <mikael@eclipse.org>
Diffstat (limited to 'features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak')
| -rw-r--r-- | features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak index 0d267a094..2f9fd1335 100644 --- a/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak +++ b/features/org.eclipse.equinox.executable.feature/library/cocoa/make_cocoa.mak @@ -1,5 +1,5 @@ #********************************************************************** -# Copyright (c) 2000, 2008 IBM Corporation and others. +# Copyright (c) 2000, 2015 IBM Corporation 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 @@ -7,6 +7,7 @@ # # Contributors: # Kevin Cornell (Rational Software Corporation) +# Mikael Barbero #********************************************************************** include ../make_version.mak # Makefile for creating the Cocoa eclipse launcher program. @@ -25,9 +26,9 @@ endif PROGRAM_LIBRARY=eclipse_$(LIB_VERSION).so # Define the object modules to be compiled and flags. -MAIN_OBJS = eclipseMain.o eclipseCarbonMain.o -COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseCarbonCommon.o -DLL_OBJS = eclipse.o eclipseCarbon.o eclipseUtil.o eclipseJNI.o eclipseShm.o +MAIN_OBJS = eclipseMain.o eclipseCocoaMain.o +COMMON_OBJS = eclipseConfig.o eclipseCommon.o eclipseCocoaCommon.o +DLL_OBJS = eclipse.o eclipseCocoa.o eclipseUtil.o eclipseJNI.o eclipseShm.o #NgImageData.o NgWinBMPFileFormat.o NgCommon.o EXEC = $(PROGRAM_OUTPUT) @@ -49,8 +50,8 @@ all: $(EXEC) $(DLL) eclipse.o: ../eclipse.c ../eclipseOS.h ../eclipseCommon.h ../eclipseJNI.h $(CC) $(CFLAGS) -c ../eclipse.c -o $@ -eclipseCarbonMain.o : eclipseCarbonMain.c - $(CC) $(CFLAGS) -c eclipseCarbonMain.c -o $@ +eclipseCocoaMain.o : eclipseCocoaMain.c + $(CC) $(CFLAGS) -c eclipseCocoaMain.c -o $@ eclipseMain.o: ../eclipseUnicode.h ../eclipseCommon.h eclipseMain.c ../eclipseMain.c $(CC) $(CFLAGS) -c eclipseMain.c -o $@ |