diff options
| author | Michael Stahl <mstahl@redhat.com> | 2013-04-24 16:08:46 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-04-24 17:37:46 +0200 |
| commit | 7019a1c67473623cb81ca0c9e155b90a5ce6947a (patch) | |
| tree | 8a1db39a43b28aa9673133a2e6bb2a7cd8a91e40 /solenv/gbuild/platform | |
| parent | ced9e2abecbbdf70acb3ca46c5e6a6d4247015c0 (diff) | |
gbuild: get rid of processdeps.awk
The only thing that processdeps.awk does that is actually useful is to
be able to set the target name freely, but that is only important for
the default resource file which was just renamed.
Instead hack makedepend to provide the required functionality directly:
- write dummy rules for included files so builds don't break on
rename/removal
- format deps one per line like concat-deps expects
- concat-deps expects standard POSIX line ends, so open in binary mode
(also disable that awful backup copying nonsense)
Though in retrospect it would perhaps be a better investment of time to
try to replace makedepend...
Change-Id: I54fafdcdcf1a52692e62b8f1f4b96fb9a93d4421
Diffstat (limited to 'solenv/gbuild/platform')
| -rw-r--r-- | solenv/gbuild/platform/WNT_INTEL_GCC.mk | 10 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 20 |
2 files changed, 9 insertions, 21 deletions
diff --git a/solenv/gbuild/platform/WNT_INTEL_GCC.mk b/solenv/gbuild/platform/WNT_INTEL_GCC.mk index 2acbc6ca0318..8df958f12c2f 100644 --- a/solenv/gbuild/platform/WNT_INTEL_GCC.mk +++ b/solenv/gbuild/platform/WNT_INTEL_GCC.mk @@ -362,13 +362,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(INCLUDE) \ $(DEFS) \ $(RCFILE) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(3) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - > $(1)) + -o .res \ + -p $(dir $(3)) \ + -f $(1)) endef else gb_WinResTarget__command_target = diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 92b8e03a384a..94db603d6c13 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -484,13 +484,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(INCLUDE) \ $(DEFS) \ $(2) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(call gb_SrsPartTarget_get_target,$(1)) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - > $(call gb_SrsPartTarget_get_dep_target,$(1))) + -o .src \ + -p $(dir $(call gb_SrsPartTarget_get_target,$(1))) \ + -f $(call gb_SrsPartTarget_get_dep_target,$(1))) endef else gb_SrsPartTarget__command_target = @@ -532,13 +528,9 @@ $(call gb_Helper_abbreviate_dirs,\ $(INCLUDE) \ $(DEFS) \ $(RCFILE) \ - -f - \ - | $(gb_AWK) -f $(GBUILDDIR)/processdeps.awk \ - -v OBJECTFILE=$(3) \ - -v OUTDIR=$(OUTDIR)/ \ - -v WORKDIR=$(WORKDIR)/ \ - -v SRCDIR=$(SRCDIR)/ \ - > $(1)) + -o .res \ + -p $(dir $(3)) \ + -f $(1)) endef else gb_WinResTarget__command_target = |