[lib-result] Rename to libowlps-resultreader
After all, this is not really UDP-specific.
This commit is contained in:
parent
3a38d2bc1e
commit
32d8a04ad5
12
Makefile
12
Makefile
|
@ -2,7 +2,7 @@
|
|||
all c clean purge help \
|
||||
libowlps \
|
||||
libowlps-client \
|
||||
libowlps-resultreader-udp \
|
||||
libowlps-resultreader \
|
||||
owlps-client \
|
||||
owlps-listener \
|
||||
owlps-aggregator \
|
||||
|
@ -30,7 +30,7 @@ all: \
|
|||
c: \
|
||||
libowlps \
|
||||
libowlps-client \
|
||||
libowlps-resultreader-udp \
|
||||
libowlps-resultreader \
|
||||
owlps-client \
|
||||
owlps-listener \
|
||||
owlps-aggregator \
|
||||
|
@ -40,7 +40,7 @@ libowlps:
|
|||
@make -C $@
|
||||
libowlps-client: libowlps
|
||||
@make -C $@
|
||||
libowlps-resultreader-udp: libowlps
|
||||
libowlps-resultreader: libowlps
|
||||
@make -C $@
|
||||
owlps-client: libowlps libowlps-client
|
||||
@make -C $@
|
||||
|
@ -48,7 +48,7 @@ owlps-listener: libowlps libowlps-client
|
|||
@make -C $@
|
||||
owlps-aggregator: libowlps
|
||||
@make -C $@
|
||||
owlps-udp-to-http: libowlps libowlps-resultreader-udp
|
||||
owlps-udp-to-http: libowlps libowlps-resultreader
|
||||
@make -C $@
|
||||
owlps-positioning: libowlps
|
||||
@make -C $@
|
||||
|
@ -107,7 +107,7 @@ uninstall-owlps-positioning:
|
|||
clean :
|
||||
@make -C libowlps clean
|
||||
@make -C libowlps-client clean
|
||||
@make -C libowlps-resultreader-udp clean
|
||||
@make -C libowlps-resultreader clean
|
||||
@make -C owlps-client clean
|
||||
@make -C owlps-listener clean
|
||||
@make -C owlps-aggregator clean
|
||||
|
@ -117,7 +117,7 @@ clean :
|
|||
purge :
|
||||
@make -C libowlps purge
|
||||
@make -C libowlps-client purge
|
||||
@make -C libowlps-resultreader-udp purge
|
||||
@make -C libowlps-resultreader purge
|
||||
@make -C owlps-client purge
|
||||
@make -C owlps-listener purge
|
||||
@make -C owlps-aggregator purge
|
||||
|
|
|
@ -10,12 +10,12 @@ RANLIB = ranlib
|
|||
RM = rm -f
|
||||
|
||||
# Variables générales
|
||||
LIB_CIBLE = libowlps-resultreader-udp
|
||||
LIB_CIBLE = libowlps-resultreader
|
||||
VERSION = 1.0
|
||||
|
||||
# Cibles à construire
|
||||
STATIC = $(LIB_CIBLE).a
|
||||
HEADER = owlps-resultreader-udp.h
|
||||
HEADER = owlps-resultreader.h
|
||||
EXAMPLE = owlps-resultreader-udp
|
||||
|
||||
# Composition de la bibliothèque
|
|
@ -1,4 +1,4 @@
|
|||
#include "owlps-resultreader-udp.h"
|
||||
#include "owlps-resultreader.h"
|
||||
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
|
@ -5,7 +5,7 @@
|
|||
* (see the Makefile).
|
||||
*/
|
||||
|
||||
#include "owlps-resultreader-udp.h"
|
||||
#include "owlps-resultreader.h"
|
||||
|
||||
#include <signal.h>
|
||||
#include <unistd.h>
|
|
@ -26,9 +26,9 @@ HEADER =
|
|||
|
||||
# Flags
|
||||
LIBOWLPS_DIR = ../libowlps
|
||||
LIBOWLPSRESULTREADERUDP_DIR = ../libowlps-resultreader-udp
|
||||
LIBOWLPSRESULTREADER_DIR = ../libowlps-resultreader
|
||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSRESULTREADERUDP_DIR)
|
||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSRESULTREADER_DIR)
|
||||
#CFLAGS += -g -O0
|
||||
DEPFLAGS = -MMD
|
||||
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
||||
|
@ -36,7 +36,7 @@ PICFLAG = -fPIC
|
|||
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
|
||||
OWLPSFLAGS += -D DEBUG
|
||||
LIBS = -pthread -L$(LIBOWLPS_DIR) -lowlps \
|
||||
-L$(LIBOWLPSRESULTREADERUDP_DIR) -lowlps-resultreader-udp
|
||||
-L$(LIBOWLPSRESULTREADER_DIR) -lowlps-resultreader
|
||||
|
||||
OS := $(shell uname)
|
||||
ifeq ("$(OS)", "Linux")
|
||||
|
@ -94,7 +94,7 @@ purge : clean
|
|||
help :
|
||||
@echo "Bibliothèques nécessaires à la compilation :"
|
||||
@echo " libowlps1.0 (fournie)"
|
||||
@echo " libowlps-resultreader-udp1.0 (fournie)"
|
||||
@echo " libowlps-resultreader1.0 (fournie)"
|
||||
@echo
|
||||
@echo "Cibles possibles :"
|
||||
@echo " $(TARGET) (cible par défaut) : Compile le programme \
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _OWLPS_UDP_TO_HTTP_H_
|
||||
#define _OWLPS_UDP_TO_HTTP_H_
|
||||
|
||||
#include <owlps-resultreader-udp.h>
|
||||
#include <owlps-resultreader.h>
|
||||
|
||||
#define TCP_PORT 8080
|
||||
#define NB_CONNECTIONS 1
|
||||
|
|
Loading…
Reference in New Issue