removed ASCOFFICEUTILSLIB, added targets for libascdocumentcore

Makefile

@@ -12,7 +12,6 @@ RTFFORMATLIB := $(LIBDIR)/libRtfFormatLib.a
 TXTXMLFORMATLIB := $(LIBDIR)/libTxtXmlFormatLib.a
 PDFWRITER := $(LIBDIR)/libPdfWriter.so
 ASCOFFICEDOCXFILE2LIB := $(LIBDIR)/libASCOfficeDocxFile2Lib.a
-ASCOFFICEUTILSLIB := $(LIBDIR)/libASCOfficeUtilsLib.a
 PPTXFORMATLIB := $(LIBDIR)/libPPTXFormatLib.a
 DOCXFORMATLIB := $(LIBDIR)/libDocxFormatLib.a
 OFFICEUTILS := $(LIBDIR)/libOfficeUtils.a
@@ -24,6 +23,7 @@ DJVUFILE := $(LIBDIR)/libDjVuFile.so
 XPSFILE := $(LIBDIR)/libXpsFile.so
 HTMLFILE := $(LIBDIR)/libHtmlFile.so
 UNICODECONVERTER := $(LIBDIR)/libUnicodeConverter.so
+ASCDOCUMENTSCORE := $(LIBDIR)/libascdocumentscore.so
 
 #TARGETS += $(ALLFONTSGEN)
 TARGETS += $(X2T)
@@ -37,7 +37,6 @@ TARGETS += $(RTFFORMATLIB)
 TARGETS += $(TXTXMLFORMATLIB)
 TARGETS += $(PDFWRITER)
 TARGETS += $(ASCOFFICEDOCXFILE2LIB)
-TARGETS += $(ASCOFFICEUTILSLIB)
 TARGETS += $(PPTXFORMATLIB)
 TARGETS += $(DOCXFORMATLIB)
 TARGETS += $(OFFICEUTILS)
@@ -49,6 +48,7 @@ TARGETS += $(DJVUFILE)
 TARGETS += $(XPSFILE)
 TARGETS += $(HTMLFILE)
 TARGETS += $(UNICODECONVERTER)
+TARGETS += $(ASCDOCUMENTSCORE)
 
 X2T_PRO := $(abspath X2tConverter/build/Qt/X2tSLN.pro)
 HTMLFILEINTERNAL_PRO := $(abspath HtmlFile/Internal/Internal.pro)
@@ -62,7 +62,6 @@ RTFFORMATLIB_PRO := $(abspath ASCOfficeRtfFile/RtfFormatLib/Linux/RtfFormatLib.p
 TXTXMLFORMATLIB_PRO := $(abspath ASCOfficeTxtFile/TxtXmlFormatLib/Linux/TxtXmlFormatLib.pro)
 PDFWRITER_PRO := $(abspath PdfWriter/PdfWriter.pro)
 ASCOFFICEDOCXFILE2LIB_PRO := $(abspath ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro)
-ASCOFFICEUTILSLIB_PRO := $(abspath ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro)
 PPTXFORMATLIB_PRO := $(abspath ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro)
 DOCXFORMATLIB_PRO := $(abspath Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro)
 OFFICEUTILS_PRO := $(abspath OfficeUtils/OfficeUtils.pro)
@@ -74,6 +73,7 @@ DJVUFILE_PRO := $(abspath DjVuFile/DjVuFile.pro)
 XPSFILE_PRO := $(abspath XpsFile/XpsFile.pro)
 HTMLFILE_PRO := $(abspath HtmlFile/HtmlFile.pro)
 UNICODECONVERTER_PRO := $(abspath UnicodeConverter/UnicodeConverter.pro)
+ASCDOCUMENTSCORE_PRO := $(abspath DesktopEditor/ChromiumBasedEditors2/lib/AscDocumentsCore_linux.pro)
 
 # PROS += $(basename $(X2T_PRO)).build
 # PROS += ALLFONTSGEN_PRO
@@ -110,7 +110,6 @@ QT_PROJ += RTFFORMATLIB
 QT_PROJ += TXTXMLFORMATLIB
 QT_PROJ += PDFWRITER
 QT_PROJ += ASCOFFICEDOCXFILE2LIB
-QT_PROJ += ASCOFFICEUTILSLIB
 QT_PROJ += PPTXFORMATLIB
 QT_PROJ += DOCXFORMATLIB
 QT_PROJ += OFFICEUTILS
@@ -122,6 +121,7 @@ QT_PROJ += DJVUFILE
 QT_PROJ += XPSFILE
 QT_PROJ += HTMLFILE
 QT_PROJ += UNICODECONVERTER
+QT_PROJ += ASCDOCUMENTSCORE
 
 # X2T_DEP += $(XLSFORMATLIB)
 # X2T_DEP += $(ODFFILEWRITERLIB)
@@ -145,11 +145,12 @@ QT_PROJ += UNICODECONVERTER
 # X2T_DEP += $(UNICODECONVERTER)
 
 HTMLFILEINTERNAL_DEP += $(GRAPHICS)
+HTMLFILEINTERNAL_DEP += $(OFFICEUTILS)
 
 XPSFILE_DEP += $(PDFWRITER)
 
 ALLFONTSGEN_DEP += $(GRAPHICS)
-ALLFONTSGEN_DEP += $(ASCOFFICEUTILSLIB)
+ALLFONTSGEN_DEP += $(OFFICEUTILS)
 
 HTMLFILE_DEP += $(UNICODECONVERTER)
 
@@ -159,6 +160,13 @@ XLSFORMATLIB_DEP += $(UNICODECONVERTER)
 
 DJVUFILE_DEP += $(PDFWRITER)
 
+ASCDOCUMENTSCORE_DEP += $(GRAPHICS)
+ASCDOCUMENTSCORE_DEP += $(OFFICEUTILS)
+ASCDOCUMENTSCORE_DEP += $(PDFWRITER)
+ASCDOCUMENTSCORE_DEP += $(PDFREADER)
+ASCDOCUMENTSCORE_DEP += $(DJVUFILE)
+ASCDOCUMENTSCORE_DEP += $(XPSFILE)
+
 #Template for next statment:
 #FOO_MAKE := $(basename $(FOO_PRO)).build/Makefile
 #$(FOO): $(FOO_MAKE)