build libmwaw as shared lib

Change-Id: I3c970cf3d15c2bd0072dccdf34bc3f0dae53c0b8

RepositoryExternal.mk

@@ -2035,18 +2035,45 @@ endef
 
 else # !SYSTEM_MWAW
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
+	mwaw \
+))
+
+define gb_LinkTarget__use_mwaw
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
+	$$(INCLUDE) \
+)
+
+$(call gb_LinkTarget_use_libraries,$(1),\
+	mwaw \
+)
+
+endef
+
+else # !MSC
+
+$(eval $(call gb_Helper_register_packages_for_install,ooo,\
+	libmwaw \
+))
+
 define gb_LinkTarget__use_mwaw
+$(call gb_LinkTarget_use_package,$(1),libmwaw)
+
 $(call gb_LinkTarget_set_include,$(1),\
 	-I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
 	$$(INCLUDE) \
 )
 $(call gb_LinkTarget_add_libs,$(1),\
-	$(call gb_UnpackedTarball_get_dir,libmwaw)/src/lib/.libs/libmwaw-0.3$(gb_StaticLibrary_PLAINEXT) \
+	-L$(call gb_UnpackedTarball_get_dir,libmwaw)/src/lib/.libs -lmwaw-0.3 \
 )
-$(call gb_LinkTarget_use_external_project,$(1),libmwaw)
 
 endef
 
+endif # MSC
+
 endif # SYSTEM_MWAW
 
 

external/libmwaw/ExternalPackage_libmwaw.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,libmwaw,libmwaw))
+
+$(eval $(call gb_ExternalPackage_use_external_project,libmwaw,libmwaw))
+
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.3.dylib,src/lib/.libs/libmwaw-0.3.dylib))
+else ifeq ($(OS),WNT)
+$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.dll,src/lib/.libs/libmwaw-0.3.dll))
+else ifeq ($(filter IOS ANDROID,$(OS)),)
+$(eval $(call gb_ExternalPackage_add_file,libmwaw,$(LIBO_LIB_FOLDER)/libmwaw-0.3.so.3,src/lib/.libs/libmwaw-0.3.so.3.0.1))
+endif
+
+# vim: set noet sw=4 ts=4:

external/libmwaw/ExternalProject_libmwaw.mk

@@ -25,8 +25,11 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
 		export PKG_CONFIG="" \
 		&& ./configure \
 			--with-pic \
-			--enable-static \
-			--disable-shared \
+			$(if $(DISABLE_DYNLOADING), \
+				--enable-static --disable-shared \
+			, \
+				--enable-shared --disable-static \
+			) \
 			--without-docs \
 			--disable-tools \
 			--disable-zip \
@@ -35,6 +38,7 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) :
 			--disable-werror \
 			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
 		&& (cd $(EXTERNAL_WORKDIR)/src/lib && \
 			$(MAKE)) \
 	)

external/libmwaw/Library_mwaw.mk

+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_Library_Library,mwaw))
+
+$(eval $(call gb_Library_use_unpacked,mwaw,libmwaw))
+
+$(eval $(call gb_Library_use_externals,mwaw,\
+    boost_headers \
+	revenge \
+))
+
+$(eval $(call gb_Library_set_warnings_not_errors,mwaw))
+
+$(eval $(call gb_Library_set_include,mwaw,\
+    -I$(call gb_UnpackedTarball_get_dir,libmwaw)/inc \
+    $$(INCLUDE) \
+))
+
+$(eval $(call gb_Library_add_defs,mwaw,\
+	-DBOOST_ALL_NO_LIB \
+	-DBUILD_MWAW \
+	-DNDEBUG \
+	-D_WINDLL \
+))
+
+$(eval $(call gb_Library_add_generated_exception_objects,mwaw,\
+	UnpackedTarball/libmwaw/src/lib/ActaParser \
+	UnpackedTarball/libmwaw/src/lib/ActaText \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksBMParser \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksDBParser \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksDRParser \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksParser \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksSSParser \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksStructManager \
+	UnpackedTarball/libmwaw/src/lib/BeagleWksText \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksBMParser \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksDatabase \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksDbaseContent \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksDocument \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksGraph \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksParser \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksPresentation \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksSSParser \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksSpreadsheet \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksStruct \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksStyleManager \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksTable \
+	UnpackedTarball/libmwaw/src/lib/ClarisWksText \
+	UnpackedTarball/libmwaw/src/lib/DocMkrParser \
+	UnpackedTarball/libmwaw/src/lib/DocMkrText \
+	UnpackedTarball/libmwaw/src/lib/EDocParser \
+	UnpackedTarball/libmwaw/src/lib/FullWrtGraph \
+	UnpackedTarball/libmwaw/src/lib/FullWrtParser \
+	UnpackedTarball/libmwaw/src/lib/FullWrtStruct \
+	UnpackedTarball/libmwaw/src/lib/FullWrtText \
+	UnpackedTarball/libmwaw/src/lib/GreatWksBMParser \
+	UnpackedTarball/libmwaw/src/lib/GreatWksDBParser \
+	UnpackedTarball/libmwaw/src/lib/GreatWksDRParser \
+	UnpackedTarball/libmwaw/src/lib/GreatWksDocument \
+	UnpackedTarball/libmwaw/src/lib/GreatWksGraph \
+	UnpackedTarball/libmwaw/src/lib/GreatWksParser \
+	UnpackedTarball/libmwaw/src/lib/GreatWksSSParser \
+	UnpackedTarball/libmwaw/src/lib/GreatWksText \
+	UnpackedTarball/libmwaw/src/lib/HanMacWrdJGraph \
+	UnpackedTarball/libmwaw/src/lib/HanMacWrdJParser \
+	UnpackedTarball/libmwaw/src/lib/HanMacWrdJText \
+	UnpackedTarball/libmwaw/src/lib/HanMacWrdKGraph \
+	UnpackedTarball/libmwaw/src/lib/HanMacWrdKParser \
+	UnpackedTarball/libmwaw/src/lib/HanMacWrdKText \
+	UnpackedTarball/libmwaw/src/lib/LightWayTxtGraph \
+	UnpackedTarball/libmwaw/src/lib/LightWayTxtParser \
+	UnpackedTarball/libmwaw/src/lib/LightWayTxtText \
+	UnpackedTarball/libmwaw/src/lib/MWAWCell \
+	UnpackedTarball/libmwaw/src/lib/MWAWChart \
+	UnpackedTarball/libmwaw/src/lib/MWAWDebug \
+	UnpackedTarball/libmwaw/src/lib/MWAWDocument \
+	UnpackedTarball/libmwaw/src/lib/MWAWFont \
+	UnpackedTarball/libmwaw/src/lib/MWAWFontConverter \
+	UnpackedTarball/libmwaw/src/lib/MWAWFontSJISConverter \
+	UnpackedTarball/libmwaw/src/lib/MWAWGraphicDecoder \
+	UnpackedTarball/libmwaw/src/lib/MWAWGraphicEncoder \
+	UnpackedTarball/libmwaw/src/lib/MWAWGraphicListener \
+	UnpackedTarball/libmwaw/src/lib/MWAWGraphicShape \
+	UnpackedTarball/libmwaw/src/lib/MWAWGraphicStyle \
+	UnpackedTarball/libmwaw/src/lib/MWAWHeader \
+	UnpackedTarball/libmwaw/src/lib/MWAWInputStream \
+	UnpackedTarball/libmwaw/src/lib/MWAWList \
+	UnpackedTarball/libmwaw/src/lib/MWAWOLEParser \
+	UnpackedTarball/libmwaw/src/lib/MWAWPageSpan \
+	UnpackedTarball/libmwaw/src/lib/MWAWParagraph \
+	UnpackedTarball/libmwaw/src/lib/MWAWParser \
+	UnpackedTarball/libmwaw/src/lib/MWAWPictBitmap \
+	UnpackedTarball/libmwaw/src/lib/MWAWPictData \
+	UnpackedTarball/libmwaw/src/lib/MWAWPictMac \
+	UnpackedTarball/libmwaw/src/lib/MWAWPrinter \
+	UnpackedTarball/libmwaw/src/lib/MWAWPropertyHandler \
+	UnpackedTarball/libmwaw/src/lib/MWAWRSRCParser \
+	UnpackedTarball/libmwaw/src/lib/MWAWSection \
+	UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetDecoder \
+	UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetEncoder \
+	UnpackedTarball/libmwaw/src/lib/MWAWSpreadsheetListener \
+	UnpackedTarball/libmwaw/src/lib/MWAWStringStream \
+	UnpackedTarball/libmwaw/src/lib/MWAWSubDocument \
+	UnpackedTarball/libmwaw/src/lib/MWAWTable \
+	UnpackedTarball/libmwaw/src/lib/MWAWTextListener \
+	UnpackedTarball/libmwaw/src/lib/MacDocParser \
+	UnpackedTarball/libmwaw/src/lib/MacPaintParser \
+	UnpackedTarball/libmwaw/src/lib/MacWrtParser \
+	UnpackedTarball/libmwaw/src/lib/MacWrtProParser \
+	UnpackedTarball/libmwaw/src/lib/MacWrtProStructures \
+	UnpackedTarball/libmwaw/src/lib/MarinerWrtGraph \
+	UnpackedTarball/libmwaw/src/lib/MarinerWrtParser \
+	UnpackedTarball/libmwaw/src/lib/MarinerWrtText \
+	UnpackedTarball/libmwaw/src/lib/MindWrtParser \
+	UnpackedTarball/libmwaw/src/lib/MoreParser \
+	UnpackedTarball/libmwaw/src/lib/MoreText \
+	UnpackedTarball/libmwaw/src/lib/MsWks3Text \
+	UnpackedTarball/libmwaw/src/lib/MsWks4Text \
+	UnpackedTarball/libmwaw/src/lib/MsWks4Zone \
+	UnpackedTarball/libmwaw/src/lib/MsWksDBParser \
+	UnpackedTarball/libmwaw/src/lib/MsWksDRParser \
+	UnpackedTarball/libmwaw/src/lib/MsWksDocument \
+	UnpackedTarball/libmwaw/src/lib/MsWksGraph \
+	UnpackedTarball/libmwaw/src/lib/MsWksParser \
+	UnpackedTarball/libmwaw/src/lib/MsWksSSParser \
+	UnpackedTarball/libmwaw/src/lib/MsWksTable \
+	UnpackedTarball/libmwaw/src/lib/MsWrd1Parser \
+	UnpackedTarball/libmwaw/src/lib/MsWrdParser \
+	UnpackedTarball/libmwaw/src/lib/MsWrdStruct \
+	UnpackedTarball/libmwaw/src/lib/MsWrdText \
+	UnpackedTarball/libmwaw/src/lib/MsWrdTextStyles \
+	UnpackedTarball/libmwaw/src/lib/NisusWrtGraph \
+	UnpackedTarball/libmwaw/src/lib/NisusWrtParser \
+	UnpackedTarball/libmwaw/src/lib/NisusWrtStruct \
+	UnpackedTarball/libmwaw/src/lib/NisusWrtText \
+	UnpackedTarball/libmwaw/src/lib/RagTimeParser \
+	UnpackedTarball/libmwaw/src/lib/RagTimeSpreadsheet \
+	UnpackedTarball/libmwaw/src/lib/RagTimeText \
+	UnpackedTarball/libmwaw/src/lib/SuperPaintParser \
+	UnpackedTarball/libmwaw/src/lib/TeachTxtParser \
+	UnpackedTarball/libmwaw/src/lib/WingzParser \
+	UnpackedTarball/libmwaw/src/lib/WriteNowParser \
+	UnpackedTarball/libmwaw/src/lib/WriteNowText \
+	UnpackedTarball/libmwaw/src/lib/WriterPlsParser \
+	UnpackedTarball/libmwaw/src/lib/ZWrtParser \
+	UnpackedTarball/libmwaw/src/lib/ZWrtText \
+	UnpackedTarball/libmwaw/src/lib/libmwaw_internal \
+))
+
+# vim: set noet sw=4 ts=4:

external/libmwaw/Module_libmwaw.mk

@@ -10,8 +10,22 @@
 $(eval $(call gb_Module_Module,libmwaw))
 
 $(eval $(call gb_Module_add_targets,libmwaw,\
-	ExternalProject_libmwaw \
 	UnpackedTarball_libmwaw \
 ))
 
+ifeq ($(COM),MSC)
+
+$(eval $(call gb_Module_add_targets,libmwaw,\
+	Library_mwaw \
+))
+
+else
+
+$(eval $(call gb_Module_add_targets,libmwaw,\
+	ExternalPackage_libmwaw \
+	ExternalProject_libmwaw \
+))
+
+endif
+
 # vim: set noet sw=4 ts=4: