From afd5eb1f04971edb083e47a2f9c2e9d77c9737c9 Mon Sep 17 00:00:00 2001 From: Matúš Kukan Date: Wed, 28 Mar 2012 12:27:45 +0200 Subject: sal: use CustomTarget makefile --- sal/CustomTarget_generated.mk | 77 +++++++++++++++++++++++++++++++++++++++++++ sal/Module_sal.mk | 1 + sal/Package_generated.mk | 4 +-- sal/util/Makefile | 72 ---------------------------------------- 4 files changed, 79 insertions(+), 75 deletions(-) create mode 100644 sal/CustomTarget_generated.mk delete mode 100644 sal/util/Makefile (limited to 'sal') diff --git a/sal/CustomTarget_generated.mk b/sal/CustomTarget_generated.mk new file mode 100644 index 000000000000..a70acd390fcd --- /dev/null +++ b/sal/CustomTarget_generated.mk @@ -0,0 +1,77 @@ +# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- +# +# Version: MPL 1.1 / GPLv3+ / LGPLv3+ +# +# The contents of this file are subject to the Mozilla Public License Version +# 1.1 (the "License"); you may not use this file except in compliance with +# the License or as specified alternatively below. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS IS" basis, +# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +# for the specific language governing rights and limitations under the +# License. +# +# Major Contributor(s): +# Copyright (C) 2011 Matúš Kukan (initial developer) +# +# All Rights Reserved. +# +# For minor contributions see the git repository. +# +# Alternatively, the contents of this file may be used under the terms of +# either the GNU General Public License Version 3 or later (the "GPLv3+"), or +# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), +# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable +# instead of those above. + +$(eval $(call gb_CustomTarget_CustomTarget,sal/generated,new_style)) + +SAUT := $(call gb_CustomTarget_get_workdir,sal/generated) + +$(call gb_CustomTarget_get_target,sal/generated) : \ + $(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \ + $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h) + +$(SAUT)/rtlbootstrap.mk : $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h) | $(SAUT)/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CXX,1) + $(call gb_Helper_abbreviate_dirs_native, \ + (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > $(SAUT)/bootstrap.cxx && \ + $(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I$(SAUT) -I$(SRCDIR)/sal/rtl/source \ + -I$(SRCDIR)/sal/inc $(SAUT)/bootstrap.cxx > $@.tmp && \ + cat $@.tmp | grep '^RTL_' | sed -e 's/"//g' > $@ && \ + rm $(SAUT)/bootstrap.cxx $@.tmp) + +$(SAUT)/sal/typesizes.h :| $(SAUT)/sal/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo '/* This file is autogenerated from configure script data */' > $@ + echo >> $@ + echo "#define SAL_TYPES_ALIGNMENT2 $(ALIGNOF_SHORT)" >> $@ + echo "#define SAL_TYPES_ALIGNMENT4 $(ALIGNOF_INT)" >> $@ +ifeq ($(SIZEOF_LONG),8) + echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_LONG)" >> $@ +else ifeq ($(SIZEOF_DOUBLE),8) + echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_DOUBLE)" >> $@ +else + echo "#error alignment of some 8-byte type unknown" >> $@ +endif + echo "#define SAL_TYPES_SIZEOFSHORT $(SIZEOF_SHORT)" >> $@ + echo "#define SAL_TYPES_SIZEOFINT $(SIZEOF_INT)" >> $@ + echo "#define SAL_TYPES_SIZEOFLONG $(SIZEOF_LONG)" >> $@ + echo "#define SAL_TYPES_SIZEOFLONGLONG $(SIZEOF_LONGLONG)" >> $@ + echo "#define SAL_TYPES_SIZEOFPOINTER $(SIZEOF_POINTER)" >> $@ + +include $(SRCDIR)/solenv/inc/udkversion.mk + +$(SAUT)/sal/udkversion.h :| $(SAUT)/sal/.dir + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1) + echo '#ifndef _SAL_UDKVERSION_H_' > $@ + echo '#define _SAL_UDKVERSION_H_' >> $@ + echo '' >> $@ + echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@ + echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@ + echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@ + echo '' >> $@ + echo '#endif' >> $@ + +# vim: set noet sw=4 ts=4: diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index e70512232f0f..4bf0ec82c352 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -29,6 +29,7 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ + CustomTarget_generated \ $(if $(filter $(OS),IOS),, \ Executable_osl_process_child) \ Executable_cppunittester \ diff --git a/sal/Package_generated.mk b/sal/Package_generated.mk index 6c946ffd321e..719e97c6c6e0 100644 --- a/sal/Package_generated.mk +++ b/sal/Package_generated.mk @@ -25,9 +25,7 @@ # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable # instead of those above. -$(eval $(call gb_Package_Package,sal_generated,$(WORKDIR)/CustomTarget/sal/util)) - -$(eval $(call gb_Package_add_customtarget,sal_generated,sal/util)) +$(eval $(call gb_Package_Package,sal_generated,$(call gb_CustomTarget_get_workdir,sal/generated))) $(eval $(call gb_Package_add_file,sal_generated,inc/rtlbootstrap.mk,rtlbootstrap.mk)) $(eval $(call gb_Package_add_file,sal_generated,inc/sal/udkversion.h,sal/udkversion.h)) diff --git a/sal/util/Makefile b/sal/util/Makefile deleted file mode 100644 index 87b3e29d8077..000000000000 --- a/sal/util/Makefile +++ /dev/null @@ -1,72 +0,0 @@ -# -*- Mode: makefile; tab-width: 4; indent-tabs-mode: t -*- -# -# Version: MPL 1.1 / GPLv3+ / LGPLv3+ -# -# The contents of this file are subject to the Mozilla Public License Version -# 1.1 (the "License"); you may not use this file except in compliance with -# the License or as specified alternatively below. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ -# -# Software distributed under the License is distributed on an "AS IS" basis, -# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License -# for the specific language governing rights and limitations under the -# License. -# -# Major Contributor(s): -# Copyright (C) 2011 Matúš Kukan (initial developer) -# -# All Rights Reserved. -# -# For minor contributions see the git repository. -# -# Alternatively, the contents of this file may be used under the terms of -# either the GNU General Public License Version 3 or later (the "GPLv3+"), or -# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"), -# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable -# instead of those above. - -gb_PARTIALBUILD:=T -include $(GBUILDDIR)/gbuild_simple.mk - -all: rtlbootstrap.mk $(if $(filter-out $(COM),MSC),sal/typesizes.h) sal/udkversion.h sal - -sal: - mkdir sal - -rtlbootstrap.mk: sal/typesizes.h - (echo '#include "macro.hxx"'; echo RTL_OS:=THIS_OS; echo RTL_ARCH:=THIS_ARCH) > bootstrap.cxx - $(CXX) -E $(gb_OSDEFS) $(gb_CXXFLAGS) -D$(CPUNAME) -I. -I$(SRCDIR)/sal/rtl/source -I$(SRCDIR)/sal/inc bootstrap.cxx | grep '^RTL_' | sed -e 's/"//g' > $@ - -sal/typesizes.h: sal - echo '/* This file is autogenerated from configure script data */' > $@ - echo >> $@ - echo "#define SAL_TYPES_ALIGNMENT2 $(ALIGNOF_SHORT)" >> $@ - echo "#define SAL_TYPES_ALIGNMENT4 $(ALIGNOF_INT)" >> $@ -ifeq ($(SIZEOF_LONG),8) - echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_LONG)" >> $@ -else ifeq ($(SIZEOF_DOUBLE),8) - echo "#define SAL_TYPES_ALIGNMENT8 $(ALIGNOF_DOUBLE)" >> $@ -else - echo "#error alignment of some 8-byte type unknown" >> $@ -endif - echo "#define SAL_TYPES_SIZEOFSHORT $(SIZEOF_SHORT)" >> $@ - echo "#define SAL_TYPES_SIZEOFINT $(SIZEOF_INT)" >> $@ - echo "#define SAL_TYPES_SIZEOFLONG $(SIZEOF_LONG)" >> $@ - echo "#define SAL_TYPES_SIZEOFLONGLONG $(SIZEOF_LONGLONG)" >> $@ - echo "#define SAL_TYPES_SIZEOFPOINTER $(SIZEOF_POINTER)" >> $@ - -include $(SRCDIR)/solenv/inc/udkversion.mk - -sal/udkversion.h: sal - echo '#ifndef _SAL_UDKVERSION_H_' > $@ - echo '#define _SAL_UDKVERSION_H_' >> $@ - echo '' >> $@ - echo '#define SAL_UDK_MAJOR "$(UDK_MAJOR)"' >> $@ - echo '#define SAL_UDK_MINOR "$(UDK_MINOR)"' >> $@ - echo '#define SAL_UDK_MICRO "$(UDK_MICRO)"' >> $@ - echo '' >> $@ - echo '#endif' >> $@ - -.DEFAULT_GOAL := all -.PHONY: all -# vim: set noet sw=4 ts=4: -- cgit