← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/lightning-extension/oneiric-security

« back to all changes in this revision

Viewing changes to mozilla/build/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Chris Coulson
  • Date: 2012-04-20 13:46:11 UTC
  • mfrom: (1.2.1)
  • mto: (1.3.1)
  • mto: This revision was merged to the branch mainline in revision 19.
  • Revision ID: package-import@ubuntu.com-20120420134611-i0dkosnbmihrd0lr
Tags: upstream-1.4+build1
Import upstream version 1.4+build1

Show diffs side-by-side

added added

removed removed

Lines of Context:
mozilla/build/Makefile.in
62
62
          mobile/sutagent/android/watcher \
63
63
          mobile/sutagent/android/ffxcp \
64
64
          mobile/sutagent/android/fencp \
 
65
          mobile/robocop \
65
66
          $(NULL)
66
67
endif
67
68
endif
69
70
ifdef MOZ_APP_BASENAME
70
71
DIST_FILES = application.ini
71
72
 
 
73
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 
74
DIST_FILES += update-settings.ini
 
75
endif
 
76
 
72
77
ifdef LIBXUL_SDK
73
78
GRE_MILESTONE = $(shell $(PYTHON) $(topsrcdir)/config/printconfigsetting.py $(LIBXUL_DIST)/bin/platform.ini Build Milestone)
74
79
APP_INI_DEPS = $(LIBXUL_DIST)/bin/platform.ini
100
105
  -DMOZ_APP_BASENAME="$(MOZ_APP_BASENAME)" \
101
106
  -DMOZ_APP_VENDOR="$(MOZ_APP_VENDOR)" \
102
107
  -DMOZ_APP_ID="$(MOZ_APP_ID)" \
 
108
  -DMAR_CHANNEL_ID="$(MAR_CHANNEL_ID)" \
 
109
  -DACCEPTED_MAR_CHANNEL_IDS="$(ACCEPTED_MAR_CHANNEL_IDS)" \
103
110
  $(NULL)
104
111
 
105
112
ifdef MOZ_APP_PROFILE
154
161
        chmod +x $@
155
162
GARBAGE += leaktest.py
156
163
 
 
164
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 
165
update-settings.ini: update-settings.ini.in $(APP_INI_DEPS)
 
166
        $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
 
167
GARBAGE += update-settings.ini
 
168
endif
 
169
 
157
170
ifdef MOZ_APP_BASENAME
158
171
application.ini: application.ini.in $(APP_INI_DEPS)
159
172
        $(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@