Kaydet (Commit) e3712f9d authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix build --all depend=x.

üst b863767b
...@@ -115,9 +115,9 @@ DEF1EXPORTFILE= exports.dxp ...@@ -115,9 +115,9 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk .INCLUDE : $(PRJ)$/target.pmk
.IF "$(depend)" == ""
ALLTAR : $(MISC)/hsqldb.component ALLTAR : $(MISC)/hsqldb.component
.END
$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ $(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
hsqldb.component hsqldb.component
......
...@@ -29,7 +29,10 @@ ...@@ -29,7 +29,10 @@
COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
.END
"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@ $(COPY) $< $@
......
...@@ -55,7 +55,9 @@ SLOFILES = $(SHL1OBJS) ...@@ -55,7 +55,9 @@ SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk .INCLUDE: target.mk
.IF "$(depend)" == ""
ALLTAR: test ALLTAR: test
.END
$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag $(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag
......
...@@ -48,7 +48,9 @@ XCUFILES= \ ...@@ -48,7 +48,9 @@ XCUFILES= \
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs" ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/ExtendedColorScheme.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Paths.xcs"
.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
......
...@@ -44,7 +44,9 @@ XCUFILES= \ ...@@ -44,7 +44,9 @@ XCUFILES= \
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs" ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Types.xcs"
.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Filter.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
......
...@@ -43,7 +43,9 @@ XCUFILES= \ ...@@ -43,7 +43,9 @@ XCUFILES= \
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs" ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs"
.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
......
...@@ -42,7 +42,9 @@ MODULEFILES= ...@@ -42,7 +42,9 @@ MODULEFILES=
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs" ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/WindowState.xcs" "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Controller.xcs"
.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
......
...@@ -39,7 +39,9 @@ XCSFILES= \ ...@@ -39,7 +39,9 @@ XCSFILES= \
.INCLUDE : target.mk .INCLUDE : target.mk
.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs"
.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
......
...@@ -74,7 +74,9 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f) ...@@ -74,7 +74,9 @@ $(COMPONENT_LIBRARIES) : $(DLLDEST)/$$(@:f)
.IF "$(PACK_RUNTIME)"!="" .IF "$(PACK_RUNTIME)"!=""
PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag PACK_RUNTIME_FLAG:=$(MISC)/$(TARGET)_pack_runtime.flag
.IF "$(depend)" == ""
$(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG) $(EXTENSION_TARGET) : $(PACK_RUNTIME_FLAG)
.END
$(EXTENSIONDIR) : $(EXTENSIONDIR) :
@@-$(MKDIRHIER) $(@:d) @@-$(MKDIRHIER) $(@:d)
...@@ -179,4 +181,6 @@ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS) ...@@ -179,4 +181,6 @@ $(COMPONENT_MANIFEST) : $(MANIFEST_SRC) $(MANIFEST_DEPS)
.ENDIF # "$(COMPONENT_MANIFEST_GENERIC)" != "" .ENDIF # "$(COMPONENT_MANIFEST_GENERIC)" != ""
.ENDIF # "$(COMPONENT_MANIFEST)"!="" .ENDIF # "$(COMPONENT_MANIFEST)"!=""
.IF "$(depend)" == ""
ALLTAR : $(EXTENSION_PACKDEPS) ALLTAR : $(EXTENSION_PACKDEPS)
.END
...@@ -30,11 +30,12 @@ TARGET=prj ...@@ -30,11 +30,12 @@ TARGET=prj
.INCLUDE : settings.mk .INCLUDE : settings.mk
.IF "$(VERBOSE)"!="" .IF "$(depend)" != ""
all:
.ELIF "$(VERBOSE)"!=""
all: all:
cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T cd $(PRJ) && $(GNUMAKE) -r -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T
.ELSE .ELSE
all: all:
@cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T @cd $(PRJ) && $(GNUMAKE) -rs -j$(GMAKE_MODULE_PARALLELISM) $(gb_MAKETARGET) gb_PARTIALBUILD=T
.ENDIF .END
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment