mv /infrastructure-centred/* /
Get rid of the infrastructure-centred directory: all the modules are now at the same level.
This commit is contained in:
parent
c97ad877e1
commit
a72a76d5a9
142
Makefile
142
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 ##
|
## Compilation ##
|
||||||
|
|
||||||
all : libowlps owlps-positioning infrastructure-centred
|
all: \
|
||||||
|
libowlps \
|
||||||
|
libowlps-client \
|
||||||
|
owlps-client \
|
||||||
|
owlps-listener \
|
||||||
|
owlps-aggregator \
|
||||||
|
owlps-positioning
|
||||||
|
|
||||||
libowlps :
|
libowlps:
|
||||||
@make -C 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 ##
|
## 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 :
|
install-libowlps:
|
||||||
@make -C libowlps install
|
@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
|
## Uninstallation ##
|
||||||
@make -C infrastructure-centred install
|
|
||||||
|
|
||||||
## 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 :
|
## Cleaning ##
|
||||||
@make -C owlps-positioning uninstall
|
|
||||||
|
|
||||||
uninstall-infrastructure-centred :
|
|
||||||
@make -C infrastructure-centred uninstall
|
|
||||||
|
|
||||||
## Nettoyage ##
|
|
||||||
|
|
||||||
clean :
|
clean :
|
||||||
@make -C libowlps 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 owlps-positioning clean
|
||||||
@make -C infrastructure-centred clean
|
|
||||||
|
|
||||||
purge :
|
purge :
|
||||||
@make -C libowlps 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 owlps-positioning purge
|
||||||
@make -C infrastructure-centred purge
|
|
||||||
|
|
||||||
## Aide ##
|
|
||||||
|
## Help ##
|
||||||
|
|
||||||
help :
|
help :
|
||||||
@echo -e "Bibliothèques nécessaires à la compilation :\n\
|
@echo -e "Needed libraries:\n\
|
||||||
|
libiw-dev\n\
|
||||||
libpcap0.8-dev\n\
|
libpcap0.8-dev\n\
|
||||||
libconfuse-dev\n\
|
libconfuse-dev\n\
|
||||||
libiw-dev\n\
|
libboost-dev\n\
|
||||||
|
libboost-program-options-dev\n\
|
||||||
\n\
|
\n\
|
||||||
Cibles possibles :\n\
|
Targets:\n\
|
||||||
all (cible par défaut) : Compile tous les modules.\n\
|
all (default target): Compile all the modules.\n\
|
||||||
<module> : Compile uniquement le module <module> (et ses dépendances).\n\
|
<module>: Compile only the given module (and its \
|
||||||
|
dependencies).\n\
|
||||||
\n\
|
\n\
|
||||||
install : Installe tous les modules.\n\
|
install: Install all the modules.\n\
|
||||||
install-<module> : Installe uniquement le module <module> (et ses dépendances).\n\
|
install-<module>: Install only the given module (and its \
|
||||||
|
dependencies).\n\
|
||||||
\n\
|
\n\
|
||||||
uninstall : Désinstalle tous les modules.\n\
|
uninstall: Remove all the modules.\n\
|
||||||
uninstall-<module> : Désinstalle uniquement le module <module> (et ses dépendances).\n\
|
uninstall-<module>: Remove only the given module (and its \
|
||||||
|
dependencies).\n\
|
||||||
\n\
|
\n\
|
||||||
clean : Supprime les fichiers temporaires.\n\
|
clean: Remove temporary files.\n\
|
||||||
purge : Supprime le résultat de la compilation.\n\
|
purge: Remove compiled programs as well as temporary \
|
||||||
|
files.\n\
|
||||||
\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."
|
||||||
|
|
|
@ -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\
|
|
||||||
<module> : Compile uniquement le module <module> (et ses dépendances).\n\
|
|
||||||
\n\
|
|
||||||
install : Installe tous les modules.\n\
|
|
||||||
install-<module> : Installe uniquement le module <module> (et ses dépendances).\n\
|
|
||||||
\n\
|
|
||||||
uninstall : Désinstalle tous les modules.\n\
|
|
||||||
uninstall-<module> : Désinstalle uniquement le module <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."
|
|
|
@ -21,7 +21,7 @@ HEADER=owlps-client.h
|
||||||
OBJS=$(LIB_CIBLE).o
|
OBJS=$(LIB_CIBLE).o
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
|
||||||
DEPFLAGS=-MMD
|
DEPFLAGS=-MMD
|
||||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
|
@ -21,7 +21,7 @@ HEADER=owlps-client.h
|
||||||
OBJS=$(LIB_CIBLE).o
|
OBJS=$(LIB_CIBLE).o
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
|
||||||
DEPFLAGS=-MMD
|
DEPFLAGS=-MMD
|
||||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
|
@ -34,7 +34,7 @@ HEADER=owlps.h
|
||||||
OBJS=$(LIB_CIBLE).o
|
OBJS=$(LIB_CIBLE).o
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I.
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O
|
||||||
DEPFLAGS=-MMD
|
DEPFLAGS=-MMD
|
||||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
||||||
PICFLAG=-fPIC
|
PICFLAG=-fPIC
|
||||||
|
|
|
@ -34,7 +34,7 @@ HEADER=owlps.h
|
||||||
OBJS=$(LIB_CIBLE).o
|
OBJS=$(LIB_CIBLE).o
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
CFLAGS=-O2 -Wall -Wextra -Wstrict-prototypes -O -I.
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O
|
||||||
DEPFLAGS=-MMD
|
DEPFLAGS=-MMD
|
||||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
||||||
PICFLAG=-fPIC
|
PICFLAG=-fPIC
|
||||||
|
|
|
@ -20,7 +20,7 @@ TARGET=owlps-aggregatord
|
||||||
HEADER=owlps-aggregator.h
|
HEADER=owlps-aggregator.h
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes -O -I$(LIBOWLPS_DIR)
|
||||||
DEPFLAGS=-MMD
|
DEPFLAGS=-MMD
|
||||||
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
XCFLAGS=$(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS)
|
|
@ -20,7 +20,7 @@ TARGET=owlps-client
|
||||||
HEADER=
|
HEADER=
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
||||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
|
@ -23,7 +23,7 @@ TARGET=owlps-client
|
||||||
HEADER=
|
HEADER=
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
||||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
|
@ -23,7 +23,7 @@ TARGET=owlps-client
|
||||||
HEADER=
|
HEADER=
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
||||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
|
@ -20,7 +20,7 @@ TARGET=owlps-listenerd
|
||||||
HEADER=owlps-listener.h
|
HEADER=owlps-listener.h
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
||||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
|
@ -23,7 +23,7 @@ TARGET=owlps-listenerd
|
||||||
HEADER=owlps-listener.h
|
HEADER=owlps-listener.h
|
||||||
|
|
||||||
# Flags
|
# Flags
|
||||||
LIBOWLPS_DIR = ../../libowlps
|
LIBOWLPS_DIR = ../libowlps
|
||||||
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
LIBOWLPSCLIENT_DIR = ../libowlps-client
|
||||||
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \
|
||||||
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
-I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR)
|
Loading…
Reference in New Issue