summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconnectivity/source/drivers/hsqldb/makefile.mk4
-rwxr-xr-xconnectivity/target.pmk3
-rw-r--r--cppu/qa/cppumaker/makefile.mk2
-rw-r--r--reportbuilder/registry/data/org/openoffice/Office/makefile.mk2
-rw-r--r--reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk2
-rw-r--r--reportbuilder/registry/data/org/openoffice/makefile.mk2
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk2
-rw-r--r--reportbuilder/registry/schema/org/openoffice/Office/makefile.mk2
-rw-r--r--solenv/inc/extension_post.mk4
-rw-r--r--solenv/inc/gbuildbridge.mk7
10 files changed, 25 insertions, 5 deletions
diff --git a/connectivity/source/drivers/hsqldb/makefile.mk b/connectivity/source/drivers/hsqldb/makefile.mk
index 6e400696faa0..0401fb2b8718 100755
--- a/connectivity/source/drivers/hsqldb/makefile.mk
+++ b/connectivity/source/drivers/hsqldb/makefile.mk
@@ -115,9 +115,9 @@ DEF1EXPORTFILE= exports.dxp
.INCLUDE : $(PRJ)$/target.pmk
-
-
+.IF "$(depend)" == ""
ALLTAR : $(MISC)/hsqldb.component
+.END
$(MISC)/hsqldb.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
hsqldb.component
diff --git a/connectivity/target.pmk b/connectivity/target.pmk
index e6e240a1ba4a..f51c698530ef 100755
--- a/connectivity/target.pmk
+++ b/connectivity/target.pmk
@@ -29,7 +29,10 @@
COMPONENT_CONFIG_SCHEMA*=$(TARGET).xcs
+.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)"
+.END
+
"$(PWD)$/$(MISC)$/registry$/schema$/$(PACKAGEDIR)$/$(COMPONENT_CONFIG_SCHEMA)" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Drivers.xcs
@@-$(MKDIRHIER) $(@:d)
$(COPY) $< $@
diff --git a/cppu/qa/cppumaker/makefile.mk b/cppu/qa/cppumaker/makefile.mk
index accda46fce3f..b0e6f8e0be47 100644
--- a/cppu/qa/cppumaker/makefile.mk
+++ b/cppu/qa/cppumaker/makefile.mk
@@ -55,7 +55,9 @@ SLOFILES = $(SHL1OBJS)
.INCLUDE: target.mk
+.IF "$(depend)" == ""
ALLTAR: test
+.END
$(SHL1OBJS): $(MISC)/$(TARGET).cppumaker.flag
diff --git a/reportbuilder/registry/data/org/openoffice/Office/makefile.mk b/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
index b6a12fa1fc0c..6e691dd8e053 100644
--- a/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/Office/makefile.mk
@@ -48,7 +48,9 @@ XCUFILES= \
.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"
+.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Embedding.xcs
@@-$(MKDIRHIER) $(@:d)
diff --git a/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk b/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
index 4b4cd2eae67c..68d0fe668709 100644
--- a/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/TypeDetection/makefile.mk
@@ -44,7 +44,9 @@ XCUFILES= \
.INCLUDE : target.mk
+.IF "$(depend)" == ""
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
@@-$(MKDIRHIER) $(@:d)
diff --git a/reportbuilder/registry/data/org/openoffice/makefile.mk b/reportbuilder/registry/data/org/openoffice/makefile.mk
index c5da644bef65..9d364956a946 100644
--- a/reportbuilder/registry/data/org/openoffice/makefile.mk
+++ b/reportbuilder/registry/data/org/openoffice/makefile.mk
@@ -43,7 +43,9 @@ XCUFILES= \
.INCLUDE : target.mk
+.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs"
+.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Setup.xcs
@@-$(MKDIRHIER) $(@:d)
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk b/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
index fcca28c000fc..9f284f9d01a9 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ b/reportbuilder/registry/schema/org/openoffice/Office/UI/makefile.mk
@@ -42,7 +42,9 @@ MODULEFILES=
.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"
+.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs": $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/Commands.xcs
@@-$(MKDIRHIER) $(@:d)
diff --git a/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk b/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
index 81f01626bb8d..82fb3a73e4a7 100644
--- a/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
+++ b/reportbuilder/registry/schema/org/openoffice/Office/makefile.mk
@@ -39,7 +39,9 @@ XCSFILES= \
.INCLUDE : target.mk
+.IF "$(depend)" == ""
ALLTAR: "$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs"
+.END
"$(PWD)$/$(MISC)$/$(EXTNAME)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs" : $(SOLARXMLDIR)$/registry$/schema$/$(PACKAGEDIR)$/DataAccess.xcs
@@-$(MKDIRHIER) $(@:d)
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