From a72a76d5a96e59528b2ac418974aad95fce221c4 Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Thu, 17 Mar 2011 16:55:01 +0100 Subject: [PATCH] mv /infrastructure-centred/* / Get rid of the infrastructure-centred directory: all the modules are now at the same level. --- Makefile | 142 ++++++++++++------ infrastructure-centred/Makefile | 89 ----------- .../Makefile | 2 +- .../Makefile_atheros | 2 +- .../libowlps-client.c | 0 .../owlps-client.h | 0 libowlps/Makefile | 2 +- libowlps/Makefile_atheros | 2 +- .../Makefile | 2 +- .../owlps-aggregator.h | 0 .../owlps-aggregatord.c | 0 .../owlps-client => owlps-client}/Makefile | 2 +- .../Makefile_atheros | 2 +- .../Makefile_atheros_openwrt-10.03 | 2 +- .../owlps-client.c | 0 .../Makefile | 2 +- .../Makefile_atheros | 2 +- .../owlps-listener.h | 0 .../owlps-listenerd.c | 0 19 files changed, 110 insertions(+), 141 deletions(-) delete mode 100644 infrastructure-centred/Makefile rename {infrastructure-centred/libowlps-client => libowlps-client}/Makefile (97%) rename {infrastructure-centred/libowlps-client => libowlps-client}/Makefile_atheros (97%) rename {infrastructure-centred/libowlps-client => libowlps-client}/libowlps-client.c (100%) rename {infrastructure-centred/libowlps-client => libowlps-client}/owlps-client.h (100%) rename {infrastructure-centred/owlps-aggregator => owlps-aggregator}/Makefile (98%) rename {infrastructure-centred/owlps-aggregator => owlps-aggregator}/owlps-aggregator.h (100%) rename {infrastructure-centred/owlps-aggregator => owlps-aggregator}/owlps-aggregatord.c (100%) rename {infrastructure-centred/owlps-client => owlps-client}/Makefile (98%) rename {infrastructure-centred/owlps-client => owlps-client}/Makefile_atheros (99%) rename {infrastructure-centred/owlps-client => owlps-client}/Makefile_atheros_openwrt-10.03 (99%) rename {infrastructure-centred/owlps-client => owlps-client}/owlps-client.c (100%) rename {infrastructure-centred/owlps-listener => owlps-listener}/Makefile (98%) rename {infrastructure-centred/owlps-listener => owlps-listener}/Makefile_atheros (98%) rename {infrastructure-centred/owlps-listener => owlps-listener}/owlps-listener.h (100%) rename {infrastructure-centred/owlps-listener => owlps-listener}/owlps-listenerd.c (100%) diff --git a/Makefile b/Makefile index 5877b49..88cd3e5 100644 --- a/Makefile +++ b/Makefile @@ -1,75 +1,133 @@ -.PHONY : all libowlps owlps-positioning clean purge help install install-libowlps install-infrastructure-centred uninstall uninstall-libowlps uninstall-infrastructure-centred +.PHONY: \ + all clean purge help \ + libowlps \ + libowlps-client \ + owlps-client \ + owlps-listener \ + owlps-aggregator \ + owlps-positioning \ + install \ + install-owlps-client \ + install-owlps-listener \ + install-owlps-aggregator \ + install-owlps-positioning \ + uninstall \ + uninstall-owlps-client \ + uninstall-owlps-listener \ + uninstall-owlps-aggregator \ + uninstall-owlps-positioning ## Compilation ## -all : libowlps owlps-positioning infrastructure-centred +all: \ + libowlps \ + libowlps-client \ + owlps-client \ + owlps-listener \ + owlps-aggregator \ + owlps-positioning -libowlps : - @make -C libowlps +libowlps: + @make -C $@ +libowlps-client: libowlps + @make -C $@ +owlps-client: libowlps libowlps-client + @make -C $@ +owlps-listener: libowlps libowlps-client + @make -C $@ +owlps-aggregator: libowlps + @make -C $@ +owlps-positioning: + @make -C $@ -owlps-positioning : - @make -C owlps-positioning - -infrastructure-centred : libowlps - @make -C infrastructure-centred ## Installation ## -install : install-libowlps install-owlps-positioning install-infrastructure-centred +install : \ + install-libowlps \ + install-owlps-client \ + install-owlps-listener \ + install-owlps-aggregator \ + install-owlps-positioning -install-libowlps : - @make -C libowlps install +install-libowlps: + @make -C $(subst install-,,$@) install +install-owlps-client: install-libowlps + @make -C $(subst install-,,$@) install +install-owlps-listener: install-libowlps + @make -C $(subst install-,,$@) install +install-owlps-aggregator: install-libowlps + @make -C $(subst install-,,$@) install +install-owlps-positioning: + @make -C $(subst install-,,$@) install -install-owlps-positioning : - @make -C owlps-positioning install -install-infrastructure-centred : install-libowlps - @make -C infrastructure-centred install +## Uninstallation ## -## Désinstallation ## +uninstall : \ + uninstall-libowlps \ + uninstall-owlps-client \ + uninstall-owlps-listener \ + uninstall-owlps-aggregator \ + uninstall-owlps-positioning -uninstall : uninstall-libowlps uninstall-infrastructure-centred +uninstall-libowlps: + @make -C $(subst uninstall-,,$@) uninstall +uninstall-owlps-client: + @make -C $(subst uninstall-,,$@) uninstall +uninstall-owlps-listener: + @make -C $(subst uninstall-,,$@) uninstall +uninstall-owlps-aggregator: + @make -C $(subst uninstall-,,$@) uninstall +uninstall-owlps-positioning: + @make -C $(subst uninstall-,,$@) uninstall -uninstall-libowlps : uninstall-infrastructure-centred - @make -C libowlps uninstall -uninstall-owlps-positioning : - @make -C owlps-positioning uninstall - -uninstall-infrastructure-centred : - @make -C infrastructure-centred uninstall - -## Nettoyage ## +## Cleaning ## clean : @make -C libowlps clean + @make -C libowlps-client clean + @make -C owlps-client clean + @make -C owlps-listener clean + @make -C owlps-aggregator clean @make -C owlps-positioning clean - @make -C infrastructure-centred clean purge : @make -C libowlps purge + @make -C libowlps-client purge + @make -C owlps-client purge + @make -C owlps-listener purge + @make -C owlps-aggregator purge @make -C owlps-positioning purge - @make -C infrastructure-centred purge -## Aide ## + +## Help ## help : - @echo -e "Bibliothèques nécessaires à la compilation :\n\ + @echo -e "Needed libraries:\n\ + libiw-dev\n\ libpcap0.8-dev\n\ libconfuse-dev\n\ - libiw-dev\n\ + libboost-dev\n\ + libboost-program-options-dev\n\ \n\ - Cibles possibles :\n\ - all (cible par défaut) : Compile tous les modules.\n\ - : Compile uniquement le module (et ses dépendances).\n\ + Targets:\n\ + all (default target): Compile all the modules.\n\ + : Compile only the given module (and its \ + dependencies).\n\ \n\ - install : Installe tous les modules.\n\ - install- : Installe uniquement le module (et ses dépendances).\n\ + install: Install all the modules.\n\ + install-: Install only the given module (and its \ + dependencies).\n\ \n\ - uninstall : Désinstalle tous les modules.\n\ - uninstall- : Désinstalle uniquement le module (et ses dépendances).\n\ + uninstall: Remove all the modules.\n\ + uninstall-: Remove only the given module (and its \ + dependencies).\n\ \n\ - clean : Supprime les fichiers temporaires.\n\ - purge : Supprime le résultat de la compilation.\n\ + clean: Remove temporary files.\n\ + purge: Remove compiled programs as well as temporary \ + files.\n\ \n\ - Note : l'installation se fait dans l'arborescence /usr/local. Modifiez la variable PREFIX de chaque Makefile pour changer ce comportement." + Note: Files are installed under /usr/local. Tune the PREFIX \ + variable in the Makefile to change that." diff --git a/infrastructure-centred/Makefile b/infrastructure-centred/Makefile deleted file mode 100644 index 494859f..0000000 --- a/infrastructure-centred/Makefile +++ /dev/null @@ -1,89 +0,0 @@ -.PHONY : \ - all clean purge help \ - owlps-aggregator libowlps-client owlps-listener owlps-client \ - install install-owlps-aggregator \ - install-owlps-listener install-owlps-client \ - uninstall uninstall-owlps-aggregator \ - uninstall-owlps-listener uninstall-owlps-client - -## Compilation ## - -all : owlps-aggregator libowlps-client owlps-listener owlps-client - -owlps-aggregator : - @make -C $@ - -libowlps-client : - @make -C $@ -owlps-listener : - @make -C $@ - -owlps-client : - @make -C $@ - -## Installation ## - -install : \ - install-owlps-aggregator \ - install-owlps-listener install-owlps-client - -install-owlps-aggregator : - @make -C $(subst install-,,$@) install - -install-owlps-listener : - @make -C $(subst install-,,$@) install - -install-owlps-client : - @make -C $(subst install-,,$@) install - -## Désinstallation ## - -uninstall : \ - uninstall-owlps-aggregator \ - uninstall-owlps-listener uninstall-owlps-client - -uninstall-owlps-aggregator : - @make -C $(subst uninstall-,,$@) uninstall - -uninstall-owlps-listener : - @make -C $(subst uninstall-,,$@) uninstall - -uninstall-owlps-client : - @make -C $(subst uninstall-,,$@) uninstall - -## Nettoyage ## - -clean : - @make -C owlps-aggregator clean - @make -C libowlps-client clean - @make -C owlps-listener clean - @make -C owlps-client clean - -purge : - @make -C owlps-aggregator purge - @make -C libowlps-client purge - @make -C owlps-listener purge - @make -C owlps-client purge - -## Aide ## - -help : - @echo -e "Bibliothèques nécessaires à la compilation :\n\ - libpcap0.8-dev\n\ - libconfuse-dev\n\ - libowlps1.0 (fournie)\n\ - \n\ - Cibles possibles :\n\ - all (cible par défaut) : Compile tous les modules.\n\ - : Compile uniquement le module (et ses dépendances).\n\ - \n\ - install : Installe tous les modules.\n\ - install- : Installe uniquement le module (et ses dépendances).\n\ - \n\ - uninstall : Désinstalle tous les modules.\n\ - uninstall- : Désinstalle uniquement le module (et ses dépendances).\n\ - \n\ - clean : Supprime les fichiers temporaires.\n\ - purge : Supprime le résultat de la compilation.\n\ - \n\ - Note : l'installation se fait dans l'arborescence /usr/local. Modifiez la variable PREFIX de chaque Makefile pour changer ce comportement." diff --git a/infrastructure-centred/libowlps-client/Makefile b/libowlps-client/Makefile similarity index 97% rename from infrastructure-centred/libowlps-client/Makefile rename to libowlps-client/Makefile index 4bdbc90..b7ae340 100644 --- a/infrastructure-centred/libowlps-client/Makefile +++ b/libowlps-client/Makefile @@ -21,7 +21,7 @@ HEADER=owlps-client.h OBJS=$(LIB_CIBLE).o # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR) DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) diff --git a/infrastructure-centred/libowlps-client/Makefile_atheros b/libowlps-client/Makefile_atheros similarity index 97% rename from infrastructure-centred/libowlps-client/Makefile_atheros rename to libowlps-client/Makefile_atheros index 00515aa..81a7fcf 100644 --- a/infrastructure-centred/libowlps-client/Makefile_atheros +++ b/libowlps-client/Makefile_atheros @@ -21,7 +21,7 @@ HEADER=owlps-client.h OBJS=$(LIB_CIBLE).o # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR) DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) diff --git a/infrastructure-centred/libowlps-client/libowlps-client.c b/libowlps-client/libowlps-client.c similarity index 100% rename from infrastructure-centred/libowlps-client/libowlps-client.c rename to libowlps-client/libowlps-client.c diff --git a/infrastructure-centred/libowlps-client/owlps-client.h b/libowlps-client/owlps-client.h similarity index 100% rename from infrastructure-centred/libowlps-client/owlps-client.h rename to libowlps-client/owlps-client.h diff --git a/libowlps/Makefile b/libowlps/Makefile index 60a44c3..6cb06d0 100644 --- a/libowlps/Makefile +++ b/libowlps/Makefile @@ -34,7 +34,7 @@ HEADER=owlps.h OBJS=$(LIB_CIBLE).o # Flags -CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I. +CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG=-fPIC diff --git a/libowlps/Makefile_atheros b/libowlps/Makefile_atheros index 372d8e8..61166a0 100644 --- a/libowlps/Makefile_atheros +++ b/libowlps/Makefile_atheros @@ -34,7 +34,7 @@ HEADER=owlps.h OBJS=$(LIB_CIBLE).o # Flags -CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I. +CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG=-fPIC diff --git a/infrastructure-centred/owlps-aggregator/Makefile b/owlps-aggregator/Makefile similarity index 98% rename from infrastructure-centred/owlps-aggregator/Makefile rename to owlps-aggregator/Makefile index 69c8807..117a2bb 100644 --- a/infrastructure-centred/owlps-aggregator/Makefile +++ b/owlps-aggregator/Makefile @@ -20,7 +20,7 @@ TARGET=owlps-aggregatord HEADER=owlps-aggregator.h # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR) DEPFLAGS=-MMD XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) diff --git a/infrastructure-centred/owlps-aggregator/owlps-aggregator.h b/owlps-aggregator/owlps-aggregator.h similarity index 100% rename from infrastructure-centred/owlps-aggregator/owlps-aggregator.h rename to owlps-aggregator/owlps-aggregator.h diff --git a/infrastructure-centred/owlps-aggregator/owlps-aggregatord.c b/owlps-aggregator/owlps-aggregatord.c similarity index 100% rename from infrastructure-centred/owlps-aggregator/owlps-aggregatord.c rename to owlps-aggregator/owlps-aggregatord.c diff --git a/infrastructure-centred/owlps-client/Makefile b/owlps-client/Makefile similarity index 98% rename from infrastructure-centred/owlps-client/Makefile rename to owlps-client/Makefile index 58e631f..92578b6 100644 --- a/infrastructure-centred/owlps-client/Makefile +++ b/owlps-client/Makefile @@ -20,7 +20,7 @@ TARGET=owlps-client HEADER= # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) diff --git a/infrastructure-centred/owlps-client/Makefile_atheros b/owlps-client/Makefile_atheros similarity index 99% rename from infrastructure-centred/owlps-client/Makefile_atheros rename to owlps-client/Makefile_atheros index 4d60db9..feeaeeb 100644 --- a/infrastructure-centred/owlps-client/Makefile_atheros +++ b/owlps-client/Makefile_atheros @@ -23,7 +23,7 @@ TARGET=owlps-client HEADER= # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) diff --git a/infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03 b/owlps-client/Makefile_atheros_openwrt-10.03 similarity index 99% rename from infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03 rename to owlps-client/Makefile_atheros_openwrt-10.03 index f824b73..69cabdc 100644 --- a/infrastructure-centred/owlps-client/Makefile_atheros_openwrt-10.03 +++ b/owlps-client/Makefile_atheros_openwrt-10.03 @@ -23,7 +23,7 @@ TARGET=owlps-client HEADER= # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) diff --git a/infrastructure-centred/owlps-client/owlps-client.c b/owlps-client/owlps-client.c similarity index 100% rename from infrastructure-centred/owlps-client/owlps-client.c rename to owlps-client/owlps-client.c diff --git a/infrastructure-centred/owlps-listener/Makefile b/owlps-listener/Makefile similarity index 98% rename from infrastructure-centred/owlps-listener/Makefile rename to owlps-listener/Makefile index 6b87130..a540987 100644 --- a/infrastructure-centred/owlps-listener/Makefile +++ b/owlps-listener/Makefile @@ -20,7 +20,7 @@ TARGET=owlps-listenerd HEADER=owlps-listener.h # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) diff --git a/infrastructure-centred/owlps-listener/Makefile_atheros b/owlps-listener/Makefile_atheros similarity index 98% rename from infrastructure-centred/owlps-listener/Makefile_atheros rename to owlps-listener/Makefile_atheros index 70da0cf..02ca335 100644 --- a/infrastructure-centred/owlps-listener/Makefile_atheros +++ b/owlps-listener/Makefile_atheros @@ -23,7 +23,7 @@ TARGET=owlps-listenerd HEADER=owlps-listener.h # Flags -LIBOWLPS_DIR = ../../libowlps +LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) diff --git a/infrastructure-centred/owlps-listener/owlps-listener.h b/owlps-listener/owlps-listener.h similarity index 100% rename from infrastructure-centred/owlps-listener/owlps-listener.h rename to owlps-listener/owlps-listener.h diff --git a/infrastructure-centred/owlps-listener/owlps-listenerd.c b/owlps-listener/owlps-listenerd.c similarity index 100% rename from infrastructure-centred/owlps-listener/owlps-listenerd.c rename to owlps-listener/owlps-listenerd.c