aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuca Deri <deri@ntop.org>2019-07-23 22:45:31 +0200
committerLuca Deri <deri@ntop.org>2019-07-23 22:45:31 +0200
commitd398b0aba68df1fbd441677f29c446d05ec0abff (patch)
tree58d6e89bc25c51f7c020e7efb71fde25342d1569
parent8ff68a58f22c09bf7317f84edd3f666601d9266a (diff)
Simplified makefile
Fixed warning
-rw-r--r--src/lib/Makefile.in2
-rw-r--r--src/lib/ndpi_classify.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index 3b7dac796..1a884ac9d 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -17,7 +17,7 @@ CC = @CC@
CFLAGS += -fPIC -DPIC -I../include -Ithird_party/include -DNDPI_LIB_COMPILATION -O2 -g -Wall
RANLIB = ranlib
-OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) ndpi_main.o ndpi_utils.o ndpi_classify.o
+OBJECTS = $(patsubst protocols/%.c, protocols/%.o, $(wildcard protocols/*.c)) $(patsubst third_party/src/%.c, third_party/src/%.o, $(wildcard third_party/src/*.c)) $(patsubst ./%.c, ./%.o, $(wildcard ./*.c))
HEADERS = $(wildcard ../include/*.h)
NDPI_VERSION_MAJOR = @NDPI_MAJOR@
NDPI_LIB_STATIC = libndpi.a
diff --git a/src/lib/ndpi_classify.c b/src/lib/ndpi_classify.c
index 09bf7ffcf..abaaa08bd 100644
--- a/src/lib/ndpi_classify.c
+++ b/src/lib/ndpi_classify.c
@@ -669,5 +669,5 @@ ndpi_log_timestamp(char *log_ts)
nowtime = tv.tv_sec;
localtime_r(&nowtime, &nowtm_r);
strftime(tmbuf, NDPI_TIMESTAMP_LEN, "%H:%M:%S", &nowtm_r);
- snprintf(log_ts, NDPI_TIMESTAMP_LEN, "%s.%06ld", tmbuf, tv.tv_usec);
+ snprintf(log_ts, NDPI_TIMESTAMP_LEN, "%s.%06ld", tmbuf, (long)tv.tv_usec);
}