Sat, 03 Jan 2015 20:18:00 +0100
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 | ## ****************************************************************************** |
michael@0 | 2 | ## * |
michael@0 | 3 | ## * Copyright (C) 1999-2012, International Business Machines |
michael@0 | 4 | ## * Corporation and others. All Rights Reserved. |
michael@0 | 5 | ## * |
michael@0 | 6 | ## ******************************************************************************* |
michael@0 | 7 | ## Makefile.in for ICU - uconv |
michael@0 | 8 | ## Steven R. Loomis |
michael@0 | 9 | |
michael@0 | 10 | ## Set the following to dll or static or common.. |
michael@0 | 11 | UCONVMSG_MODE=static |
michael@0 | 12 | ############################################################## |
michael@0 | 13 | |
michael@0 | 14 | srcdir=@srcdir@ |
michael@0 | 15 | top_srcdir=@top_srcdir@ |
michael@0 | 16 | |
michael@0 | 17 | top_builddir = ../.. |
michael@0 | 18 | subdir = extra/uconv |
michael@0 | 19 | |
michael@0 | 20 | include $(top_builddir)/icudefs.mk |
michael@0 | 21 | |
michael@0 | 22 | MSGNAME=uconvmsg |
michael@0 | 23 | |
michael@0 | 24 | # RESSRC comes from resfiles.mk |
michael@0 | 25 | FILESEPCHAR=/ |
michael@0 | 26 | include $(srcdir)/resfiles.mk |
michael@0 | 27 | |
michael@0 | 28 | RESDIR=$(MSGNAME) |
michael@0 | 29 | RESFILES=$(RESSRC:$(RESOURCESDIR)$(FILESEPCHAR)%.txt=$(RESDIR)/%.res) |
michael@0 | 30 | |
michael@0 | 31 | ## |
michael@0 | 32 | |
michael@0 | 33 | TARGET_STUB_NAME = uconv |
michael@0 | 34 | |
michael@0 | 35 | SECTION = 1 |
michael@0 | 36 | |
michael@0 | 37 | ALL_MAN_FILES = $(TARGET_STUB_NAME).$(SECTION) |
michael@0 | 38 | |
michael@0 | 39 | ## Extra files to remove for 'make clean' |
michael@0 | 40 | CLEANFILES = *~ $(DEPS) $(ALL_MAN_FILES) |
michael@0 | 41 | |
michael@0 | 42 | ## Target information |
michael@0 | 43 | TARGET = $(BINDIR)/$(TARGET_STUB_NAME)$(EXEEXT) |
michael@0 | 44 | |
michael@0 | 45 | CPPFLAGS += -I$(top_srcdir)/common -I$(top_srcdir)/i18n -I$(srcdir)/../toolutil |
michael@0 | 46 | LIBS = $(LIBICUI18N) $(LIBICUUC) $(DEFAULT_LIBS) $(LIB_M) |
michael@0 | 47 | |
michael@0 | 48 | ifeq ($(PKGDATA_OPTS),) |
michael@0 | 49 | PKGDATA_OPTS = -O pkgdata.inc |
michael@0 | 50 | endif |
michael@0 | 51 | |
michael@0 | 52 | ## generic settings for data - common. |
michael@0 | 53 | PKGMODE=common |
michael@0 | 54 | INSTALLTO=$(DESTDIR)$(ICUDATA_DIR) |
michael@0 | 55 | UCONVMSG_LIB=package-resfiles |
michael@0 | 56 | |
michael@0 | 57 | ## Static mode |
michael@0 | 58 | ifeq ($(UCONVMSG_MODE),static) |
michael@0 | 59 | DEFS += -DUCONVMSG_LINK=$(MSGNAME) |
michael@0 | 60 | UCONVMSG_LIB = $(RESDIR)/$(LIBPREFIX)$(STATIC_PREFIX_WHEN_USED)$(MSGNAME).$(A) |
michael@0 | 61 | LIBS += $(UCONVMSG_LIB) |
michael@0 | 62 | PKGMODE=static |
michael@0 | 63 | INSTALLTO=$(libdir) |
michael@0 | 64 | endif |
michael@0 | 65 | |
michael@0 | 66 | ## DLL mode |
michael@0 | 67 | ifeq ($(UCONVMSG_MODE),dll) |
michael@0 | 68 | DEFS += -DUCONVMSG_LINK=$(MSGNAME) |
michael@0 | 69 | LIBS += -L$(RESDIR) -l$(MSGNAME) |
michael@0 | 70 | PKGMODE=dll |
michael@0 | 71 | INSTALLTO=$(libdir) |
michael@0 | 72 | endif |
michael@0 | 73 | |
michael@0 | 74 | OBJECTS = uconv.o uwmsg.o |
michael@0 | 75 | |
michael@0 | 76 | DEPS = $(OBJECTS:.o=.d) |
michael@0 | 77 | |
michael@0 | 78 | ## List of phony targets |
michael@0 | 79 | .PHONY : all all-local install install-local clean clean-local \ |
michael@0 | 80 | distclean resclean distclean-local dist dist-local \ |
michael@0 | 81 | check check-local build-dir package-resfiles install-resfiles install-man |
michael@0 | 82 | |
michael@0 | 83 | ## Clear suffix list |
michael@0 | 84 | .SUFFIXES : |
michael@0 | 85 | |
michael@0 | 86 | ## List of standard targets |
michael@0 | 87 | all: all-local |
michael@0 | 88 | |
michael@0 | 89 | install: install-local |
michael@0 | 90 | clean: clean-local |
michael@0 | 91 | distclean : distclean-local |
michael@0 | 92 | dist: dist-local |
michael@0 | 93 | check: check-local |
michael@0 | 94 | |
michael@0 | 95 | all-local: build-dir $(TARGET) $(ALL_MAN_FILES) |
michael@0 | 96 | |
michael@0 | 97 | install-local: all-local install-target install-resfiles install-man |
michael@0 | 98 | |
michael@0 | 99 | install-target: all-local |
michael@0 | 100 | $(MKINSTALLDIRS) $(DESTDIR)$(bindir) |
michael@0 | 101 | $(INSTALL) $(TARGET) $(DESTDIR)$(bindir) |
michael@0 | 102 | |
michael@0 | 103 | dist-local: |
michael@0 | 104 | |
michael@0 | 105 | clean-local: resclean |
michael@0 | 106 | test -z "$(CLEANFILES)" || $(RMV) $(CLEANFILES) $(RESFILES) |
michael@0 | 107 | $(RMV) $(OBJECTS) $(TARGET) |
michael@0 | 108 | |
michael@0 | 109 | resclean: |
michael@0 | 110 | @#-$(INVOKE) $(TOOLBINDIR)/pkgdata --clean -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst |
michael@0 | 111 | $(RMV) pkgdata.inc $(RESDIR) |
michael@0 | 112 | |
michael@0 | 113 | distclean-local: clean-local |
michael@0 | 114 | $(RMV) Makefile $(DEPS) |
michael@0 | 115 | |
michael@0 | 116 | check-local: $(TARGET) |
michael@0 | 117 | ifneq (,$(filter $(PKGDATA_MODE),files common)) |
michael@0 | 118 | @echo "Currently, pkgdata is in \"$(PKGDATA_MODE)\" mode." |
michael@0 | 119 | @echo "To test uconv, run this manually after installing ICU:" |
michael@0 | 120 | @echo "\"./$(TARGET) -f ibm-37 $(srcdir)/samples/ibm-37-test.txt\"" |
michael@0 | 121 | else |
michael@0 | 122 | $(INVOKE) ./$(TARGET) -f ibm-37 $(srcdir)/samples/ibm-37-test.txt |
michael@0 | 123 | endif |
michael@0 | 124 | |
michael@0 | 125 | Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status |
michael@0 | 126 | cd $(top_builddir) \ |
michael@0 | 127 | && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status |
michael@0 | 128 | |
michael@0 | 129 | pkgdata.inc: pkgdataMakefile |
michael@0 | 130 | $(MAKE) -f pkgdataMakefile |
michael@0 | 131 | |
michael@0 | 132 | build-dir: |
michael@0 | 133 | @$(MKINSTALLDIRS) $(RESDIR) |
michael@0 | 134 | |
michael@0 | 135 | pkgdataMakefile: |
michael@0 | 136 | cd $(top_builddir) \ |
michael@0 | 137 | && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status |
michael@0 | 138 | |
michael@0 | 139 | $(TARGET_STUB_NAME).$(SECTION): $(srcdir)/$(TARGET_STUB_NAME).$(SECTION).in pkgdata.inc |
michael@0 | 140 | cd $(top_builddir) \ |
michael@0 | 141 | && CONFIG_FILES=$(subdir)/$(TARGET_STUB_NAME).$(SECTION) CONFIG_HEADERS= $(SHELL) ./config.status |
michael@0 | 142 | |
michael@0 | 143 | $(TARGET) : $(OBJECTS) $(UCONVMSG_LIB) |
michael@0 | 144 | $(LINK.cc) $(OUTOPT)$@ $(OBJECTS) $(LIBS) |
michael@0 | 145 | $(POST_BUILD_STEP) |
michael@0 | 146 | |
michael@0 | 147 | # The | is an order-only prerequisite. This helps when the -j option is used, |
michael@0 | 148 | # and we don't want the files to be built before the directories are built. |
michael@0 | 149 | ifneq ($(filter order-only,$(.FEATURES)),) |
michael@0 | 150 | $(RESFILES) $(RESDIR)/$(RESDIR).lst: | build-dir |
michael@0 | 151 | endif |
michael@0 | 152 | |
michael@0 | 153 | $(UCONVMSG_LIB): $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc |
michael@0 | 154 | $(INVOKE) $(PKGDATA_INVOKE_OPTS) $(TOOLBINDIR)/pkgdata -p $(MSGNAME) $(PKGDATA_OPTS) -m $(PKGMODE) -s $(RESDIR) -d $(RESDIR) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst |
michael@0 | 155 | |
michael@0 | 156 | $(RESDIR)/$(RESDIR).lst: Makefile $(srcdir)/resfiles.mk |
michael@0 | 157 | @-$(RMV) $@ |
michael@0 | 158 | @for file in $(RESFILES:$(RESDIR)/%.res=%.res); do \ |
michael@0 | 159 | echo $$file >> $@; \ |
michael@0 | 160 | done; |
michael@0 | 161 | |
michael@0 | 162 | # no install for static mode |
michael@0 | 163 | ifneq ($(UCONVMSG_MODE),static) |
michael@0 | 164 | install-resfiles: $(RESFILES) $(RESDIR)/$(RESDIR).lst pkgdata.inc |
michael@0 | 165 | $(MKINSTALLDIRS) $(DESTDIR)$(ICUDATA_DIR) |
michael@0 | 166 | $(INVOKE) $(TOOLBINDIR)/pkgdata -p $(RESDIR) -O pkgdata.inc -m $(PKGMODE) -d $(RESDIR) -I $(INSTALLTO) -T $(RESDIR) $(RESDIR)/$(RESDIR).lst |
michael@0 | 167 | else |
michael@0 | 168 | install-resfiles: |
michael@0 | 169 | endif |
michael@0 | 170 | |
michael@0 | 171 | $(MSGNAME)/%.res: $(srcdir)/$(RESOURCESDIR)/%.txt |
michael@0 | 172 | $(INVOKE) $(TOOLBINDIR)/genrb -e UTF-8 -s $(^D) -d $(@D) $(^F) |
michael@0 | 173 | |
michael@0 | 174 | install-man: $(ALL_MAN_FILES) |
michael@0 | 175 | $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) |
michael@0 | 176 | $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) |
michael@0 | 177 | |
michael@0 | 178 | |
michael@0 | 179 |