Commit fb4d0045 authored by Axel Auweter's avatar Axel Auweter
Browse files

Merge branch 'master' of ssh://lu32joj@lxlogin1.lrz.de/home/hpc/pr28fa/lu32joj/dcdb.git

Conflicts:
	FileSpewer/FileSpewer.cpp
parents 9c69a284 21c59bb0
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
#include <unistd.h> #include <unistd.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <linux/limits.h>
#include "Settings.h" #include "Settings.h"
#include "mosquitto.h" #include "mosquitto.h"
......
...@@ -2,7 +2,7 @@ CXXFLAGS = -O2 -g -Wall -Werror -fmessage-length=0 -I../../mosquitto-1.1/lib/ ...@@ -2,7 +2,7 @@ CXXFLAGS = -O2 -g -Wall -Werror -fmessage-length=0 -I../../mosquitto-1.1/lib/
OBJS = FileSpewer.o Settings.o OBJS = FileSpewer.o Settings.o
LIBS = -L../../mosquitto-1.1/lib/ -lmosquitto LIBS = -L../../mosquitto-1.1/lib/ -lmosquitto -lssl -lcrypto -pthread
TARGET = FileSpewer TARGET = FileSpewer
......
Supports Markdown
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