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

fixes for new build-system

Browse source
This commit is contained in:
Steffen Vogel 2017-07-25 12:40:05 +02:00
parent 4af0dd6584
commit cc02829def
4 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/villas/list.h
View file

@ -30,11 +30,11 @@
}
#define LIST_INIT_STATIC(l) \
__attribute__((constructor(100))) static void UNIQUE(__ctor)() {\
__attribute__((constructor(105))) static void UNIQUE(__ctor)() {\
if ((l)->state == STATE_DESTROYED) \
list_init(l); \
} \
__attribute__((destructor(100))) static void UNIQUE(__dtor)() { \
__attribute__((destructor(105))) static void UNIQUE(__dtor)() { \
list_destroy(l, NULL, false); \
}

7
lib/nodes/Makefile.inc
View file

@ -26,7 +26,6 @@ ifeq ($(PLATFORM),Linux)
WITH_FILE ?= 1
WITH_SIGNAL ?= 1
WITH_NGSI ?= 1
WITH_TEST_RTT ?= 1
WITH_FPGA ?= 1
endif
@ -54,12 +53,6 @@ ifeq ($(WITH_SIGNAL),1)
LIB_CFLAGS += -DWITH_SIGNAL
endif
# Enable RTT test node-type
ifeq ($(WITH_TEST_RTT),1)
LIB_SRCS += lib/nodes/test_rtt.c
LIB_CFLAGS += -DWITH_TEST_RTT
endif
# Enable VILLASfpga support when libxil is available
ifeq ($(WITH_FPGA),1)
ifeq ($(shell $(PKGCONFIG) libxil; echo $$?),0)

6
src/Makefile.inc
View file

@ -33,6 +33,12 @@ SRC_LDLIBS = $(LDLIBS) -pthread -lm -lvillas
SRC_CFLAGS = $(CFLAGS)
SRC_LDFLAGS = $(LDFLAGS) -Wl,-rpath,'$$ORIGIN'
ifeq ($(WITH_WEB),1)
ifeq ($(WITH_WEBSOCKET),1)
SRC_CFLAGS += -DWITH_WEBSOCKET
endif
endif
# Enable VILLASfpga support when libxil is available
ifeq ($(shell $(PKGCONFIG) libxil; echo $$?),0)
LIB_SRCS += $(addprefix lib/nodes/, fpga.c)

6
src/pipe.c
View file

@ -266,11 +266,9 @@ check: if (optarg == endptr)
if (!node)
error("Node '%s' does not exist!", nodestr);
#ifdef WITH_WEBSOCKETS
if (node->_vt->start == websocket_start) {
#ifdef WITH_WEBSOCKET
if (node->_vt->start == websocket_start)
web_start(&sn.web);
api_start(&sn.api);
}
#endif
if (reverse)