Bug 767839 - Avoid preprocessing application.ini.in twice. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Tue, 07 Aug 2012 16:53:17 +0200
changeset 104798 8e4d94efad3ef53258b82f58063f32c1101eaab3
parent 104797 90b41051251cc224ea9b3f557955b4e817f7e1ad
child 104799 905bbf61dbe651cf77bfdf077c15a1a8216216d7
push idunknown
push userunknown
push dateunknown
reviewerskhuey
bugs767839
milestone17.0a1
Bug 767839 - Avoid preprocessing application.ini.in twice. r=khuey
build/Makefile.in
build/application.ini
build/application.ini.in
--- a/build/Makefile.in
+++ b/build/Makefile.in
@@ -31,17 +31,17 @@ TEST_DIRS += mobile/sutagent/android \
           mobile/sutagent/android/watcher \
           mobile/sutagent/android/ffxcp \
           mobile/sutagent/android/fencp \
           mobile/robocop \
           $(NULL)
 endif
 
 ifdef MOZ_APP_BASENAME
-DIST_FILES = application.ini
+DIST_FILES = $(srcdir)/application.ini
 
 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
 ifdef MOZ_UPDATER
 DIST_FILES += update-settings.ini
 endif
 endif
 
 ifdef LIBXUL_SDK
@@ -127,22 +127,18 @@ GARBAGE_DIRS += $(_LEAKTEST_DIR)
 		$(NULL)
 
 leaktest.py: leaktest.py.in
 	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $^ > $@
 	chmod +x $@
 GARBAGE += leaktest.py
 
 ifdef MOZ_APP_BASENAME
-application.ini: application.ini.in $(APP_INI_DEPS)
-	$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
-GARBAGE += application.ini
-
 ifdef MOZ_APP_STATIC_INI
-application.ini.h: appini_header.py application.ini 
+application.ini.h: appini_header.py $(FINAL_TARGET)/application.ini
 	$(PYTHON) $^ > $@
 export:: application.ini.h
 GARBAGE += application.ini.h
 endif
 endif
 
 libs:: $(_LEAKTEST_FILES)
 	$(INSTALL) $^ $(_LEAKTEST_DIR)
rename from build/application.ini.in
rename to build/application.ini