]>
Commit | Line | Data |
---|---|---|
53eba483 | 1 | --- mozilla/config/autoconf.mk.in.orig 2008-06-19 17:55:40.000000000 +0200 |
2 | +++ mozilla/config/autoconf.mk.in 2008-06-19 18:45:18.000000000 +0200 | |
3 | @@ -276,7 +276,7 @@ | |
4 | OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ | |
5 | OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ | |
6 | ||
7 | -OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS) | |
8 | +OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) $(LCMS_CFLAGS) | |
9 | OS_LIBS = @LIBS@ | |
10 | ACDEFINES = @MOZ_DEFINES@ | |
11 | ||
12 | --- mozilla/config/rules.mk.orig 2008-06-19 18:45:00.000000000 +0200 | |
13 | +++ mozilla/config/rules.mk 2008-06-19 18:42:40.000000000 +0200 | |
14 | @@ -1235,23 +1235,23 @@ | |
15 | # Rules for building native targets must come first because of the host_ prefix | |
16 | host_%.$(OBJ_SUFFIX): %.c Makefile Makefile.in | |
17 | $(REPORT_BUILD) | |
18 | - $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
19 | + $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
20 | ||
21 | host_%.$(OBJ_SUFFIX): %.cpp Makefile Makefile.in | |
22 | $(REPORT_BUILD) | |
23 | - $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
24 | + $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
25 | ||
26 | host_%.$(OBJ_SUFFIX): %.cc Makefile Makefile.in | |
27 | $(REPORT_BUILD) | |
28 | - $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
29 | + $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
30 | ||
31 | host_%.$(OBJ_SUFFIX): %.m Makefile Makefile.in | |
32 | $(REPORT_BUILD) | |
33 | - $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
34 | + $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
35 | ||
36 | host_%.$(OBJ_SUFFIX): %.mm Makefile Makefile.in | |
37 | $(REPORT_BUILD) | |
38 | - $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
39 | + $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
40 | ||
41 | %: %.c Makefile Makefile.in | |
42 | $(REPORT_BUILD) |