]>
Commit | Line | Data |
---|---|---|
8deae6ef PS |
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 | |
3 | @@ -43,13 +43,13 @@ | |
af564b00 PS |
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` | |
6 | ||
8deae6ef PS |
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` | |
11 | ||
12 | # Uncomment for Native Stats tool | |
13 | #NATIVE_STATS = -DNATIVE_STATS | |
14 | ||
af564b00 PS |
15 | -MOZILLACFLAGS = -O \ |
16 | +MOZILLACFLAGS = $(OPT) \ | |
8deae6ef PS |
17 | -DXPCOM_GLUE=1 \ |
18 | -DMOZILLA_STRICT_API=1 \ | |
19 | -fno-rtti \ | |
20 | @@ -59,18 +59,14 @@ | |
21 | -Wno-non-virtual-dtor \ | |
22 | -fPIC \ | |
af564b00 | 23 | -I./ \ |
8deae6ef PS |
24 | - -I$(GECKO_SDK) \ |
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 | |
31 | + $(JAVA_INC) \ | |
af564b00 | 32 | + -include /usr/include/mozilla/mozilla-config.h \ |
572081d0 | 33 | + -I/usr/include/nspr \ |
af564b00 | 34 | + -I/usr/include/mozilla/xpcom \ |
8deae6ef PS |
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 | |
43 | ||
44 | SWT_OBJECTS = swt.o callback.o | |
45 | AWT_OBJECTS = swt_awt.o | |
46 | @@ -80,11 +76,11 @@ | |
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 | |
af564b00 PS |
49 | |
50 | -CFLAGS = -O -Wall \ | |
51 | +CFLAGS = $(OPT) -Wall \ | |
52 | -DSWT_VERSION=$(SWT_VERSION) \ | |
8deae6ef | 53 | $(NATIVE_STATS) \ |
af564b00 | 54 | -DLINUX -DGTK \ |
8deae6ef PS |
55 | - -I$(JAVA_HOME)/include \ |
56 | + $(JAVA_INC) \ | |
57 | -fpic \ | |
af564b00 | 58 | ${SWT_PTR_CFLAGS} |
8deae6ef PS |
59 | LIBS = -shared -fpic |
60 | @@ -98,16 +94,16 @@ | |
61 | make_swt: $(SWT_LIB) $(SWTPI_LIB) | |
62 | ||
63 | $(SWT_LIB): $(SWT_OBJECTS) | |
64 | - $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS) | |
65 | + $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS) | |
66 | ||
67 | callback.o: callback.c callback.h | |
68 | $(CC) $(CFLAGS) -c callback.c | |
69 | ||
70 | $(SWTPI_LIB): $(SWTPI_OBJECTS) | |
71 | - $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) | |
72 | + $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) | |
af564b00 | 73 | |
8deae6ef PS |
74 | swt.o: swt.c swt.h |
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 | |
80 | @@ -123,7 +119,7 @@ | |
81 | make_awt:$(AWT_LIB) | |
82 | ||
83 | $(AWT_LIB): $(AWT_OBJECTS) | |
84 | - $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) | |
85 | + $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) | |
af564b00 PS |
86 | |
87 | # | |
8deae6ef PS |
88 | # Atk lib |
89 | @@ -131,7 +127,7 @@ | |
90 | make_atk: $(ATK_LIB) | |
91 | ||
92 | $(ATK_LIB): $(ATK_OBJECTS) | |
93 | - $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) | |
94 | + $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) | |
95 | ||
96 | atk.o: atk.c atk.h | |
97 | $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c | |
98 | @@ -148,7 +144,7 @@ | |
99 | make_gnome: $(GNOME_LIB) | |
100 | ||
101 | $(GNOME_LIB): $(GNOME_OBJECTS) | |
102 | - $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) | |
103 | + $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) | |
104 | ||
105 | gnome.o: gnome.c | |
106 | $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c | |
107 | @@ -165,7 +161,7 @@ | |
108 | make_kde: $(KDE_LIB) | |
109 | ||
110 | $(KDE_LIB): $(KDE_OBJS) | |
111 | - $(LD) -o $@ $(KDE_OBJS) $(KDE_LIBS) | |
112 | + $(CXX) -o $@ $(KDE_OBJS) $(KDE_LIBS) | |
113 | ||
114 | kde.o: kde.cpp | |
115 | $(CXX) $(CFLAGS) $(KDE_CFLAGS) -o kde.o kde.cpp |