From 32d8a04ad5e415d78d178c3f5759c969c7369083 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Mon, 22 Aug 2011 21:51:30 +0200 Subject: [PATCH] [lib-result] Rename to libowlps-resultreader After all, this is not really UDP-specific. --- Makefile | 12 ++++++------ .../Makefile | 4 ++-- .../libowlps-resultreader.c | 2 +- .../owlps-resultreader-udp.c | 2 +- .../owlps-resultreader.h | 0 owlps-udp-to-http/Makefile | 8 ++++---- owlps-udp-to-http/owlps-udp-to-http.h | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) rename {libowlps-resultreader-udp => libowlps-resultreader}/Makefile (95%) rename libowlps-resultreader-udp/libowlps-resultreader-udp.c => libowlps-resultreader/libowlps-resultreader.c (99%) rename {libowlps-resultreader-udp => libowlps-resultreader}/owlps-resultreader-udp.c (96%) rename libowlps-resultreader-udp/owlps-resultreader-udp.h => libowlps-resultreader/owlps-resultreader.h (100%) diff --git a/Makefile b/Makefile index cb3fca4..f361a9f 100644 --- a/Makefile +++ b/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 diff --git a/libowlps-resultreader-udp/Makefile b/libowlps-resultreader/Makefile similarity index 95% rename from libowlps-resultreader-udp/Makefile rename to libowlps-resultreader/Makefile index 10b8b9d..14fd90f 100644 --- a/libowlps-resultreader-udp/Makefile +++ b/libowlps-resultreader/Makefile @@ -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 diff --git a/libowlps-resultreader-udp/libowlps-resultreader-udp.c b/libowlps-resultreader/libowlps-resultreader.c similarity index 99% rename from libowlps-resultreader-udp/libowlps-resultreader-udp.c rename to libowlps-resultreader/libowlps-resultreader.c index 96d2320..d3602ab 100644 --- a/libowlps-resultreader-udp/libowlps-resultreader-udp.c +++ b/libowlps-resultreader/libowlps-resultreader.c @@ -1,4 +1,4 @@ -#include "owlps-resultreader-udp.h" +#include "owlps-resultreader.h" #include #include diff --git a/libowlps-resultreader-udp/owlps-resultreader-udp.c b/libowlps-resultreader/owlps-resultreader-udp.c similarity index 96% rename from libowlps-resultreader-udp/owlps-resultreader-udp.c rename to libowlps-resultreader/owlps-resultreader-udp.c index e8bfbb2..d0476e1 100644 --- a/libowlps-resultreader-udp/owlps-resultreader-udp.c +++ b/libowlps-resultreader/owlps-resultreader-udp.c @@ -5,7 +5,7 @@ * (see the Makefile). */ -#include "owlps-resultreader-udp.h" +#include "owlps-resultreader.h" #include #include diff --git a/libowlps-resultreader-udp/owlps-resultreader-udp.h b/libowlps-resultreader/owlps-resultreader.h similarity index 100% rename from libowlps-resultreader-udp/owlps-resultreader-udp.h rename to libowlps-resultreader/owlps-resultreader.h diff --git a/owlps-udp-to-http/Makefile b/owlps-udp-to-http/Makefile index fa93d9b..afe8558 100644 --- a/owlps-udp-to-http/Makefile +++ b/owlps-udp-to-http/Makefile @@ -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 \ diff --git a/owlps-udp-to-http/owlps-udp-to-http.h b/owlps-udp-to-http/owlps-udp-to-http.h index f504fce..9ceb98a 100644 --- a/owlps-udp-to-http/owlps-udp-to-http.h +++ b/owlps-udp-to-http/owlps-udp-to-http.h @@ -1,7 +1,7 @@ #ifndef _OWLPS_UDP_TO_HTTP_H_ #define _OWLPS_UDP_TO_HTTP_H_ -#include +#include #define TCP_PORT 8080 #define NB_CONNECTIONS 1