Browse Source

Makefile: Eventually fix CLion integration.

Signed-off-by: Sven Eden <sven.eden@prydeworx.com>
debian
Sven Eden 1 year ago
parent
commit
e1548c364e
  1. 6
      .idea/misc.xml
  2. 17
      Makefile

6
.idea/misc.xml

@ -16,15 +16,15 @@
<MakefileProjectSettings>
<option name="analyzerType" value="OUTPUT_PARSING" />
<option name="buildOptions" value="-j 1" />
<option name="buildTarget" value="all" />
<option name="cleanTarget" value="justprint" />
<option name="buildTarget" value="justprint" />
<option name="cleanTarget" value="clean" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
</set>
</option>
<option name="switches" value="JUST_PRINT=YES" />
<option name="switches" value="" />
</MakefileProjectSettings>
</option>
</component>

17
Makefile

@ -68,6 +68,8 @@ else
CXXFLAGS := -O2 -fwrapv ${envCXXFLAGS}
endif
# Set search paths including the actual build directory
VPATH := $(BUILDDIR):$(HERE):$(HERE)/src
# Finalize CFLAGS
CFLAGS := -march=native -pipe ${CFLAGS} -Wall -Wextra -Wunused -Wno-unused-parameter -Wno-unused-result -ftree-vectorize
@ -76,27 +78,38 @@ CFLAGS := -march=native -pipe ${CFLAGS} -Wall -Wextra -Wunused -Wno-unused-param
all: build
build: $(CONFIG)
+@(echo "make[2]: Entering directory '$(BUILDDIR)'")
+(cd $(BUILDDIR) && ninja $(NINJA_OPT))
+@(echo "make[2]: Leaving directory '$(BUILDDIR)'")
clean: $(CONFIG)
+@(echo "make[2]: Entering directory '$(BUILDDIR)'")
(cd $(BUILDDIR) && ninja $(NINJA_OPT) -t cleandead)
(cd $(BUILDDIR) && ninja $(NINJA_OPT) -t clean)
+@(echo "make[2]: Leaving directory '$(BUILDDIR)'")
install: build
+@(echo "make[2]: Entering directory '$(BUILDDIR)'")
(cd $(BUILDDIR) && DESTDIR=$(DESTDIR) ninja $(NINJA_OPT) install)
+@(echo "make[2]: Leaving directory '$(BUILDDIR)'")
justprint: $(CONFIG)
$(MAKE) all JUST_PRINT=YES
+($(MAKE) all JUST_PRINT=YES)
loginctl: $(CONFIG)
+@(echo "make[2]: Entering directory '$(BUILDDIR)'")
(cd $(BUILDDIR) && ninja $(NINJA_OPT) $@)
+@(echo "make[2]: Leaving directory '$(BUILDDIR)'")
test: $(CONFIG)
+@(echo "make[2]: Entering directory '$(BUILDDIR)'")
(cd $(BUILDDIR) && ninja $(NINJA_OPT) $@)
+@(echo "make[2]: Leaving directory '$(BUILDDIR)'")
test-login: $(CONFIG)
+@(echo "make[2]: Entering directory '$(BUILDDIR)'")
(cd $(BUILDDIR) && ninja $(NINJA_OPT) $@)
+@(echo "make[2]: Leaving directory '$(BUILDDIR)'")
$(BUILDDIR):
+$(MKDIR) $@

Loading…
Cancel
Save