mcy
/
owlps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[lib-result] Rename to libowlps-resultreader 

After all, this is not really UDP-specific.
This commit is contained in:
Matteo Cypriani 2011-08-22 21:51:30 +02:00
parent 3a38d2bc1e
commit 32d8a04ad5
7 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -2,7 +2,7 @@
all c clean purge help \ all c clean purge help \
libowlps \ libowlps \
libowlps-client \ libowlps-client \
libowlps-resultreader-udp \ libowlps-resultreader \
owlps-client \ owlps-client \
owlps-listener \ owlps-listener \
owlps-aggregator \ owlps-aggregator \
@ -30,7 +30,7 @@ all: \
c: \ c: \
libowlps \ libowlps \
libowlps-client \ libowlps-client \
libowlps-resultreader-udp \ libowlps-resultreader \
owlps-client \ owlps-client \
owlps-listener \ owlps-listener \
owlps-aggregator \ owlps-aggregator \
@ -40,7 +40,7 @@ libowlps:
@make -C $@ @make -C $@
libowlps-client: libowlps libowlps-client: libowlps
@make -C $@ @make -C $@
libowlps-resultreader-udp: libowlps libowlps-resultreader: libowlps
@make -C $@ @make -C $@
owlps-client: libowlps libowlps-client owlps-client: libowlps libowlps-client
@make -C $@ @make -C $@
@ -48,7 +48,7 @@ owlps-listener: libowlps libowlps-client
@make -C $@ @make -C $@
owlps-aggregator: libowlps owlps-aggregator: libowlps
@make -C $@ @make -C $@
owlps-udp-to-http: libowlps libowlps-resultreader-udp owlps-udp-to-http: libowlps libowlps-resultreader
@make -C $@ @make -C $@
owlps-positioning: libowlps owlps-positioning: libowlps
@make -C $@ @make -C $@
@ -107,7 +107,7 @@ uninstall-owlps-positioning:
clean : clean :
@make -C libowlps clean @make -C libowlps clean
@make -C libowlps-client 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-client clean
@make -C owlps-listener clean @make -C owlps-listener clean
@make -C owlps-aggregator clean @make -C owlps-aggregator clean
@ -117,7 +117,7 @@ clean :
purge : purge :
@make -C libowlps purge @make -C libowlps purge
@make -C libowlps-client 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-client purge
@make -C owlps-listener purge @make -C owlps-listener purge
@make -C owlps-aggregator purge @make -C owlps-aggregator purge

4
libowlps-resultreader-udp/Makefile → libowlps-resultreader/Makefile
View File

@ -10,12 +10,12 @@ RANLIB = ranlib
RM = rm -f RM = rm -f
# Variables générales # Variables générales
LIB_CIBLE = libowlps-resultreader-udp LIB_CIBLE = libowlps-resultreader
VERSION = 1.0 VERSION = 1.0
# Cibles à construire # Cibles à construire
STATIC = $(LIB_CIBLE).a STATIC = $(LIB_CIBLE).a
HEADER = owlps-resultreader-udp.h HEADER = owlps-resultreader.h
EXAMPLE = owlps-resultreader-udp EXAMPLE = owlps-resultreader-udp
# Composition de la bibliothèque # Composition de la bibliothèque

2
libowlps-resultreader-udp/libowlps-resultreader-udp.c → libowlps-resultreader/libowlps-resultreader.c
View File

@ -1,4 +1,4 @@
#include "owlps-resultreader-udp.h" #include "owlps-resultreader.h"
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>

2
libowlps-resultreader-udp/owlps-resultreader-udp.c → libowlps-resultreader/owlps-resultreader-udp.c
View File

@ -5,7 +5,7 @@
* (see the Makefile). * (see the Makefile).
*/ */
#include "owlps-resultreader-udp.h" #include "owlps-resultreader.h"
#include <signal.h> #include <signal.h>
#include <unistd.h> #include <unistd.h>

0
libowlps-resultreader-udp/owlps-resultreader-udp.h → libowlps-resultreader/owlps-resultreader.h
View File

8
owlps-udp-to-http/Makefile
View File

@ -26,9 +26,9 @@ HEADER =
# Flags # Flags
LIBOWLPS_DIR = ../libowlps LIBOWLPS_DIR = ../libowlps
LIBOWLPSRESULTREADERUDP_DIR = ../libowlps-resultreader-udp LIBOWLPSRESULTREADER_DIR = ../libowlps-resultreader
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSRESULTREADERUDP_DIR) -I$(LIBOWLPS_DIR) -I$(LIBOWLPSRESULTREADER_DIR)
#CFLAGS += -g -O0 #CFLAGS += -g -O0
DEPFLAGS = -MMD DEPFLAGS = -MMD
XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
@ -36,7 +36,7 @@ PICFLAG = -fPIC
OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\"
OWLPSFLAGS += -D DEBUG OWLPSFLAGS += -D DEBUG
LIBS = -pthread -L$(LIBOWLPS_DIR) -lowlps \ LIBS = -pthread -L$(LIBOWLPS_DIR) -lowlps \
-L$(LIBOWLPSRESULTREADERUDP_DIR) -lowlps-resultreader-udp -L$(LIBOWLPSRESULTREADER_DIR) -lowlps-resultreader
OS := $(shell uname) OS := $(shell uname)
ifeq ("$(OS)", "Linux") ifeq ("$(OS)", "Linux")
@ -94,7 +94,7 @@ purge : clean
help : help :
@echo "Bibliothèques nécessaires à la compilation :" @echo "Bibliothèques nécessaires à la compilation :"
@echo " libowlps1.0 (fournie)" @echo " libowlps1.0 (fournie)"
@echo " libowlps-resultreader-udp1.0 (fournie)" @echo " libowlps-resultreader1.0 (fournie)"
@echo @echo
@echo "Cibles possibles :" @echo "Cibles possibles :"
@echo " $(TARGET) (cible par défaut) : Compile le programme \ @echo " $(TARGET) (cible par défaut) : Compile le programme \

2
owlps-udp-to-http/owlps-udp-to-http.h
View File

@ -1,7 +1,7 @@
#ifndef _OWLPS_UDP_TO_HTTP_H_ #ifndef _OWLPS_UDP_TO_HTTP_H_
#define _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 TCP_PORT 8080
#define NB_CONNECTIONS 1 #define NB_CONNECTIONS 1