resolved dep generation dep cycle

GNUmakefile

@@ -25,7 +25,8 @@
 #
 #*************************************************************************
 
-include $(dir $(firstword $MAKEFILE_LIST))/SourcePaths.mk
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(dir $(lastword $(MAKEFILE_LIST)))/SourcePath.mk
 include $(GBUILDDIR)/gbuild.mk
 
 $(eval $(call gb_Module_make_global_targets,$(SRCDIR)/Module_ooo.mk))

SourcePaths.mk → SourcePath.mk

@@ -25,14 +25,11 @@
 #
 #*************************************************************************
 
-ifeq ($(strip $(SOLARENV)),)
-$(error No environment set)
-endif
+CURRENTREPO := $(patsubst %/,%,$(dir $(realpath $(lastword $(MAKEFILE_LIST)))))
 ifeq ($(OS),WNT)
-SRCDIR := $(shell cygpath -u $(SRCDIR))
-else
-SRCDIR := $(SOLARSRC)
+CURRENTREPO := $(shell cygpath -u $(CURRENTREPO))
 endif
-CURRENTREPO := $(SRCDIR)
 
-GBUILDDIR := $(SOLARENV)/gbuild
+SRCDIR := $(CURRENTREPO)
+
+# vim: set noet sw=4 ts=4:

solenv/gbuild/LinkTarget.mk

@@ -168,7 +168,7 @@ $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%)
 	$(call gb_LinkTarget__command_dep,$(call gb_LinkTarget_get_dep_target,$*),$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
 	$(call gb_LinkTarget__command,$@,$*,$(TARGETTYPE_FLAGS) $(LDFLAGS),$(LINKED_LIBS),$(LINKED_STATIC_LIBS),$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
 
-$(call gb_LinkTarget_get_dep_target,%) : $(call gb_LinkTarget_get_headers_target,%)
+$(call gb_LinkTarget_get_dep_target,%) : | $(call gb_LinkTarget_get_headers_target,%)
 	$(call gb_LinkTarget__command_dep,$@,$*,$(COBJECTS),$(CXXOBJECTS),$(OBJCXXOBJECTS))
 
 define gb_LinkTarget__get_external_headers_check