1 --- make_linux.mak.orig 2004-10-22 17:48:31.000000000 +0200
2 +++ make_linux.mak 2004-10-22 17:48:45.286049824 +0200
4 GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
5 GNOMELIBS = `pkg-config --libs gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
7 -KDE_LIBS = -L/usr/lib -L$(QT_HOME)/lib -shared -lkdecore -lqt -lkparts
8 -KDE_CFLAGS = -fno-rtti -c -O -I/usr/include/kde -I$(QT_HOME)/include -I$(JAVA_HOME)/include
9 +KDE_LIBS = -shared -lkdecore -lqt-mt -lkparts
10 +KDE_CFLAGS = -fno-rtti -c $(OPT) `pkg-config --cflags qt-mt`
12 # Uncomment for Native Stats tool
13 #NATIVE_STATS = -DNATIVE_STATS
16 +MOZILLACFLAGS = $(OPT) \
18 -DMOZILLA_STRICT_API=1 \
21 -Wno-non-virtual-dtor \
25 - -include $(GECKO_SDK)/mozilla-config.h \
26 - -I$(GECKO_SDK)/nspr/include \
27 - -I$(GECKO_SDK)/xpcom/include \
28 - -I$(GECKO_SDK)/string/include \
29 - -I$(GECKO_SDK)/embed_base/include \
30 - -I$(GECKO_SDK)/embedstring/include
32 + -include /usr/include/mozilla/mozilla-config.h \
33 + -I/usr/include/nspr \
34 + -I/usr/include/mozilla/xpcom \
35 + -I/usr/include/mozilla/string \
36 + -I/usr/include/mozilla/embed_base
37 MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \
38 - -L$(GECKO_SDK)/embedstring/bin -lembedstring \
39 - -L$(GECKO_SDK)/embed_base/bin -lembed_base_s \
40 - -L$(GECKO_SDK)/xpcom/bin -lxpcomglue_s -lxpcom \
41 - -L$(GECKO_SDK)/nspr/bin -lnspr4 -lplds4 -lplc4
42 + -lembedcomponents -lxpcomglue_s -lxpcom -lnspr4 -lplds4 -lplc4
44 SWT_OBJECTS = swt.o callback.o
45 AWT_OBJECTS = swt_awt.o
47 KDE_OBJS = swt.o kde.o kde_stats.o
48 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
51 +CFLAGS = $(OPT) -Wall \
52 -DSWT_VERSION=$(SWT_VERSION) \
55 - -I$(JAVA_HOME)/include \
61 make_swt: $(SWT_LIB) $(SWTPI_LIB)
63 $(SWT_LIB): $(SWT_OBJECTS)
64 - $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
65 + $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
67 callback.o: callback.c callback.h
68 $(CC) $(CFLAGS) -c callback.c
70 $(SWTPI_LIB): $(SWTPI_OBJECTS)
71 - $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
72 + $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
75 - $(CC) $(CFLAGS) -c swt.c
76 + $(CC) $(CFLAGS) $(JAVA_INC) -c swt.c
77 os.o: os.c os.h swt.h os_custom.h
78 $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
79 os_structs.o: os_structs.c os_structs.h os.h swt.h
83 $(AWT_LIB): $(AWT_OBJECTS)
84 - $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
85 + $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
92 $(ATK_LIB): $(ATK_OBJECTS)
93 - $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
94 + $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
97 $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
99 make_gnome: $(GNOME_LIB)
101 $(GNOME_LIB): $(GNOME_OBJECTS)
102 - $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
103 + $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
106 $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
110 $(KDE_LIB): $(KDE_OBJS)
111 - $(LD) -o $@ $(KDE_OBJS) $(KDE_LIBS)
112 + $(CXX) -o $@ $(KDE_OBJS) $(KDE_LIBS)
115 $(CXX) $(CFLAGS) $(KDE_CFLAGS) -o kde.o kde.cpp