From c20573e6ddf781f272795b0e594747e52cc1d631 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 12 Jan 2019 11:46:23 +0100 Subject: [PATCH] Makefile: keep cmake-build as default target (#2579) Fixes https://github.com/awesomeWM/awesome/issues/2576. --- .travis.yml | 3 --- Makefile | 7 ++++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 06d8403c..29110628 100644 --- a/.travis.yml +++ b/.travis.yml @@ -247,9 +247,6 @@ script: git checkout "$commit" git --no-pager show --stat - # Remove/clean any existing build dir. - sudo make distclean - if ! make all check CMAKE_ARGS+="-D DO_COVERAGE=0"; then failed="$failed $commit" fi diff --git a/Makefile b/Makefile index b5d2c80d..a93930e9 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,12 @@ endif BUILDDIR=build -all: awesome ; +# Run "make" in $(BUILDDIR) by default. +# This is required to generate all files already, which should not be generated +# with "(sudo) make install" only later. +cmake-build: $(BUILDDIR)/Makefile + $(ECHO) "Building…" + $(MAKE) -C $(BUILDDIR) $(BUILDDIR)/Makefile: $(ECHO) "Creating build directory and running cmake in it. You can also run CMake directly, if you want."