diff options
Diffstat (limited to 'config.profiles/symbian/qtconfig.flm')
| -rw-r--r-- | config.profiles/symbian/qtconfig.flm | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/config.profiles/symbian/qtconfig.flm b/config.profiles/symbian/qtconfig.flm index 94f732a..9075164 100644 --- a/config.profiles/symbian/qtconfig.flm +++ b/config.profiles/symbian/qtconfig.flm @@ -60,31 +60,25 @@ $(SOURCEDIR)/qmake$(DOTEXE): $(EXTENSION_ROOT)/$(QT_ROOT)/$(CONFIGURE_APP) $(call endrule,qtconf) $(call startrule,headerexport) \ cd $(EXTENSION_ROOT)/$(QT_ROOT)/config.profiles/symbian && \ - perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/ + perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/ -what $(SOURCEDIR)/qtconfig_what.log $(call endrule,headerexport) $(call startrule,mkspecexport) \ $(GNUCP) -R $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs $(MKSPECDIR) + $(GNUFIND) $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs -type f | \ + $(GNUSED) 's!$(EXTENSION_ROOT)/$(QT_ROOT)/!$(MKSPECDIR)/!' >> $(SOURCEDIR)/qtconfig_what.log \ $(call endrule,mkspecexport) FINAL WHAT:: $(SOURCEDIR)/qmake$(DOTEXE) $(call startrawoutput) \ echo "$(call whatLogOpen)"; \ - cd $(EXTENSION_ROOT)/$(QT_ROOT)/config.profiles/symbian && \ - perl headerexport -base-dir $(EXTENSION_ROOT)/$(QT_ROOT) -outdir $(EPOCROOT)/epoc32/include/ -what | \ + $(GNUCAT) $(SOURCEDIR)/qtconfig_what.log | \ (read -r LINE; \ while [ $$$$? -eq 0 ]; do \ echo "$(call whatLogItem,,$$$$LINE)"; \ read -r LINE; \ done; \ ); \ - $(GNUFIND) $(EXTENSION_ROOT)/$(QT_ROOT)/mkspecs -type f | \ - (read -r LINE; \ - while [ $$$$? -eq 0 ]; do \ - echo "$(call whatLogItem,,$$$$LINE)" | $(GNUSED) 's#$(EXTENSION_ROOT)/$(QT_ROOT)#$(MKSPECDIR)#'; \ - read -r LINE; \ - done; \ - ); \ - echo "$(call whatLogClose)"; \ + echo "$(call whatLogClose)" \ $(call endrawoutput) endef @@ -100,10 +94,11 @@ else EXPORT:: $(TARGET_TOOLS) endif $(eval $(call QtConfiguration)) -$(eval $(call whatmacro,$(TARGET_TOOLS))) ifeq ($(OSTYPE),unix) +$(eval $(call whatmacro,$(QT_TOOLS) $(TARGET_TOOLS))) $(eval $(call GenerateStandardCleanTarget,$(QT_TOOLS) $(TARGET_TOOLS) $(SOURCE_TOOLS),$(TARGETDIR))) else +$(eval $(call whatmacro,$(TARGET_TOOLS))) $(eval $(call GenerateStandardCleanTarget,$(TARGET_TOOLS) $(SOURCE_TOOLS),$(TARGETDIR))) endif endif |