Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
dcdb
dcdb
Commits
96bf49a5
Commit
96bf49a5
authored
Mar 05, 2019
by
Micha Mueller
Browse files
Fix bug which prevented dcdbpusher from building after repo merge
parent
e9125426
Changes
2
Hide whitespace changes
Inline
Side-by-side
dcdbpusher/Makefile
View file @
96bf49a5
...
...
@@ -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
...
...
dcdbpusher/config/global.conf
View file @
96bf49a5
...
...
@@ -12,9 +12,9 @@ global {
restAPI
{
address
localhost
:
8000
certificate
../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
privateKey
../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
dhFile
../
deps
/
openssl
-
1
.
0
.
2
l
/
crypto
/
dh
/
dh2048
.
pem
certificate
../
../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
privateKey
../
../
deps
/
openssl
-
1
.
0
.
2
l
/
certs
/
demo
/
ca
-
cert
.
pem
dhFile
../
../
deps
/
openssl
-
1
.
0
.
2
l
/
crypto
/
dh
/
dh2048
.
pem
authkey
qwertz
{
PUTReq
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment