diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-19 20:35:37 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-11-19 20:35:37 +0100 |
| commit | 767538bd266c6d620b9664ff1eb5641381b14440 (patch) | |
| tree | c6d652f478954d576e1b2e0169a7f3245bee252b /solenv/gbuild/TargetLocations.mk | |
| parent | d68d8332f96ea3ed1e710c3715d2deb94a4c2458 (diff) | |
gnumake2: major refactoring of the layer logic separating it between linktarget, library and executable classes
Diffstat (limited to 'solenv/gbuild/TargetLocations.mk')
| -rwxr-xr-x | solenv/gbuild/TargetLocations.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 9bf493cf428e..75ecfaa9b527 100755 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -120,8 +120,12 @@ $(eval $(call gb_Helper_make_dep_targets,\ gb_Library_get_linktargetname = Library/$(1) gb_StaticLibrary_get_linktargetname = StaticLibrary/$(1) -define gb_LinkTarget_get_layer -$(patsubst $(1):%,%,$(filter $(1):%,$(gb_LinkTarget_LAYER))) +define gb_Library_get_layer +$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Library_LAYER))) +endef + +define gb_Executable_get_layer +$(patsubst $(1):%,%,$(filter $(1):%,$(gb_Executable_LAYER))) endef define gb_Library_get_filename @@ -143,8 +147,8 @@ endef # static members declared here because they are used globally -gb_Library_OUTDIRLOCATION := $(OUTDIR)/lib -gb_Library_DLLDIR := $(WORKDIR)/LinkTarget/Library -gb_StaticLibrary_OUTDIRLOCATION := $(OUTDIR)/lib +gb_Library_OUTDIRLOCATION = $(OUTDIR)/lib +gb_Library_DLLDIR = $(WORKDIR)/LinkTarget/Library +gb_StaticLibrary_OUTDIRLOCATION = $(OUTDIR)/lib # vim: set noet sw=4 ts=4: |