projects / packages / firefox.git / blame
| Commit | Line | Data |
|---|---|---|
| bdd8aa13 SP |
1 | diff -ur mozilla-1.9.1/config/autoconf.mk.in mozilla-1.9.1.new/config/autoconf.mk.in |
| 2 | --- mozilla-1.9.1/config/autoconf.mk.in 2009-04-24 03:46:37.000000000 +0200 | |
| 3 | +++ mozilla-1.9.1.new/config/autoconf.mk.in 2009-06-05 15:08:17.083806835 +0200 | |
| 4 | @@ -280,7 +280,7 @@ | |
| e36ee87a | 5 | OS_COMPILE_CFLAGS = $(OS_CPPFLAGS) @COMPILE_CFLAGS@ |
| 6 | OS_COMPILE_CXXFLAGS = $(OS_CPPFLAGS) @COMPILE_CXXFLAGS@ | |
| 7 | ||
| bdd8aa13 SP |
8 | -OS_INCLUDES = $(NSPR_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) |
| 9 | +OS_INCLUDES = $(NSPR_CFLAGS) $(NSS_CFLAGS) $(JPEG_CFLAGS) $(PNG_CFLAGS) $(ZLIB_CFLAGS) | |
| e36ee87a | 10 | OS_LIBS = @LIBS@ |
| 11 | ACDEFINES = @MOZ_DEFINES@ | |
| 12 | ||
| bdd8aa13 SP |
13 | Tylko w mozilla-1.9.1.new/config: autoconf.mk.in~ |
| 14 | diff -ur mozilla-1.9.1/config/rules.mk mozilla-1.9.1.new/config/rules.mk | |
| 15 | --- mozilla-1.9.1/config/rules.mk 2009-04-24 03:46:37.000000000 +0200 | |
| 16 | +++ mozilla-1.9.1.new/config/rules.mk 2009-06-05 15:09:27.531343726 +0200 | |
| 17 | @@ -1364,23 +1364,23 @@ | |
| e36ee87a | 18 | # Rules for building native targets must come first because of the host_ prefix |
| bdd8aa13 | 19 | host_%.$(OBJ_SUFFIX): %.c $(GLOBAL_DEPS) |
| e36ee87a | 20 | $(REPORT_BUILD) |
| 21 | - $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
| 22 | + $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
| 23 | ||
| bdd8aa13 | 24 | host_%.$(OBJ_SUFFIX): %.cpp $(GLOBAL_DEPS) |
| e36ee87a | 25 | $(REPORT_BUILD) |
| 26 | - $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
| 27 | + $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
| 28 | ||
| bdd8aa13 | 29 | host_%.$(OBJ_SUFFIX): %.cc $(GLOBAL_DEPS) |
| e36ee87a | 30 | $(REPORT_BUILD) |
| 31 | - $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
| 32 | + $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
| 33 | ||
| bdd8aa13 | 34 | host_%.$(OBJ_SUFFIX): %.m $(GLOBAL_DEPS) |
| e36ee87a | 35 | $(REPORT_BUILD) |
| 36 | - $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
| 37 | + $(ELOG) $(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CFLAGS) $(HOST_CMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
| 38 | ||
| bdd8aa13 | 39 | host_%.$(OBJ_SUFFIX): %.mm $(GLOBAL_DEPS) |
| e36ee87a | 40 | $(REPORT_BUILD) |
| 41 | - $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(_VPATH_SRCS) | |
| 42 | + $(ELOG) $(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(INCLUDES) $(NSPR_CFLAGS) $(NSS_CFLAGS) $(_VPATH_SRCS) | |
| 43 | ||
| bdd8aa13 | 44 | %: %.c $(GLOBAL_DEPS) |
| e36ee87a | 45 | $(REPORT_BUILD) |
| bdd8aa13 | 46 | Tylko w mozilla-1.9.1.new/config: rules.mk~ |