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

buildsystem: improve compatability with Ubuntu / Debian distros

Browse source
This commit is contained in:
Steffen Vogel 2017-06-17 03:15:13 +02:00
parent c1154faf40
commit 3f1bbac4e9
3 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -52,6 +52,7 @@ LDFLAGS += -L$(BUILDDIR)
# Some tools
PKGCONFIG := PKG_CONFIG_PATH=/usr/local/lib/pkgconfig:/usr/lib/pkgconfig:$(PKG_CONFIG_PATH) pkg-config
SHELL := bash
# We must compile without optimizations for gcov!
ifdef DEBUG

11
lib/Makefile.villas.inc
View file

@ -56,6 +56,9 @@ ifndef WITHOUT_NANOMSG
ifeq ($(shell $(PKGCONFIG) nanomsg; echo $$?),0)
LIB_SRCS += lib/nodes/nanomsg.c
LIB_PKGS += nanomsg
else ifeq ($(shell $(PKGCONFIG) libnanomsg; echo $$?),0)
LIB_SRCS += lib/nodes/nanomsg.c
LIB_PKGS += libnanomsg
endif
endif
@ -95,17 +98,17 @@ endif
# Enable OPAL-RT Asynchronous Process support (will result in 32bit binary!!!)
ifdef WITH_OPAL
ifneq ($(wildcard thirdparty/opal/include/AsyncApi.h),)
ifneq ($(wildcard thirdparty/libopal/include/opal/AsyncApi.h),)
LIB_OBJS += opal.o
LIB_CFLAGS += -I thirdparty/opal/include
LIB_LDFLAGS += -L/lib/i386-linux-gnu/ -L/usr/lib/i386-linux-gnu/ -Lthirdparty/opal/lib/redhawk/
LIB_CFLAGS += -I thirdparty/libopal/include/opal/
LIB_LDFLAGS += -L/lib/i386-linux-gnu/ -L/usr/lib/i386-linux-gnu/ -Lthirdparty/libopal/
LIB_LDLIBS += -lOpalAsyncApiCore -lOpalCore -lOpalUtils -lirc
# libOpalAsyncApi is a 32bit library. So we need to build everything in 32bit
CFLAGS += -m32
LDFLAGS += -m32
BUILDDIR := $(BUILDDIR)32
BUILDDIR := $(BUILDDIR)
endif
endif

2
tests/unit/Makefile.inc
View file

@ -38,7 +38,7 @@ $(BUILDDIR)/tests/unit/%.o: tests/unit/%.c $(BUILDDIR)/defines | $$(dir $$@)
# Link
$(BUILDDIR)/unit-tests: $(TEST_OBJS) $(LIB)
$(CC) $(TEST_LDFLAGS) $(TEST_LDLIBS) $^ -o $@
$(CC) $(TEST_LDFLAGS) $^ $(TEST_LDLIBS) -o $@
ifdef COVERAGE
-include tests/unit/Makefile.gcov.inc