diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-30 12:41:21 +0200 |
|---|---|---|
| committer | Matúš Kukan <matus.kukan@gmail.com> | 2012-03-31 22:49:27 +0200 |
| commit | a4e2453b42b54ba904c1ee8ad07e26f1e6d939e5 (patch) | |
| tree | 71ee378ddc2c1d06071e5ba4ed5d0bb08b4b5cb8 /solenv | |
| parent | revert "remove limitation to 3 sort entries in calc part1" (diff) | |
| download | core-a4e2453b42b54ba904c1ee8ad07e26f1e6d939e5.tar.gz core-a4e2453b42b54ba904c1ee8ad07e26f1e6d939e5.zip | |
gbuild: gb_Object__command_dep should be used here and a little cleanup
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/LinkTarget.mk | 36 |
1 files changed, 5 insertions, 31 deletions
diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 80c24bafe232..ccd098b72ab2 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -123,8 +123,6 @@ $(call gb_CObject_get_dep_target,%) : $(call gb_CObject_get_target,%) endif -gb_CObject_CObject = - # CxxObject class @@ -142,8 +140,6 @@ $(call gb_CxxObject_get_dep_target,%) : $(call gb_CxxObject_get_target,%) endif -gb_CxxObject_CxxObject = - # GenCObject class @@ -162,8 +158,6 @@ $(call gb_GenCObject_get_dep_target,%) : $(call gb_GenCObject_get_target,%) endif -gb_GenCObject_GenCObject = - # GenCxxObject class @@ -182,7 +176,6 @@ $(call gb_GenCxxObject_get_dep_target,%) : $(call gb_GenCxxObject_get_target,%) endif -gb_GenCxxObject_GenCxxObject = # YaccTarget class @@ -192,6 +185,8 @@ gb_GenCxxObject_GenCxxObject = # tries to use it. gb_YaccTarget_get_source = $(1)/$(2).y +# defined by platform +# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target) .PHONY : $(call gb_YaccTarget_get_clean_target,%) $(call gb_YaccTarget_get_clean_target,%) : @@ -210,9 +205,6 @@ endef gb_YACC := bison -# YaccTarget class -# defined by platform -# gb_YaccTarget__command(grammar-file, stem-for-message, source-target, include-target) # ObjCxxObject class # @@ -231,7 +223,6 @@ $(call gb_ObjCxxObject_get_dep_target,%) : $(call gb_ObjCxxObject_get_target,%) endif -gb_ObjCxxObject_ObjCxxObject = # ObjCObject class # @@ -240,30 +231,15 @@ gb_ObjCObject_get_source = $(1)/$(2).m # defined by platform # gb_ObjCObject__command -# this rule generates an "always rebuild" dep file, to have something to include. -# the dep file will be overridden on the fly, when the object is compiled -ifeq ($(gb_FULLDEPS),$(true)) -define gb_ObjCObject__command_dep -mkdir -p $(dir $(1)) && \ - echo '$(call gb_ObjCObject_get_target,$(2)) : $$(gb_Helper_PHONY)' > $(1) - -endef -else -gb_ObjCObject__command_dep = -endif - $(call gb_ObjCObject_get_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) - $(call gb_ObjCObject__command,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE)) + $(call gb_ObjCObject__command,$@,$*,$<) ifeq ($(gb_FULLDEPS),$(true)) -$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_source,$(SRCDIR),%) - $(call gb_ObjCObject__command_dep,$@,$*,$<,$(DEFS),$(OBJCFLAGS),$(INCLUDE_STL) $(INCLUDE)) +$(call gb_ObjCObject_get_dep_target,%) : $(call gb_ObjCObject_get_target,%) + $(call gb_Object__command_dep,$@,$(call gb_ObjCObject_get_target,$*)) endif -gb_ObjCObject_ObjCObject = - - # AsmObject class @@ -281,8 +257,6 @@ $(call gb_AsmObject_get_dep_target,%) : $(call gb_AsmObject_get_target,%) endif -gb_AsmObject_AsmObject = - # LinkTarget class |