Commit 2b62ce9c authored by Alexey.Golubev's avatar Alexey.Golubev Committed by Alexander Trofimov

debug

parent ba118951
...@@ -25,9 +25,9 @@ XPSFILE := $(LIBDIR)/libXpsFile.so ...@@ -25,9 +25,9 @@ XPSFILE := $(LIBDIR)/libXpsFile.so
HTMLFILE := $(LIBDIR)/libHtmlFile.so HTMLFILE := $(LIBDIR)/libHtmlFile.so
UNICODECONVERTER := $(LIBDIR)/libUnicodeConverter.so UNICODECONVERTER := $(LIBDIR)/libUnicodeConverter.so
TARGETS += $(ALLFONTSGEN) #TARGETS += $(ALLFONTSGEN)
TARGETS += $(X2T) TARGETS += $(X2T)
TARGETS += $(HTMLFILEINTERNAL) #TARGETS += $(HTMLFILEINTERNAL)
TARGETS += $(XLSFORMATLIB) TARGETS += $(XLSFORMATLIB)
TARGETS += $(ODFFILEWRITERLIB) TARGETS += $(ODFFILEWRITERLIB)
TARGETS += $(ODFFILEREADERLIB) TARGETS += $(ODFFILEREADERLIB)
...@@ -123,26 +123,26 @@ QT_PROJ += XPSFILE ...@@ -123,26 +123,26 @@ QT_PROJ += XPSFILE
QT_PROJ += HTMLFILE QT_PROJ += HTMLFILE
QT_PROJ += UNICODECONVERTER QT_PROJ += UNICODECONVERTER
X2T_DEP += $(XLSFORMATLIB) # X2T_DEP += $(XLSFORMATLIB)
X2T_DEP += $(ODFFILEWRITERLIB) # X2T_DEP += $(ODFFILEWRITERLIB)
X2T_DEP += $(ODFFILEREADERLIB) # X2T_DEP += $(ODFFILEREADERLIB)
X2T_DEP += $(DOCFORMATLIB) # X2T_DEP += $(DOCFORMATLIB)
X2T_DEP += $(PPTFORMATLIB) # X2T_DEP += $(PPTFORMATLIB)
X2T_DEP += $(RTFFORMATLIB) # X2T_DEP += $(RTFFORMATLIB)
X2T_DEP += $(TXTXMLFORMATLIB) # X2T_DEP += $(TXTXMLFORMATLIB)
X2T_DEP += $(PDFWRITER) # X2T_DEP += $(PDFWRITER)
X2T_DEP += $(ASCOFFICEDOCXFILE2LIB) # X2T_DEP += $(ASCOFFICEDOCXFILE2LIB)
X2T_DEP += $(PPTXFORMATLIB) # X2T_DEP += $(PPTXFORMATLIB)
X2T_DEP += $(DOCXFORMATLIB) # X2T_DEP += $(DOCXFORMATLIB)
X2T_DEP += $(OFFICEUTILS) # X2T_DEP += $(OFFICEUTILS)
X2T_DEP += $(GRAPHICS) # X2T_DEP += $(GRAPHICS)
X2T_DEP += $(DOCTRENDERER) # X2T_DEP += $(DOCTRENDERER)
X2T_DEP += $(HTMLRENDERER) # X2T_DEP += $(HTMLRENDERER)
X2T_DEP += $(PDFREADER) # X2T_DEP += $(PDFREADER)
X2T_DEP += $(DJVUFILE) # X2T_DEP += $(DJVUFILE)
X2T_DEP += $(XPSFILE) # X2T_DEP += $(XPSFILE)
X2T_DEP += $(HTMLFILE) # X2T_DEP += $(HTMLFILE)
X2T_DEP += $(UNICODECONVERTER) # X2T_DEP += $(UNICODECONVERTER)
HTMLFILEINTERNAL_DEP += $(GRAPHICS) HTMLFILEINTERNAL_DEP += $(GRAPHICS)
...@@ -168,14 +168,14 @@ define build_proj_tmpl ...@@ -168,14 +168,14 @@ define build_proj_tmpl
PROS += $$(basename $$(value $(1)_PRO)).build PROS += $$(basename $$(value $(1)_PRO)).build
$(1)_MAKE := $$(basename $$(value $(1)_PRO)).build/Makefile $(1)_MAKE := $$(basename $$(value $(1)_PRO)).build/Makefile
$$(value $(1)): $$(value $(1)_MAKE) $$(value $(1)): $$(value $(1)_MAKE)
cd $$(dir $$(value $(1)_MAKE)) && make cd $$(dir $$(value $(1)_MAKE)) && make -j
endef endef
.PHONY : all bin clean .PHONY : all bin lib clean
all: lib bin all: lib bin
bin: $(X2T) $(HTMLFILEINTERNAL) $(ALLFONTSGEN) bin: $(X2T) #$(HTMLFILEINTERNAL) $(ALLFONTSGEN)
lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER) lib: $(PDFWRITER) $(DOCTRENDERER) $(HTMLRENDERER) $(PDFREADER) $(DJVUFILE) $(XPSFILE) $(HTMLFILE) $(UNICODECONVERTER)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment