diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-28 12:27:45 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-31 22:49:29 +0200 |
| commit | afd5eb1f04971edb083e47a2f9c2e9d77c9737c9 (patch) | |
| tree | 37d713f00f98be0f2da9c98c361b7ae2d8bf0f1f /sal | |
| parent | 776cb1beac9d1416e4c7a6758b6eb872c995b895 (diff) | |
sal: use CustomTarget makefile
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/CustomTarget_generated.mk (renamed from sal/util/Makefile) | 29 | ||||
| -rw-r--r-- | sal/Module_sal.mk | 1 | ||||
| -rw-r--r-- | sal/Package_generated.mk | 4 |
3 files changed, 19 insertions, 15 deletions
diff --git a/sal/util/Makefile b/sal/CustomTarget_generated.mk index 87b3e29d8077..a70acd390fcd 100644 --- a/sal/util/Makefile +++ b/sal/CustomTarget_generated.mk @@ -25,19 +25,25 @@ # 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 +$(eval $(call gb_CustomTarget_CustomTarget,sal/generated,new_style)) -all: rtlbootstrap.mk $(if $(filter-out $(COM),MSC),sal/typesizes.h) sal/udkversion.h sal +SAUT := $(call gb_CustomTarget_get_workdir,sal/generated) -sal: - mkdir sal +$(call gb_CustomTarget_get_target,sal/generated) : \ + $(SAUT)/rtlbootstrap.mk $(SAUT)/sal/udkversion.h \ + $(if $(filter-out $(COM),MSC),$(SAUT)/sal/typesizes.h) -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' > $@ +$(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) -sal/typesizes.h: sal +$(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)" >> $@ @@ -57,7 +63,8 @@ endif include $(SRCDIR)/solenv/inc/udkversion.mk -sal/udkversion.h: sal +$(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 '' >> $@ @@ -67,6 +74,4 @@ sal/udkversion.h: sal echo '' >> $@ echo '#endif' >> $@ -.DEFAULT_GOAL := all -.PHONY: all # 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)) |