Merge pull request #24 from lsst-ts/tickets/DM-41743

Fixed makefiles

.github/workflows/changelog.yaml

@@ -0,0 +1,19 @@
+name: ChangelogUpdated
+on:
+  pull_request:
+    types: [assigned, opened, synchronize, reopened, labeled, unlabeled]
+    branches:
+      - develop
+jobs:
+  build:
+    name: Check Actions
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v1
+      - name: Changelog check
+        uses: Zomzog/[email protected]
+        with:
+          fileName: doc/version-history.rst
+          checkNotification: Simple
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

Makefile

@@ -14,11 +14,11 @@ src/libVMS.a: FORCE
 # Tool invocations
 ts-VMSd: src/ts-VMSd.cpp.o src/libVMS.a
 	@echo '[LD ] $@'
-	${co}$(CPP) $(LIBS_FLAGS) -o $@ $^ $(LIBS) ${CRIOCPP}/lib/libcRIOcpp.a
+	${co}$(CPP) $(LIBS_FLAGS) -o $@ $^ ${CRIOCPP}/lib/libcRIOcpp.a $(LIBS)
 
 # Other Targets
 clean:
-	@$(foreach file,ts_MTVMS src/ts_MTVMS.cpp.o doc *.ipk ipk, echo '[RM ] ${file}'; $(RM) -r $(file);)
+	@$(foreach file,ts_MTVMS src/ts_MTVMS.cpp.o *.ipk ipk, echo '[RM ] ${file}'; $(RM) -r $(file);)
 	@$(foreach dir,src tests,$(MAKE) -C ${dir} $@;)
 
 # file targets

Makefile.inc

@@ -12,14 +12,6 @@ else
   c_opts += -O3
 endif
 
-ifdef SIMULATOR
-  C := gcc -Wall ${c_opts}
-  CPP := g++ -std=c++14 -pedantic -Wall ${c_opts} -DSIMULATOR
-else
-  C := gcc -Wall -fmessage-length=0 ${c_opts}
-  CPP := g++ -std=c++14 -Wall -fmessage-length=0 ${c_opts}
-endif
-
 CRIOCPP := ../ts_cRIOcpp/
 
 BOOST_CPPFLAGS := -I/usr/include/boost169
@@ -36,12 +28,25 @@ SAL_CPPFLAGS := $(shell pkg-config yaml-cpp --cflags $(silence)) \
 
 LIBS := $(shell pkg-config yaml-cpp --libs $(silence)) \
         $(shell pkg-config fmt --libs $(silence)) \
-        $(shell pkg-config spdlog --libs $(silence)) \
         $(shell pkg-config fftw3 --libs $(silence)) \
         -ldl -ldcpssacpp -ldcpsgapi -lddsuser -lddskernel \
         -lpthread -lddsserialization -lddsconfparser -lddsconf \
         -lddsdatabase -lddsutil -lddsos \
-        ${SAL_WORK_DIR}/lib/libSAL_MTVMS.a
+        ${SAL_WORK_DIR}/lib/libSAL_MTVMS.a \
+        -lreadline
+
+C := gcc -Wall ${c_opts}
+CPP := g++ --std=c++17 -Wall -fPIE ${c_opts}
+
+# Simulator is dynamicaly linked, distribution uses static linking
+ifdef SIMULATOR
+  CPP += -pedantic -DSIMULATOR
+  LIBS += $(shell pkg-config spdlog --libs $(silence))
+else
+  C += -fmessage-length=0
+  CPP += -fmessage-length=0 -ldl
+  LIBS += $(shell pkg-config spdlog --libs $(silence) | sed -E 's/-l([a-z0-9]*)/-l:lib\1.a/g')
+endif
 
 LIBS_FLAGS += -L"${OSPL_HOME}/lib" -L"${LSST_SDK_INSTALL}/lib"
 

doc/version-history.rst

@@ -0,0 +1,20 @@
+.. _Version_History:
+
+===============
+Version History
+===============
+
+v1.1.1
+======
+
+* updated build system
+
+v1.1.0
+======
+
+* improved data readout - in-CSC PSD calculations
+
+v1.0.0
+=======
+
+* First release of the Vibration Monitoring System CSC