---- make_gtk.mak.orig 2004-06-25 18:28:00.000000000 +0200
-+++ make_gtk.mak 2004-07-09 17:20:54.618388592 +0200
-@@ -24,13 +24,13 @@
+--- make_linux.mak.orig 2004-12-29 14:32:46.000000000 +0000
++++ make_linux.mak 2004-12-29 15:38:05.808760592 +0000
+@@ -44,13 +44,13 @@
+ GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
+ GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
- ifeq ($(SWT_PTR_CFLAGS),-DSWT_PTR_SIZE_64)
- # 64 bit path
--JAVA_HOME = /bluebird/teamswt/swt-builddir/jdk1.5.0
-+JAVA_HOME = /usr/lib64/java
- AWT_LIB_PATH = $(JAVA_HOME)/jre/lib/amd64
- XTEST_LIB_PATH = /usr/X11R6/lib64
- else
- # 32 bit path
--JAVA_HOME = /bluebird/teamswt/swt-builddir/IBMJava2-141
--AWT_LIB_PATH = $(JAVA_HOME)/jre/bin
-+JAVA_HOME = /usr/lib/java
-+AWT_LIB_PATH = $(JAVA_HOME)/jre/lib/i386
- XTEST_LIB_PATH = /usr/X11R6/lib
- endif
+-KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt
+-KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -I$(QT_HOME)/include -I$(JAVA_HOME)/include
++KDE_LIBS = -shared -lkdecore -lqt-mt -lkparts
++KDE_CFLAGS = -fno-rtti -c $(OPT) `pkg-config --cflags qt-mt`
-@@ -63,19 +63,20 @@
- GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
- GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
+ # Uncomment for Native Stats tool
+ #NATIVE_STATS = -DNATIVE_STATS
-MOZILLACFLAGS = -O \
-+MOZILLACFLAGS = $(OPT) \
- -fno-rtti \
- -Wall \
+++MOZILLACFLAGS = $(OPT) \
+ -DXPCOM_GLUE=1 \
+ -DMOZILLA_STRICT_API=1 \
+ -fno-rtti \
+@@ -60,10 +60,15 @@
+ -Wno-non-virtual-dtor \
+ -fPIC \
-I./ \
-- -I$(JAVA_HOME) \
-- -include $(MOZILLA_HOME)/include/mozilla-config.h \
-- -I$(MOZILLA_HOME)/include \
-- -I$(MOZILLA_HOME)/include/xpcom \
-- -I$(MOZILLA_HOME)/include/string \
-- -I$(MOZILLA_HOME)/include/nspr \
-- -I$(MOZILLA_HOME)/include/embed_base \
-- -I$(MOZILLA_HOME)/include/gfx
--MOZILLALIBS = -L$(MOZILLA_HOME)/lib -lembed_base_s -lxpcom
-+ -I$(JAVA_HOME)/include \
-+ -I$(JAVA_HOME)/include/linux \
+- ${GECKO_INCLUDES} \
+- ${SWT_PTR_CFLAGS}
++ $(JAVA_INC) \
+ -include /usr/include/mozilla/mozilla-config.h \
-+ -I/usr/include/mozilla \
-+ -I/usr/include/mozilla/embed_base \
-+ -I/usr/include/mozilla/gfx \
-+ -I/usr/include/mozilla/string \
++ -I/usr/include/nspr \
+ -I/usr/include/mozilla/xpcom \
-+ -I/usr/include/nspr
-+MOZILLALIBS = -L/usr/lib/mozilla/components -lembedcomponents -lxpcom
- MOZILLALDFLAGS = -s
-
- SWT_OBJECTS = swt.o callback.o
-@@ -85,14 +86,15 @@
- GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
- MOZILLA_OBJECTS = xpcom.o
++ -I/usr/include/mozilla/string \
++ -I/usr/include/mozilla/embed_base
+
+-MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS}
++MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \
++ -lembedcomponents -lxpcomglue_s -lxpcom -lnspr4 -lplds4 -lplc4
+
+ SWT_OBJECTS = swt.o callback.o
+ AWT_OBJECTS = swt_awt.o
+@@ -73,11 +78,11 @@
+ KDE_OBJS = swt.o kde.o kde_stats.o
+ MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
-CFLAGS = -O -Wall \
+CFLAGS = $(OPT) -Wall \
-DSWT_VERSION=$(SWT_VERSION) \
+ $(NATIVE_STATS) \
-DLINUX -DGTK \
- -I$(JAVA_HOME)/include \
-- -fpic \
-+ -I$(JAVA_HOME)/include/linux \
-+ -fPIC \
+- -I$(JAVA_HOME)/include \
++ $(JAVA_INC) \
+ -fpic \
${SWT_PTR_CFLAGS}
+ LIBS = -shared -fpic
+@@ -91,16 +96,16 @@
+ make_swt: $(SWT_LIB) $(SWTPI_LIB)
+
+ $(SWT_LIB): $(SWT_OBJECTS)
+- $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
+-
++ $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
++
+ callback.o: callback.c callback.h
+ $(CC) $(CFLAGS) -c callback.c
+
+ $(SWTPI_LIB): $(SWTPI_OBJECTS)
+- $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
+-
++ $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
++
+ swt.o: swt.c swt.h
+- $(CC) $(CFLAGS) -c swt.c
++ $(CC) $(CFLAGS) $(JAVA_INC) -c swt.c
+ os.o: os.c os.h swt.h os_custom.h
+ $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
+ os_structs.o: os_structs.c os_structs.h os.h swt.h
+@@ -116,7 +121,7 @@
+ make_awt:$(AWT_LIB)
--LIBS = -shared -fpic
-+LIBS = -shared -fPIC
+ $(AWT_LIB): $(AWT_OBJECTS)
+- $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
++ $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
#
- # Target Rules
+ # Atk lib
+@@ -124,7 +129,7 @@
+ make_atk: $(ATK_LIB)
+
+ $(ATK_LIB): $(ATK_OBJECTS)
+- $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
++ $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
+
+ atk.o: atk.c atk.h
+ $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
+@@ -141,7 +146,7 @@
+ make_gnome: $(GNOME_LIB)
+
+ $(GNOME_LIB): $(GNOME_OBJECTS)
+- $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
++ $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
+
+ gnome.o: gnome.c
+ $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
+@@ -158,7 +163,7 @@
+ make_kde: $(KDE_LIB)
+
+ $(KDE_LIB): $(KDE_OBJS)
+- $(LD) -o $@ $(KDE_OBJS) $(KDE_LIBS)
++ $(CXX) -o $@ $(KDE_OBJS) $(KDE_LIBS)
+
+ kde.o: kde.cpp
+ $(CXX) $(CFLAGS) $(KDE_CFLAGS) -o kde.o kde.cpp
projects / packages / eclipse.git / blobdiff