]>
Commit | Line | Data |
---|---|---|
f4114a7f ER |
1 | --- icedove-6.0/mozilla/Makefile.in~ 2011-08-12 16:52:03.000000000 +0300 |
2 | +++ icedove-6.0/mozilla/Makefile.in 2011-08-26 13:00:59.373870016 +0300 | |
3 | @@ -58,8 +58,6 @@ | |
8d3ddb82 | 4 | |
5 | include $(topsrcdir)/config/config.mk | |
6 | ||
7 | -default alldep all:: $(topsrcdir)/configure config.status | |
8 | - | |
f4114a7f ER |
9 | ifndef INCLUDED_BRIDGE_MK |
10 | include $(topsrcdir)/bridge/bridge.mk | |
11 | endif | |
12 | @@ -67,19 +65,7 @@ | |
13 | # workaround Bug 599809 by making these makefiles be generated here | |
14 | SUBMAKEFILES += $(addsuffix /Makefile, $(APP_LIBXUL_DIRS) $(APP_LIBXUL_STATICDIRS)) | |
15 | ||
8d3ddb82 | 16 | -$(topsrcdir)/configure: $(topsrcdir)/configure.in |
17 | - @echo "STOP! configure.in has changed, and your configure is out of date." | |
18 | - @echo "Please rerun autoconf and configure." | |
19 | - @echo "To ignore this message, touch 'configure' in the source directory." | |
20 | - @exit 1 | |
21 | - | |
22 | -config.status: $(topsrcdir)/configure | |
23 | - @echo "STOP! configure has changed and needs to be run in this build directory." | |
24 | - @echo "Please rerun configure." | |
25 | - @echo "To ignore this message, touch 'config.status' in the build directory." | |
26 | - @exit 1 | |
27 | - | |
f4114a7f ER |
28 | -default export libs clean realclean distclean alldep \ |
29 | +default export libs clean realclean distclean \ | |
30 | maybe_clobber_profiledbuild uploadsymbols all:: $(SUBMAKEFILES) | |
8d3ddb82 | 31 | $(MAKE) -C mozilla $@ |
32 | ||
f4114a7f ER |
33 | --- icedove-6.0/mozilla/client.mk~ 2011-08-26 13:10:08.000000000 +0300 |
34 | +++ icedove-6.0/mozilla/client.mk 2011-08-26 13:10:11.365956960 +0300 | |
35 | @@ -278,8 +278,8 @@ | |
36 | $(TOPSRCDIR)/mozilla/js/src/aclocal.m4 \ | |
37 | $(NULL) | |
38 | ||
39 | -$(CONFIGURES): %: %.in $(EXTRA_CONFIG_DEPS) | |
40 | - @echo Generating $@ using autoconf | |
41 | +$(CONFIGURES): | |
42 | + echo Generating $@ using autoconf | |
43 | cd $(@D); $(AUTOCONF) | |
44 | ||
45 | CONFIG_STATUS_DEPS := \ |