]>
Commit | Line | Data |
---|---|---|
e1dae457 AZ |
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 | |
3 | @@ -44,13 +44,13 @@ | |
af564b00 | 4 | GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` |
e1dae457 | 5 | GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 |
af564b00 | 6 | |
e1dae457 AZ |
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 | |
8deae6ef PS |
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 | 15 | -MOZILLACFLAGS = -O \ |
e1dae457 | 16 | ++MOZILLACFLAGS = $(OPT) \ |
8deae6ef PS |
17 | -DXPCOM_GLUE=1 \ |
18 | -DMOZILLA_STRICT_API=1 \ | |
19 | -fno-rtti \ | |
e1dae457 | 20 | @@ -60,10 +60,15 @@ |
8deae6ef PS |
21 | -Wno-non-virtual-dtor \ |
22 | -fPIC \ | |
af564b00 | 23 | -I./ \ |
e1dae457 AZ |
24 | - ${GECKO_INCLUDES} \ |
25 | - ${SWT_PTR_CFLAGS} | |
8deae6ef | 26 | + $(JAVA_INC) \ |
af564b00 | 27 | + -include /usr/include/mozilla/mozilla-config.h \ |
572081d0 | 28 | + -I/usr/include/nspr \ |
af564b00 | 29 | + -I/usr/include/mozilla/xpcom \ |
8deae6ef PS |
30 | + -I/usr/include/mozilla/string \ |
31 | + -I/usr/include/mozilla/embed_base | |
e1dae457 AZ |
32 | |
33 | -MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS} | |
34 | +MOZILLALIBS = -shared -Wl,--version-script=mozilla_exports -Bsymbolic \ | |
8deae6ef | 35 | + -lembedcomponents -lxpcomglue_s -lxpcom -lnspr4 -lplds4 -lplc4 |
e1dae457 | 36 | |
8deae6ef PS |
37 | SWT_OBJECTS = swt.o callback.o |
38 | AWT_OBJECTS = swt_awt.o | |
e1dae457 | 39 | @@ -73,11 +78,11 @@ |
8deae6ef PS |
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 | |
af564b00 PS |
42 | |
43 | -CFLAGS = -O -Wall \ | |
44 | +CFLAGS = $(OPT) -Wall \ | |
45 | -DSWT_VERSION=$(SWT_VERSION) \ | |
8deae6ef | 46 | $(NATIVE_STATS) \ |
af564b00 | 47 | -DLINUX -DGTK \ |
8deae6ef PS |
48 | - -I$(JAVA_HOME)/include \ |
49 | + $(JAVA_INC) \ | |
50 | -fpic \ | |
af564b00 | 51 | ${SWT_PTR_CFLAGS} |
8deae6ef | 52 | LIBS = -shared -fpic |
e1dae457 | 53 | @@ -91,16 +96,16 @@ |
8deae6ef PS |
54 | make_swt: $(SWT_LIB) $(SWTPI_LIB) |
55 | ||
56 | $(SWT_LIB): $(SWT_OBJECTS) | |
57 | - $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS) | |
e1dae457 | 58 | - |
8deae6ef | 59 | + $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS) |
e1dae457 | 60 | + |
8deae6ef PS |
61 | callback.o: callback.c callback.h |
62 | $(CC) $(CFLAGS) -c callback.c | |
63 | ||
64 | $(SWTPI_LIB): $(SWTPI_OBJECTS) | |
65 | - $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) | |
e1dae457 | 66 | - |
8deae6ef | 67 | + $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) |
e1dae457 | 68 | + |
8deae6ef PS |
69 | swt.o: swt.c swt.h |
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 | |
e1dae457 | 75 | @@ -116,7 +121,7 @@ |
8deae6ef PS |
76 | make_awt:$(AWT_LIB) |
77 | ||
78 | $(AWT_LIB): $(AWT_OBJECTS) | |
79 | - $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) | |
80 | + $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) | |
af564b00 PS |
81 | |
82 | # | |
8deae6ef | 83 | # Atk lib |
e1dae457 | 84 | @@ -124,7 +129,7 @@ |
8deae6ef PS |
85 | make_atk: $(ATK_LIB) |
86 | ||
87 | $(ATK_LIB): $(ATK_OBJECTS) | |
88 | - $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) | |
89 | + $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) | |
90 | ||
91 | atk.o: atk.c atk.h | |
92 | $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c | |
e1dae457 | 93 | @@ -141,7 +146,7 @@ |
8deae6ef PS |
94 | make_gnome: $(GNOME_LIB) |
95 | ||
96 | $(GNOME_LIB): $(GNOME_OBJECTS) | |
97 | - $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) | |
98 | + $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) | |
99 | ||
100 | gnome.o: gnome.c | |
101 | $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c | |
e1dae457 | 102 | @@ -158,7 +163,7 @@ |
8deae6ef PS |
103 | make_kde: $(KDE_LIB) |
104 | ||
105 | $(KDE_LIB): $(KDE_OBJS) | |
106 | - $(LD) -o $@ $(KDE_OBJS) $(KDE_LIBS) | |
107 | + $(CXX) -o $@ $(KDE_OBJS) $(KDE_LIBS) | |
108 | ||
109 | kde.o: kde.cpp | |
110 | $(CXX) $(CFLAGS) $(KDE_CFLAGS) -o kde.o kde.cpp |