| --- make_linux.mak 2009-05-24 18:38:39.000000000 +0300 |
| +++ make_linux.mak.fixed 2009-05-24 19:38:51.000000000 +0300 |
| @@ -64,7 +64,7 @@ |
| # Uncomment for Native Stats tool |
| #NATIVE_STATS = -DNATIVE_STATS |
| |
| -MOZILLACFLAGS = -O \ |
| +MOZILLACFLAGS = $(CXXFLAGS) \ |
| -DSWT_VERSION=$(SWT_VERSION) \ |
| $(NATIVE_STATS) \ |
| -DMOZILLA_STRICT_API=1 \ |
| @@ -92,15 +92,14 @@ |
| 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 \ |
| - -DSWT_VERSION=$(SWT_VERSION) \ |
| +CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \ |
| $(NATIVE_STATS) \ |
| -DLINUX -DGTK \ |
| -I$(JAVA_HOME)/include \ |
| -I$(JAVA_HOME)/include/linux \ |
| -fPIC \ |
| ${SWT_PTR_CFLAGS} |
| -LIBS = -shared -fPIC |
| +LIBS = -shared -fPIC $(LDFLAGS) |
| |
| ifndef NO_STRIP |
| AWT_LIBS := $(AWT_LIBS) -s |
| @@ -122,7 +121,7 @@ |
| $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c |
| |
| $(SWTPI_LIB): $(SWTPI_OBJECTS) |
| - $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) |
| + $(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
| |
| swt.o: swt.c swt.h |
| $(CC) $(CFLAGS) -c swt.c |
| @@ -141,7 +140,7 @@ |
| make_cairo: $(CAIRO_LIB) |
| |
| $(CAIRO_LIB): $(CAIRO_OBJECTS) |
| - $(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) |
| + $(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
| |
| cairo.o: cairo.c cairo.h swt.h |
| $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
| @@ -157,7 +156,7 @@ |
| make_cde: $(CDE_LIB) |
| |
| $(CDE_LIB): $(CDE_OBJECTS) |
| - $(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) |
| + $(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
| |
| # |
| # AWT lib |
| @@ -165,7 +164,7 @@ |
| make_awt:$(AWT_LIB) |
| |
| $(AWT_LIB): $(AWT_OBJECTS) |
| - $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) |
| + $(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
| |
| # |
| # Atk lib |
| @@ -173,7 +172,7 @@ |
| make_atk: $(ATK_LIB) |
| |
| $(ATK_LIB): $(ATK_OBJECTS) |
| - $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) |
| + $(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
| |
| atk.o: atk.c atk.h |
| $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
| @@ -190,7 +189,7 @@ |
| make_gnome: $(GNOME_LIB) |
| |
| $(GNOME_LIB): $(GNOME_OBJECTS) |
| - $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) |
| + $(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
| |
| gnome.o: gnome.c |
| $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c |
| @@ -207,7 +206,7 @@ |
| make_mozilla:$(MOZILLA_LIB) |
| |
| $(MOZILLA_LIB): $(MOZILLA_OBJECTS) |
| - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| + $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| |
| xpcom.o: xpcom.cpp |
| $(CXX) $(MOZILLACFLAGS) $(MOZILLAEXCLUDES) ${MOZILLA_INCLUDES} -c xpcom.cpp |
| @@ -227,7 +226,7 @@ |
| make_xulrunner:$(XULRUNNER_LIB) |
| |
| $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) |
| - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| + $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| |
| xpcomxul.o: xpcom.cpp |
| $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
| @@ -247,7 +246,7 @@ |
| make_xpcominit:$(XPCOMINIT_LIB) |
| |
| $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) |
| - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| + $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| |
| xpcominit.o: xpcominit.cpp |
| $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp |
| @@ -264,7 +263,7 @@ |
| make_glx: $(GLX_LIB) |
| |
| $(GLX_LIB): $(GLX_OBJECTS) |
| - $(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS) |
| + $(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
| |
| glx.o: glx.c |
| $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |
| --- make_freebsd.mak 2009-05-24 20:09:55.000000000 +0300 |
| +++ make_freebsd.mak.fixed 2009-05-24 20:15:03.000000000 +0300 |
| @@ -64,7 +64,7 @@ |
| # Uncomment for Native Stats tool |
| #NATIVE_STATS = -DNATIVE_STATS |
| |
| -MOZILLACFLAGS = -O \ |
| +MOZILLACFLAGS = $(CXXFLAGS) \ |
| -DSWT_VERSION=$(SWT_VERSION) \ |
| $(NATIVE_STATS) \ |
| -DMOZILLA_STRICT_API=1 \ |
| @@ -91,15 +91,14 @@ |
| 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 \ |
| - -DSWT_VERSION=$(SWT_VERSION) \ |
| +CFLAGS += -DSWT_VERSION=$(SWT_VERSION) \ |
| $(NATIVE_STATS) \ |
| -DFREEBSD -DGTK \ |
| -I$(JAVA_HOME)/include \ |
| -I$(JAVA_HOME)/include/freebsd \ |
| -fPIC \ |
| ${SWT_PTR_CFLAGS} |
| -LIBS = -shared -fPIC |
| +LIBS = -shared -fPIC $(LDFLAGS) |
| |
| ifndef NO_STRIP |
| AWT_LIBS := $(AWT_LIBS) -s |
| @@ -121,7 +120,7 @@ |
| $(CC) $(CFLAGS) -DUSE_ASSEMBLER -c callback.c |
| |
| $(SWTPI_LIB): $(SWTPI_OBJECTS) |
| - $(CC) $(LIBS) $(GTKLIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) |
| + $(CC) $(LIBS) -o $(SWTPI_LIB) $(SWTPI_OBJECTS) $(GTKLIBS) |
| |
| swt.o: swt.c swt.h |
| $(CC) $(CFLAGS) -c swt.c |
| @@ -140,7 +139,7 @@ |
| make_cairo: $(CAIRO_LIB) |
| |
| $(CAIRO_LIB): $(CAIRO_OBJECTS) |
| - $(CC) $(LIBS) $(CAIROLIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) |
| + $(CC) $(LIBS) -o $(CAIRO_LIB) $(CAIRO_OBJECTS) $(CAIROLIBS) |
| |
| cairo.o: cairo.c cairo.h swt.h |
| $(CC) $(CFLAGS) $(CAIROCFLAGS) -c cairo.c |
| @@ -156,7 +155,7 @@ |
| make_cde: $(CDE_LIB) |
| |
| $(CDE_LIB): $(CDE_OBJECTS) |
| - $(CC) $(LIBS) $(CDE_LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) |
| + $(CC) $(LIBS) -o $(CDE_LIB) $(CDE_OBJECTS) $(CDE_LIBS) |
| |
| # |
| # AWT lib |
| @@ -164,7 +163,7 @@ |
| make_awt:$(AWT_LIB) |
| |
| $(AWT_LIB): $(AWT_OBJECTS) |
| - $(CC) $(AWT_LIBS) -o $(AWT_LIB) $(AWT_OBJECTS) |
| + $(CC) $(LDFLAGS) -o $(AWT_LIB) $(AWT_OBJECTS) $(AWT_LIBS) |
| |
| # |
| # Atk lib |
| @@ -172,7 +171,7 @@ |
| make_atk: $(ATK_LIB) |
| |
| $(ATK_LIB): $(ATK_OBJECTS) |
| - $(CC) $(LIBS) $(ATKLIBS) -o $(ATK_LIB) $(ATK_OBJECTS) |
| + $(CC) $(LIBS) -o $(ATK_LIB) $(ATK_OBJECTS) $(ATKLIBS) |
| |
| atk.o: atk.c atk.h |
| $(CC) $(CFLAGS) $(ATKCFLAGS) -c atk.c |
| @@ -189,7 +188,7 @@ |
| make_gnome: $(GNOME_LIB) |
| |
| $(GNOME_LIB): $(GNOME_OBJECTS) |
| - $(CC) $(LIBS) $(GNOMELIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) |
| + $(CC) $(LIBS) -o $(GNOME_LIB) $(GNOME_OBJECTS) $(GNOMELIBS) |
| |
| gnome.o: gnome.c |
| $(CC) $(CFLAGS) $(GNOMECFLAGS) -c gnome.c |
| @@ -206,7 +205,7 @@ |
| make_mozilla:$(MOZILLA_LIB) |
| |
| $(MOZILLA_LIB): $(MOZILLA_OBJECTS) |
| - $(CXX) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| + $(CXX) $(LDFLAGS) -o $(MOZILLA_LIB) $(MOZILLA_OBJECTS) $(MOZILLALIBS) ${MOZILLA_LIBS} |
| |
| xpcom.o: xpcom.cpp |
| $(CXX) $(MOZILLACFLAGS) ${MOZILLA_INCLUDES} -c xpcom.cpp |
| @@ -226,7 +225,7 @@ |
| make_xulrunner:$(XULRUNNER_LIB) |
| |
| $(XULRUNNER_LIB): $(XULRUNNER_OBJECTS) |
| - $(CXX) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| + $(CXX) $(LDFLAGS) -o $(XULRUNNER_LIB) $(XULRUNNER_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| |
| xpcomxul.o: xpcom.cpp |
| $(CXX) -o xpcomxul.o $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcom.cpp |
| @@ -252,7 +251,7 @@ |
| make_xpcominit:$(XPCOMINIT_LIB) |
| |
| $(XPCOMINIT_LIB): $(XPCOMINIT_OBJECTS) |
| - $(CXX) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| + $(CXX) $(LDFLAGS) -o $(XPCOMINIT_LIB) $(XPCOMINIT_OBJECTS) $(MOZILLALIBS) ${XULRUNNER_LIBS} |
| |
| xpcominit.o: xpcominit.cpp |
| $(CXX) $(MOZILLACFLAGS) ${XULRUNNER_INCLUDES} -c xpcominit.cpp |
| @@ -269,7 +268,7 @@ |
| make_glx: $(GLX_LIB) |
| |
| $(GLX_LIB): $(GLX_OBJECTS) |
| - $(CC) $(LIBS) $(GLXLIBS) -o $(GLX_LIB) $(GLX_OBJECTS) |
| + $(CC) $(LIBS) -o $(GLX_LIB) $(GLX_OBJECTS) $(GLXLIBS) |
| |
| glx.o: glx.c |
| $(CC) $(CFLAGS) $(GLXCFLAGS) -c glx.c |