Commit 96bf49a5 authored by Micha Müller's avatar Micha Müller

Fix bug which prevented dcdbpusher from building after repo merge

parent e9125426
......@@ -52,12 +52,10 @@ install: $(TARGET) install_lib install_analyzer
@echo " > make install_conf"
BACNET_SRC:= $(shell find $(DCDBDEPSPATH) -name "bacnet-stack-*" -type d)
src/Sensor.o: CXXFLAGS+= $(PLUGINFLAGS)
src/SensorGroup.o: CXXFLAGS+= $(PLUGINFLAGS)
sensors/%.o: CXXFLAGS+= $(PLUGINFLAGS)
sensors/bacnet/%.o: CXXFLAGS+= -I$(BACNET_SRC)/include -I$(BACNET_SRC)/ports/$(BACNET_PORT)
src/analytics/analyzers/%.o: CXXFLAGS+= $(PLUGINFLAGS)
src/analytics/SensorNavigator.o: CXXFLAGS+= $(PLUGINFLAGS)
analytics/analyzers/%.o: CXXFLAGS+= $(PLUGINFLAGS)
analytics/SensorNavigator.o: CXXFLAGS+= $(PLUGINFLAGS)
libdcdbplugin_sysfs.$(LIBEXT): sensors/sysfs/SysfsSensorGroup.o sensors/sysfs/SysfsConfigurator.o
$(CXX) $(LIBFLAGS)$@ -o $@ $^ -L$(DCDBDEPLOYPATH)/lib/ -lboost_log -lboost_system -lboost_regex
......
......@@ -12,9 +12,9 @@ global {
restAPI {
address localhost:8000
certificate ../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
privateKey ../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
dhFile ../deps/openssl-1.0.2l/crypto/dh/dh2048.pem
certificate ../../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
privateKey ../../deps/openssl-1.0.2l/certs/demo/ca-cert.pem
dhFile ../../deps/openssl-1.0.2l/crypto/dh/dh2048.pem
authkey qwertz {
PUTReq
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment