toolkit/mozapps/update/updater/Makefile.in@129ffea94266 (annotated)
toolkit/mozapps/update/updater/Makefile.in
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rw-r--r--
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | # vim:set ts=8 sw=8 sts=8 noet: |
| michael@0 | 2 | # This Source Code Form is subject to the terms of the Mozilla Public |
| michael@0 | 3 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
| michael@0 | 4 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
| michael@0 | 5 | |
| michael@0 | 6 | # Don't link the updater against libmozglue. See bug 687139 |
| michael@0 | 7 | MOZ_GLUE_LDFLAGS = |
| michael@0 | 8 | MOZ_GLUE_PROGRAM_LDFLAGS = |
| michael@0 | 9 | |
| michael@0 | 10 | ifeq ($(OS_ARCH),WINNT) |
| michael@0 | 11 | LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone) |
| michael@0 | 12 | else |
| michael@0 | 13 | LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common) |
| michael@0 | 14 | endif |
| michael@0 | 15 | |
| michael@0 | 16 | LIBS += \ |
| michael@0 | 17 | $(call EXPAND_LIBNAME_PATH,mar,$(DEPTH)/modules/libmar/src) \ |
| michael@0 | 18 | $(MOZ_BZ2_LIBS) \ |
| michael@0 | 19 | $(NULL) |
| michael@0 | 20 | |
| michael@0 | 21 | ifeq ($(OS_ARCH),WINNT) |
| michael@0 | 22 | LIBS += $(call EXPAND_LIBNAME_PATH,verifymar,$(DEPTH)/modules/libmar/verify) |
| michael@0 | 23 | OS_LIBS += $(call EXPAND_LIBNAME,comctl32 ws2_32 shell32 shlwapi) |
| michael@0 | 24 | endif |
| michael@0 | 25 | |
| michael@0 | 26 | ifdef MOZ_WIDGET_GTK |
| michael@0 | 27 | OS_CXXFLAGS += $(TK_CFLAGS) |
| michael@0 | 28 | OS_LIBS += $(TK_LIBS) |
| michael@0 | 29 | endif |
| michael@0 | 30 | |
| michael@0 | 31 | ifeq (gonk,$(MOZ_WIDGET_TOOLKIT)) #{ |
| michael@0 | 32 | OS_LIBS += -lcutils -lsysutils |
| michael@0 | 33 | # clear out all the --wrap flags and remove dependency on mozglue for Gonk |
| michael@0 | 34 | WRAP_LDFLAGS := |
| michael@0 | 35 | endif #} |
| michael@0 | 36 | |
| michael@0 | 37 | ifndef MOZ_WINCONSOLE |
| michael@0 | 38 | ifdef MOZ_DEBUG |
| michael@0 | 39 | MOZ_WINCONSOLE = 1 |
| michael@0 | 40 | else |
| michael@0 | 41 | MOZ_WINCONSOLE = 0 |
| michael@0 | 42 | endif |
| michael@0 | 43 | endif |
| michael@0 | 44 | |
| michael@0 | 45 | include $(topsrcdir)/config/rules.mk |
| michael@0 | 46 | |
| michael@0 | 47 | ifdef MOZ_WIDGET_GTK |
| michael@0 | 48 | libs:: updater.png |
| michael@0 | 49 | $(NSINSTALL) -D $(DIST)/bin/icons |
| michael@0 | 50 | $(INSTALL) $(IFLAGS1) $^ $(DIST)/bin/icons |
| michael@0 | 51 | endif |
| michael@0 | 52 | |
| michael@0 | 53 | ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) |
| michael@0 | 54 | libs:: |
| michael@0 | 55 | $(NSINSTALL) -D $(DIST)/bin/updater.app |
| michael@0 | 56 | rsync -a -C --exclude '*.in' $(srcdir)/macbuild/Contents $(DIST)/bin/updater.app |
| michael@0 | 57 | sed -e 's/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/' $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \ |
| michael@0 | 58 | iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/updater.app/Contents/Resources/English.lproj/InfoPlist.strings |
| michael@0 | 59 | $(NSINSTALL) -D $(DIST)/bin/updater.app/Contents/MacOS |
| michael@0 | 60 | $(NSINSTALL) $(DIST)/bin/updater $(DIST)/bin/updater.app/Contents/MacOS |
| michael@0 | 61 | rm -f $(DIST)/bin/updater |
| michael@0 | 62 | endif |
| michael@0 | 63 | |
| michael@0 | 64 | ifeq ($(OS_ARCH),WINNT) |
| michael@0 | 65 | EXTRA_LIBS += $(call EXPAND_LIBNAME,crypt32) |
| michael@0 | 66 | EXTRA_LIBS += $(call EXPAND_LIBNAME,advapi32) |
| michael@0 | 67 | endif |
| michael@0 | 68 | |
| michael@0 | 69 | CXXFLAGS += $(MOZ_BZ2_CFLAGS) |
