From 82a3c3f702e78232ebd4671c0061aa817bbd146b Mon Sep 17 00:00:00 2001 From: Bjoern Michaelsen Date: Wed, 16 Oct 2013 21:11:11 +0200 Subject: move mingw-externals to subdir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I324225ac397d8e4bb1f58f0b8040eb08b7142ee9 Reviewed-on: https://gerrit.libreoffice.org/6277 Tested-by: LibreOffice gerrit bot Reviewed-by: Björn Michaelsen Tested-by: Björn Michaelsen --- external/CustomTarget_jawt.mk | 33 ---------------------- external/Module_external.mk | 7 +---- external/Package_jawt.mk | 14 --------- external/Package_mingw_dlls.mk | 18 ------------ external/Package_mingw_gccdlls.mk | 17 ----------- external/mingw-externals/CustomTarget_jawt.mk | 33 ++++++++++++++++++++++ external/mingw-externals/Module_mingw-externals.mk | 21 ++++++++++++++ external/mingw-externals/Package_jawt.mk | 14 +++++++++ external/mingw-externals/Package_mingw_dlls.mk | 18 ++++++++++++ external/mingw-externals/Package_mingw_gccdlls.mk | 17 +++++++++++ 10 files changed, 104 insertions(+), 88 deletions(-) delete mode 100644 external/CustomTarget_jawt.mk delete mode 100644 external/Package_jawt.mk delete mode 100644 external/Package_mingw_dlls.mk delete mode 100644 external/Package_mingw_gccdlls.mk create mode 100644 external/mingw-externals/CustomTarget_jawt.mk create mode 100644 external/mingw-externals/Module_mingw-externals.mk create mode 100644 external/mingw-externals/Package_jawt.mk create mode 100644 external/mingw-externals/Package_mingw_dlls.mk create mode 100644 external/mingw-externals/Package_mingw_gccdlls.mk (limited to 'external') diff --git a/external/CustomTarget_jawt.mk b/external/CustomTarget_jawt.mk deleted file mode 100644 index 2d35d93a24c2..000000000000 --- a/external/CustomTarget_jawt.mk +++ /dev/null @@ -1,33 +0,0 @@ -# -*- 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_CustomTarget_CustomTarget,external/jawt)) - -$(eval $(call gb_CustomTarget_register_targets,external/jawt,\ - jawt.def \ - libjawt.dll.a \ -)) - -ifeq ($(OS)$(CPU),WNTX) -$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo EXPORTS > $@ - echo "JAWT_GetAWT" >> $@ -else -$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) - echo EXPORTS > $@ - echo "JAWT_GetAWT@8" >> $@ -endif - -$(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) - $(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/Module_external.mk b/external/Module_external.mk index 9cbf58837c1a..506c03aa517e 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -10,12 +10,7 @@ $(eval $(call gb_Module_Module,external)) ifeq ($(OS)$(COM),WNTGCC) -$(eval $(call gb_Module_add_targets,external,\ - CustomTarget_jawt \ - Package_jawt \ - Package_mingw_dlls \ - Package_mingw_gccdlls \ -)) +$(eval $(call gb_Module_add_moduledir,external,mingw-externals)) endif ifeq ($(COM),MSC) diff --git a/external/Package_jawt.mk b/external/Package_jawt.mk deleted file mode 100644 index cc58cf9f5ab2..000000000000 --- a/external/Package_jawt.mk +++ /dev/null @@ -1,14 +0,0 @@ -# -*- 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_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) - -$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/Package_mingw_dlls.mk b/external/Package_mingw_dlls.mk deleted file mode 100644 index c85032a3c60e..000000000000 --- a/external/Package_mingw_dlls.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -*- 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_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) - -$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTROOT))) - -$(eval $(call gb_Package_add_files,mingw_dlls,bin,\ - $(sort $(MINGW_DLLS)) \ -)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/Package_mingw_gccdlls.mk b/external/Package_mingw_gccdlls.mk deleted file mode 100644 index 521db37da155..000000000000 --- a/external/Package_mingw_gccdlls.mk +++ /dev/null @@ -1,17 +0,0 @@ -# -*- 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_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) - -$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\ - $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \ - $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \ -)) - -# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk new file mode 100644 index 000000000000..2d35d93a24c2 --- /dev/null +++ b/external/mingw-externals/CustomTarget_jawt.mk @@ -0,0 +1,33 @@ +# -*- 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_CustomTarget_CustomTarget,external/jawt)) + +$(eval $(call gb_CustomTarget_register_targets,external/jawt,\ + jawt.def \ + libjawt.dll.a \ +)) + +ifeq ($(OS)$(CPU),WNTX) +$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo EXPORTS > $@ + echo "JAWT_GetAWT" >> $@ +else +$(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def: + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo EXPORTS > $@ + echo "JAWT_GetAWT@8" >> $@ +endif + +$(call gb_CustomTarget_get_workdir,external/jawt)/libjawt.dll.a: $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),DLT,1) + $(DLLTOOL) --input-def=$< --output-lib=$@ --dllname=jawt.dll + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Module_mingw-externals.mk b/external/mingw-externals/Module_mingw-externals.mk new file mode 100644 index 000000000000..6d262d899f65 --- /dev/null +++ b/external/mingw-externals/Module_mingw-externals.mk @@ -0,0 +1,21 @@ +# -*- 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_Module_Module,mingw-externals)) + +ifeq ($(OS)$(COM),WNTGCC) +$(eval $(call gb_Module_add_targets,mingw-externals,\ + CustomTarget_jawt \ + Package_jawt \ + Package_mingw_dlls \ + Package_mingw_gccdlls \ +)) +endif + +# vim: set noet sw=4 ts=4: diff --git a/external/mingw-externals/Package_jawt.mk b/external/mingw-externals/Package_jawt.mk new file mode 100644 index 000000000000..cc58cf9f5ab2 --- /dev/null +++ b/external/mingw-externals/Package_jawt.mk @@ -0,0 +1,14 @@ +# -*- 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_Package_Package,jawt,$(call gb_CustomTarget_get_workdir,external/jawt))) + +$(eval $(call gb_Package_add_file,jawt,lib/libjawt.dll.a,libjawt.dll.a)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_dlls.mk b/external/mingw-externals/Package_mingw_dlls.mk new file mode 100644 index 000000000000..c85032a3c60e --- /dev/null +++ b/external/mingw-externals/Package_mingw_dlls.mk @@ -0,0 +1,18 @@ +# -*- 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_Package_Package,mingw_dlls,$(MINGW_SYSROOT)/bin)) + +$(eval $(call gb_Package_set_outdir,mingw_dlls,$(INSTROOT))) + +$(eval $(call gb_Package_add_files,mingw_dlls,bin,\ + $(sort $(MINGW_DLLS)) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/external/mingw-externals/Package_mingw_gccdlls.mk b/external/mingw-externals/Package_mingw_gccdlls.mk new file mode 100644 index 000000000000..521db37da155 --- /dev/null +++ b/external/mingw-externals/Package_mingw_gccdlls.mk @@ -0,0 +1,17 @@ +# -*- 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_Package_Package,mingw_gccdlls,$(MINGW_SYSROOT)/bin)) + +$(eval $(call gb_Package_add_files,mingw_gccdlls,bin,\ + $(if $(filter YES,$(MINGW_SHARED_GCCLIB)),$(MINGW_GCCDLL)) \ + $(if $(filter YES,$(MINGW_SHARED_GXXLIB)),$(MINGW_GXXDLL)) \ +)) + +# vim:set shiftwidth=4 tabstop=4 noexpandtab: -- cgit