--- make_linux.mak- 2012-07-02 00:49:48.729100052 +0000 +++ make_linux.mak 2012-07-02 00:53:16.753499389 +0000 @@ -66,7 +66,7 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -MOZILLACFLAGS = -O \ +MOZILLACFLAGS = $(CXXFLAGS) \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DMOZILLA_STRICT_API=1 \ @@ -106,7 +106,7 @@ WEBKIT_OBJECTS = swt.o webkit.o webkit_structs.o webkit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o -CFLAGS = -O -Wall \ +CFLAGS += \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DLINUX -DGTK \ @@ -130,13 +130,13 @@ make_swt: $(SWT_LIB) $(SWTPI_LIB) $(SWT_LIB): $(SWT_OBJECTS) - $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) callback.o: callback.c callback.h $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c $(SWTPI_LIB): $(SWTPI_OBJECTS) - $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) swt.o: swt.c swt.h $(CC) $(CFLAGS) -c swt.c @@ -155,7 +155,7 @@ make_cairo: $(CAIRO_LIB) $(CAIRO_LIB): $(CAIRO_OBJECTS) - $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) cairo.o: cairo.c cairo.h swt.h $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c @@ -171,7 +171,7 @@ make_cde: $(CDE_LIB) $(CDE_LIB): $(CDE_OBJECTS) - $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) # # AWT lib @@ -179,7 +179,7 @@ make_awt:$(AWT_LIB) $(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) + $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) # # Atk lib @@ -187,7 +187,7 @@ make_atk: $(ATK_LIB) $(ATK_LIB): $(ATK_OBJECTS) - $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) atk.o: atk.c atk.h $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c @@ -204,7 +204,7 @@ make_gnome: $(GNOME_LIB) $(GNOME_LIB): $(GNOME_OBJECTS) - $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) gnome.o: gnome.c $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c @@ -221,7 +221,7 @@ make_mozilla:$(MOZILLA_LIB) $(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} + $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} xpcom.o: xpcom.cpp $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp @@ -242,7 +242,7 @@ $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) echo -e "#include<stdlib.h>\nsize_t je_malloc_usable_size_in_advance(size_t n) {\nreturn n;\n}" | gcc --shared -xc - -o libswt-xulrunner-fix.so - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcomxul.o: xpcom.cpp $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) $(XULRUNNEREXCLUDES) ${XULRUNNER_INCLUDES} -c xpcom.cpp @@ -262,7 +262,7 @@ make_xpcominit:$(XPCOMINIT_LIB) $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcominit.o: xpcominit.cpp $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp @@ -279,7 +279,7 @@ make_webkit: $(WEBKIT_LIB) $(WEBKIT_LIB): $(WEBKIT_OBJECTS) - $(CC) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(WEBKIT_LIB) $(WEBKIT_OBJECTS) webkit.o: webkitgtk.c $(CC) $(CFLAGS) $(WEBKITCFLAGS) -c webkitgtk.c -o webkit.o @@ -296,7 +296,7 @@ make_glx: $(GLX_LIB) $(GLX_LIB): $(GLX_OBJECTS) - $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) glx.o: glx.c $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c --- make_freebsd.mak- 2012-07-02 00:53:28.553351871 +0000 +++ make_freebsd.mak 2012-07-02 00:55:37.369741444 +0000 @@ -64,7 +64,7 @@ # Uncomment for Native Stats tool #NATIVE_STATS = -DNATIVE_STATS -MOZILLACFLAGS = -O \ +MOZILLACFLAGS += \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DMOZILLA_STRICT_API=1 \ @@ -91,7 +91,7 @@ XPCOMINIT_OBJECTS = swt.o xpcominit.o xpcominit_structs.o xpcominit_stats.o GLX_OBJECTS = swt.o glx.o glx_structs.o glx_stats.o -CFLAGS = -O -Wall \ +CFLAGS += \ -DSWT_VERSION=$(SWT_VERSION) \ $(NATIVE_STATS) \ -DFREEBSD -DGTK \ @@ -115,13 +115,13 @@ make_swt: $(SWT_LIB) $(SWTPI_LIB) $(SWT_LIB): $(SWT_OBJECTS) - $(CC) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWT_LIB) $(SWT_OBJECTS) callback.o: callback.c callback.h $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c $(SWTPI_LIB): $(SWTPI_OBJECTS) - $(CC) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) swt.o: swt.c swt.h $(CC) $(CFLAGS) -c swt.c @@ -140,7 +140,7 @@ make_cairo: $(CAIRO_LIB) $(CAIRO_LIB): $(CAIRO_OBJECTS) - $(CC) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) cairo.o: cairo.c cairo.h swt.h $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c @@ -156,7 +156,7 @@ make_cde: $(CDE_LIB) $(CDE_LIB): $(CDE_OBJECTS) - $(CC) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) # # AWT lib @@ -164,7 +164,7 @@ make_awt:$(AWT_LIB) $(AWT_LIB): $(AWT_OBJECTS) - $(CC) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) + $(CC) $(LDFLAGS) $(AWT_LFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) # # Atk lib @@ -172,7 +172,7 @@ make_atk: $(ATK_LIB) $(ATK_LIB): $(ATK_OBJECTS) - $(CC) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) atk.o: atk.c atk.h $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c @@ -189,7 +189,7 @@ make_gnome: $(GNOME_LIB) $(GNOME_LIB): $(GNOME_OBJECTS) - $(CC) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) gnome.o: gnome.c $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c @@ -206,7 +206,7 @@ make_mozilla:$(MOZILLA_LIB) $(MOZILLA_LIB): $(MOZILLA_OBJECTS) - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} + $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALFLAGS) ${MOZILLA_LIBS} xpcom.o: xpcom.cpp $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp @@ -226,7 +226,7 @@ make_xulrunner:$(XULRUNNER_LIB) $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcomxul.o: xpcom.cpp $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp @@ -252,7 +252,7 @@ make_xpcominit:$(XPCOMINIT_LIB) $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} + $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALFLAGS) ${XULRUNNER_LIBS} xpcominit.o: xpcominit.cpp $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp @@ -269,7 +269,7 @@ make_glx: $(GLX_LIB) $(GLX_LIB): $(GLX_OBJECTS) - $(CC) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) + $(CC) $(LDFLAGS) $(LFLAGS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) glx.o: glx.c $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c