1 --- make_linux.mak.orig 2005-06-27 20:53:36.000000000 +0200
2 +++ make_linux.mak 2005-06-30 22:05:11.000000000 +0200
4 # Uncomment for Native Stats tool
5 #NATIVE_STATS = -DNATIVE_STATS
8 +MOZILLACFLAGS = $(OPT) \
10 -DMOZILLA_STRICT_API=1 \
13 -I$(JAVA_HOME)/include \
14 -I$(JAVA_HOME)/include/linux \
19 + -include /usr/include/mozilla/mozilla-config.h \
20 + -I/usr/include/nspr \
21 + -I/usr/include/mozilla/xpcom \
22 + -I/usr/include/mozilla/string \
23 + -I/usr/include/mozilla/embed_base
25 MOZILLALIBS = -shared -s -Wl,--version-script=mozilla_exports -Bsymbolic ${GECKO_LIBS}
28 GNOME_OBJECTS = swt.o gnome.o gnome_structs.o gnome_stats.o
29 MOZILLA_OBJECTS = swt.o xpcom.o xpcom_custom.o xpcom_structs.o xpcom_stats.o
32 +CFLAGS = $(OPT) -Wall \
33 -DSWT_VERSION=$(SWT_VERSION) \
36 -I$(JAVA_HOME)/include \
37 -I$(JAVA_HOME)/include/linux \
42 LIBS = -shared -fpic -s
46 make_swt: $(SWT_LIB) $(SWTPI_LIB)
48 $(SWT_LIB): $(SWT_OBJECTS)
49 - $(LD) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
51 + $(CC) $(LIBS) -o $(SWT_LIB) $(SWT_OBJECTS)
53 callback.o: callback.c callback.h
54 $(CC) $(CFLAGS) -c callback.c
56 $(SWTPI_LIB): $(SWTPI_OBJECTS)
57 - $(LD) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
59 + $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS)
62 - $(CC) $(CFLAGS) -c swt.c
63 + $(CC) $(CFLAGS) $(JAVA_INC) -c swt.c
64 os.o: os.c os.h swt.h os_custom.h
65 $(CC) $(CFLAGS) $(GTKCFLAGS) -c os.c
66 os_structs.o: os_structs.c os_structs.h os.h swt.h
70 $(AWT_LIB): $(AWT_OBJECTS)
71 - $(LD) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
72 + $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS)
79 $(ATK_LIB): $(ATK_OBJECTS)
80 - $(LD) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
81 + $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS)
84 $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c
86 make_gnome: $(GNOME_LIB)
88 $(GNOME_LIB): $(GNOME_OBJECTS)
89 - $(LD) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
90 + $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS)
93 $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c