diff options
| author | Matúš Kukan <matus.kukan@gmail.com> | 2012-05-04 00:29:04 +0200 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2012-05-09 09:39:18 +0100 |
| commit | f4f4e3c050b117a8bfaa95a865b3b37bcb637516 (patch) | |
| tree | 37a224082d2ae279ac747f01e56c91b386627435 /Makefile | |
| parent | 4f01261a04b702819aba9966177abe601761103b (diff) | |
gbuild: use mixed paths on cygwin
make 3.82 understands mixed paths, so use them.
This allows us to get rid of evil in BuildDirs.mk.
Hopefully, life will be simpler now.
Change-Id: I I I641f28c6af1948963f7004f8071af62e21caabb3
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 4 insertions, 16 deletions
@@ -360,16 +360,10 @@ ifneq ($(filter-out clean distclean,$(MAKECMDGOALS)),) # config_host.mk which is included in this # Makefile -ifeq ($(OS_FOR_BUILD),WNT) -CONFIG_HOST_MK=$(shell cygpath -u $(SRCDIR))/config_host.mk -else -CONFIG_HOST_MK=$(SRCDIR)/config_host.mk -endif - -Makefile: $(CONFIG_HOST_MK) +Makefile: $(SRCDIR)/config_host.mk touch $@ -$(CONFIG_HOST_MK) : config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun +$(SRCDIR)/config_host.mk: config_host.mk.in bin/repo-list.in ooo.lst.in configure.in autogen.lastrun ./autogen.sh autogen.lastrun: @@ -390,18 +384,12 @@ endif # # Bootstap # -ifeq ($(OS_FOR_BUILD),WNT) -WORKDIR_BOOTSTRAP=$(shell cygpath -u $(WORKDIR))/bootstrap -else -WORKDIR_BOOTSTRAP=$(WORKDIR)/bootstrap -endif +bootstrap: $(WORKDIR)/bootstrap -$(WORKDIR_BOOTSTRAP): +$(WORKDIR)/bootstrap: @cd $(SRCDIR) && ./bootstrap @mkdir -p $(dir $@) && touch $@ -bootstrap: $(WORKDIR_BOOTSTRAP) - # # Build # |