Mirrors/VILLASnode
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/node/ synced 2025-03-09 00:00:00 +01:00
Code Issues Releases Wiki Activity

get rid of make/ folder

Browse source
This commit is contained in:
Steffen Vogel 2018-04-04 09:03:19 +02:00
parent d965ebb864
commit 6d49820218
3 changed files with 5 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Makefile
View file

@ -48,12 +48,13 @@ V ?= 2
# Platform
PLATFORM ?= $(shell uname)
include Makefile.help
include Makefile.config
ifeq ($(WITH_SRC),1)
MODULES += src
endif
ifeq ($(WITH_TOOLS),1)
MODULES += tools
endif
@ -122,7 +123,7 @@ ifdef CI
GIT_REV := $(shell echo $${CI_COMMIT_SHA:0:7})
GIT_BRANCH := $(CI_COMMIT_REF_NAME)
ifdef CI_COMMIT_TAG
RELEASE = 1
else
@ -131,7 +132,7 @@ ifdef CI
else
GIT_REV := $(shell git rev-parse --short=7 HEAD)
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
RELEASE = 1.$(subst -,_,$(GIT_BRANCH))_$(subst -,_,$(VARIANT)).$(shell date +%Y%m%d)git$(GIT_REV)
endif
@ -153,7 +154,7 @@ LDLIBS += $(shell $(PKGCONFIG) --libs ${PKGS})
all: $(filter-out $(MODULES_EXCLUDE),$(MODULES))
install: $(addprefix install-,$(filter-out $(MODULES_EXCLUDE),$(MODULES)))
clean: $(addprefix clean-, $(filter-out $(MODULES_EXCLUDE),$(MODULES)))
src plugins tools tests: lib
# Build all variants: debug, coverage, ...
@ -173,6 +174,5 @@ escape = $(shell echo $1 | tr a-z- A-Z_ | tr -dc ' A-Z0-9_')
.PHONY: all everything clean install
include $(wildcard $(SRCDIR)/make/Makefile.*)
include $(wildcard $(BUILDDIR)/**/*.d)
include $(patsubst %,$(SRCDIR)/%/Makefile.inc,$(MODULES))

0
make/Makefile.help → Makefile.help
View file

49
make/Makefile.complete
View file

@ -1,49 +0,0 @@
# Makefile for clang autocompletion
#
# This Makefile produces .clang_complete files containing compiler flags
# which are used by clang autocompletion tools such as:
#
# - https://atom.io/packages/autocomplete-clang
# - https://github.com/Rip-Rip/clang_complete
#
# @author Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
# @copyright 2017, Institute for Automation of Complex Power Systems, EONERC
# @license GNU General Public License (version 3)
#
# VILLASnode
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
###################################################################################
SRCMODULES = src lib plugins tools tests/unit
CLANG_COMPLETES = $(patsubst %,$(SRCDIR)/%/.clang_complete,$(SRCMODULES))
tests/unit/.clang_complete: FLAGS = $(TEST_CFLAGS)
src/.clang_complete: FLAGS = $(SRC_CFLAGS)
tools/.clang_complete: FLAGS = $(TOOLS_CFLAGS)
plugins/.clang_complete: FLAGS = $(PLUGIN_CFLAGS)
lib/.clang_complete: FLAGS = $(LIB_CFLAGS)
%/.clang_complete:
echo "$(FLAGS)" > $@
clang-complete: $(CLANG_COMPLETES)
clean: clean-clang-complete
clean-clang-complete:
rm -f $(CLANG_COMPLETES)
.PHONY: clang-complete