← Back to branch summary

~ubuntu-branches/debian/sid/swt-gtk/sid

« back to all changes in this revision

Viewing changes to make_linux.mak

  • Committer: Bazaar Package Importer
  • Author(s): Adrian Perez
  • Date: 2009-12-07 10:22:24 UTC
  • mfrom: (1.2.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20091207102224-70w2tax575mcks1w
Tags: 3.5.1-1
http://bugs.debian.org/558663
* New upstream release. Closes: #558663.
* debian/control: 
  - Add Vcs-* fields for Git repository.
  - Allow DM-Uploads.
  - Remove "Conflicts", package should live with eclipse.
* debian/rules: Fix default-java path around AWT_LIB_PATH.
* debian/copyright: Minor update.

Show diffs side-by-side

added added

removed removed

Lines of Context:
make_linux.mak
1
1
#*******************************************************************************
2
 
# Copyright (c) 2000, 2007 IBM Corporation and others.
 
2
# Copyright (c) 2000, 2009 IBM Corporation and others.
3
3
# All rights reserved. This program and the accompanying materials
4
4
# are made available under the terms of the Eclipse Public License v1.0
5
5
# which accompanies this distribution, and is available at
78
78
        -I$(JAVA_HOME)/include/linux \
79
79
        ${SWT_PTR_CFLAGS}
80
80
MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic
81
 
MOZILLAEXCLUDES = -DNO_XPCOMGlueShutdown -DNO_XPCOMGlueStartup
82
 
        
 
81
MOZILLAEXCLUDES = -DNO__1XPCOMGlueShutdown \
 
82
        -DNO__1XPCOMGlueStartup \
 
83
        -DNO__1XPCOMGlueLoadXULFunctions \
 
84
        -DNO_memmove__ILorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2I \
 
85
        -DNO_memmove__JLorg_eclipse_swt_internal_mozilla_nsDynamicFunctionLoad_2J \
 
86
        -DNO_nsDynamicFunctionLoad_1sizeof \
 
87
        -DNO__1Call__IIIIII \
 
88
        -DNO__1Call__JJJJJI \
 
89
        -DNO_nsDynamicFunctionLoad
 
90
XULRUNNEREXCLUDES = -DNO__1NS_1InitXPCOM2
 
91
 
83
92
SWT_OBJECTS = swt.o c.o c_stats.o callback.o
84
93
CDE_OBJECTS = swt.o cde.o cde_structs.o cde_stats.o
85
94
AWT_OBJECTS = swt_awt.o
213
222
        $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp
214
223
 
215
224
xpcom_structs.o: xpcom_structs.cpp
216
 
        $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
 
225
        $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_structs.cpp
217
226
        
218
227
xpcom_custom.o: xpcom_custom.cpp
219
 
        $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
 
228
        $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_custom.cpp
220
229
 
221
230
xpcom_stats.o: xpcom_stats.cpp
222
 
        $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
 
231
        $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom_stats.cpp
223
232
 
224
233
#
225
234
# XULRunner lib
230
239
        $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS}
231
240
 
232
241
xpcomxul.o: xpcom.cpp
233
 
        $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp
 
242
        $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp
234
243
 
235
244
xpcomxul_structs.o: xpcom_structs.cpp
236
 
        $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
 
245
        $(CXX) -o xpcomxul_structs.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_structs.cpp
237
246
        
238
247
xpcomxul_custom.o: xpcom_custom.cpp
239
 
        $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
 
248
        $(CXX) -o xpcomxul_custom.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_custom.cpp
240
249
 
241
250
xpcomxul_stats.o: xpcom_stats.cpp
242
 
        $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
 
251
        $(CXX) -o xpcomxul_stats.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom_stats.cpp
243
252
 
244
253
#
245
254
# XPCOMInit lib