lauchmelder/b15f
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add wrapper to makefile

Browse source
This commit is contained in:
Robert Altner 2022-12-06 19:15:12 +01:00
parent 5c3f2991c7
commit c9b75ce062
2 changed files with 25 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
control/src/Makefile
View file

@ -6,8 +6,9 @@
# Änderungen veröffentlichen, vorher nochmal: make clean && make && make doc && make clean && make doc && make # Änderungen veröffentlichen, vorher nochmal: make clean && make && make doc && make clean && make doc && make
# Environment # Environment
PATH_COMPILER = g++ PATH_COMPILER = g++
PATH_DOXYGEN = ../bin/doxygen PATH_DOXYGEN = ../bin/doxygen
PATH_AR = ar
# install paths # install paths
PATH_BIN = /usr/bin/ PATH_BIN = /usr/bin/
@ -19,23 +20,25 @@ PATH_TMP_BIN = ../bin/
PATH_TMP_LIB = ../lib/ PATH_TMP_LIB = ../lib/
# outputs # outputs
OUT_TMP_DRV = $(PATH_TMP_LIB)/libb15fdrv.so OUT_TMP_DRV = $(PATH_TMP_LIB)/libb15fdrv.so
OUT_TMP_CLI = $(PATH_TMP_BIN)/b15fcli OUT_TMP_CLI = $(PATH_TMP_BIN)/b15fcli
OUT_TMP_PLOTTY = $(PATH_TMP_BIN)/plotty OUT_TMP_WRAPPER = $(PATH_TMP_LIB)/libb15f.a
OUT_DRV = $(PATH_LIB)/libb15fdrv.so OUT_TMP_PLOTTY = $(PATH_TMP_BIN)/plotty
OUT_CLI = $(PATH_BIN)/b15fcli OUT_DRV = $(PATH_LIB)/libb15fdrv.so
OUT_PLOTTY = $(PATH_BIN)/plotty OUT_CLI = $(PATH_BIN)/b15fcli
OUT_DOC = ../../docs/html OUT_WRAPPER = $(PATH_LIB)/libb15f.a
OUT_PLOTTY = $(PATH_BIN)/plotty
OUT_DOC = ../../docs/html
# compiling & linking parameters # compiling & linking parameters
CFLAGS = -std=c++14 -O3 -Wall -Wextra -fPIC CFLAGS = -std=c++14 -O3 -Wall -Wextra -fPIC
LDFLAGS_DRV = -lcurses -lpthread LDFLAGS_DRV = -lcurses -lpthread
LDFLAGS_CLI = $(LDFLAGS_DRV) -lb15fdrv LDFLAGS_CLI = $(LDFLAGS_DRV) -lb15fdrv
# objects # objects
OBJECTS_DRV = drv/usart.o drv/b15f.o drv/plottyfile.o drv/dot.o OBJECTS_DRV = drv/usart.o drv/b15f.o drv/plottyfile.o drv/dot.o
OBJECTS_CLI = cli.o ui/view.o ui/view_selection.o ui/view_promt.o ui/view_info.o ui/view_monitor.o ui/ui.o OBJECTS_CLI = cli.o ui/view.o ui/view_selection.o ui/view_promt.o ui/view_info.o ui/view_monitor.o ui/ui.o
OBJECTS_WRAPPER = wrapper/b15f.o
# *** TARGETS *** # *** TARGETS ***
@ -46,6 +49,7 @@ all: drv cli
drv: commit_hash $(OBJECTS_DRV) $(OUT_TMP_DRV) drv: commit_hash $(OBJECTS_DRV) $(OUT_TMP_DRV)
wrapper: drv $(OBJECTS_WRAPPER) $(OUT_TMP_WRAPPER)
cli: drv $(OBJECTS_CLI) cli: drv $(OBJECTS_CLI)
@echo "Linking cli..." @echo "Linking cli..."
@ -63,6 +67,11 @@ $(OUT_TMP_DRV):
@mkdir -p ../lib @mkdir -p ../lib
$(PATH_COMPILER) $(CFLAGS) $(OBJECTS_DRV) -shared -o $(OUT_TMP_DRV) $(LDFLAGS_CLI_DRV) $(PATH_COMPILER) $(CFLAGS) $(OBJECTS_DRV) -shared -o $(OUT_TMP_DRV) $(LDFLAGS_CLI_DRV)
$(OUT_TMP_WRAPPER):
@echo "Linking wrapper library..."
@mkdir -p ../lib
ar rcs $(OUT_TMP_WRAPPER) $(OBJECTS_WRAPPER)
style: style:
@echo "Formatting source code with astyle..." @echo "Formatting source code with astyle..."
-astyle --recursive --style=allman *.cpp,*.h,*.c,*.hpp -astyle --recursive --style=allman *.cpp,*.h,*.c,*.hpp

2
control/src/drv/commit_hash.h
View file

@ -1,4 +1,4 @@
#ifndef COMMIT_HASH_H #ifndef COMMIT_HASH_H
#define COMMIT_HASH_H #define COMMIT_HASH_H
const char COMMIT_HASH[] = "bc459c80cec755d7df2c11a807d74e085cbed332"; const char COMMIT_HASH[] = "5c3f2991c7525897cbded38f62b14a7bd75df941";
#endif // COMMIT_HASH_H #endif // COMMIT_HASH_H