diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-11-12 00:00:01 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-11-14 11:50:26 +0100 |
| commit | e3712f9d350a4dbef0951e72f0de9a31eabba065 (patch) | |
| tree | 25b745eb7dab018a2902137130b72899d53ece1a /solenv | |
| parent | b863767bd1ddc2af18900fa1df0cd61ef2fa6edb (diff) | |
Fix build --all depend=x.
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/inc/extension_post.mk | 4 | ||||
| -rw-r--r-- | solenv/inc/gbuildbridge.mk | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/solenv/inc/extension_post.mk b/solenv/inc/extension_post.mk index cff8f09c60a0..22f2e81d470e 100644 --- a/solenv/inc/extension_post.mk +++ b/solenv/inc/extension_post.mk @@ -74,7 +74,9 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f) .IF "$(PACK_RUNTIME)"!="" PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag +.IF "$(depend)" == "" $(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG) +.END $(EXTENSIONDIR) : @@-$(MKDIRHIER) $(@:d) @@ -179,4 +181,6 @@ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS) .ENDIF # "$(COMPONENT_MANIFEST_GENERIC)" != "" .ENDIF # "$(COMPONENT_MANIFEST)"!="" +.IF "$(depend)" == "" ALLTAR : $(EXTENSION_PACKDEPS) +.END diff --git a/solenv/inc/gbuildbridge.mk b/solenv/inc/gbuildbridge.mk index 6b7600d8ab2f..de438007634c 100644 --- a/solenv/inc/gbuildbridge.mk +++ b/solenv/inc/gbuildbridge.mk @@ -30,11 +30,12 @@ TARGET=prj .INCLUDE : settings.mk -.IF "$(VERBOSE)"!="" +.IF "$(depend)" != "" +all: +.ELIF "$(VERBOSE)"!="" all: cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T .ELSE all: @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T -.ENDIF - +.END |