1 --- make_linux.mak.orig 2004-12-29 14:32:46.000000000 +0000
2 +++ make_linux.mak 2004-12-29 15:38:05.808760592 +0000
4 GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
5 GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
7 -KDE_LIBS = -shared -L$(KDE_LIB_PATH) -lkdecore -lkparts -L$(QT_HOME)/lib -lqt
8 -KDE_CFLAGS = -fno-rtti -c -O -I$(KDE_INCLUDE_PATH) -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 \
27 + -include /usr/include/mozilla/mozilla-config.h \
28 + -I/usr/include/nspr \
29 + -I/usr/include/mozilla/xpcom \
30 + -I/usr/include/mozilla/string \
31 + -I/usr/include/mozilla/embed_base
33 -MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS}
34 +MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \
35 + -lembedcomponents -lxpcomglue_s -lxpcom -lnspr4 -lplds4 -lplc4
37 SWT_OBJECTS = swt.o callback.o
38 AWT_OBJECTS = swt_awt.o
40 KDE_OBJS = swt.o kde.o kde_stats.o
41 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
44 +CFLAGS = $(OPT) -Wall \
45 -DSWT_VERSION=$(SWT_VERSION) \
48 - -I$(JAVA_HOME)/include \
54 make_swt: $(SWT_LIB) $(SWTPI_LIB)
56 $(SWT_LIB): $(SWT_OBJECTS)
57 - $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
59 + $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
61 callback.o: callback.c callback.h
62 $(CC) $(CFLAGS) -c callback.c
64 $(SWTPI_LIB): $(SWTPI_OBJECTS)
65 - $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
67 + $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
70 - $(CC) $(CFLAGS) -c swt.c
71 + $(CC) $(CFLAGS) $(JAVA_INC) -c swt.c
72 os.o: os.c os.h swt.h os_custom.h
73 $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
74 os_structs.o: os_structs.c os_structs.h os.h swt.h
78 $(AWT_LIB): $(AWT_OBJECTS)
79 - $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
80 + $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
87 $(ATK_LIB): $(ATK_OBJECTS)
88 - $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
89 + $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
92 $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
94 make_gnome: $(GNOME_LIB)
96 $(GNOME_LIB): $(GNOME_OBJECTS)
97 - $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
98 + $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
101 $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c
105 $(KDE_LIB): $(KDE_OBJS)
106 - $(LD) -o $@ $(KDE_OBJS) $(KDE_LIBS)
107 + $(CXX) -o $@ $(KDE_OBJS) $(KDE_LIBS)
110 $(CXX) $(CFLAGS) $(KDE_CFLAGS) -o kde.o kde.cpp