From f54b0d11e1d9a8f88b24cd4d91f4eaf51bd2d5ee Mon Sep 17 00:00:00 2001 From: Matteo Cypriani Date: Thu, 23 Jun 2011 12:49:41 +0200 Subject: [PATCH] Makefiles: remove -v incompatible with BSD commands The -v 'verbose' switch of the standard commands (rm, cp, mkdir, etc.) is not implemented in BSD versions of the commands, so we avoid using it. --- libowlps-client/Makefile | 2 +- libowlps-client/Makefile_atheros | 2 +- libowlps-client/Makefile_atheros_openwrt-10.03 | 2 +- libowlps/Makefile | 6 +++--- libowlps/Makefile_atheros | 6 +++--- libowlps/Makefile_atheros_openwrt-10.03 | 6 +++--- owlps-aggregator/Makefile | 8 ++++---- owlps-client/Makefile | 8 ++++---- owlps-client/Makefile_atheros | 8 ++++---- owlps-client/Makefile_atheros_openwrt-10.03 | 8 ++++---- owlps-listener/Makefile | 8 ++++---- owlps-listener/Makefile_atheros | 8 ++++---- owlps-listener/Makefile_atheros_openwrt-10.03 | 8 ++++---- owlps-positioning/Makefile | 9 ++++----- 14 files changed, 44 insertions(+), 45 deletions(-) diff --git a/libowlps-client/Makefile b/libowlps-client/Makefile index e65dbc4..37ab9fb 100644 --- a/libowlps-client/Makefile +++ b/libowlps-client/Makefile @@ -7,7 +7,7 @@ endif # Autres outils AR = ar RANLIB = ranlib -RM = rm -fv +RM = rm -f # Variables générales LIB_CIBLE=libowlps-client diff --git a/libowlps-client/Makefile_atheros b/libowlps-client/Makefile_atheros index febb335..12d6440 100644 --- a/libowlps-client/Makefile_atheros +++ b/libowlps-client/Makefile_atheros @@ -10,7 +10,7 @@ CC = $(TOOLCHAIN_BIN)/mips-linux-gcc # Autres outils AR = ar RANLIB = ranlib -RM = rm -fv +RM = rm -f # Variables générales LIB_CIBLE=libowlps-client diff --git a/libowlps-client/Makefile_atheros_openwrt-10.03 b/libowlps-client/Makefile_atheros_openwrt-10.03 index ca97466..c69c7ae 100644 --- a/libowlps-client/Makefile_atheros_openwrt-10.03 +++ b/libowlps-client/Makefile_atheros_openwrt-10.03 @@ -10,7 +10,7 @@ CC = $(TOOLCHAIN_BIN)/mips-openwrt-linux-gcc # Autres outils AR = ar RANLIB = ranlib -RM = rm -fv +RM = rm -f # Variables générales LIB_CIBLE=libowlps-client diff --git a/libowlps/Makefile b/libowlps/Makefile index 6cb06d0..0aea97f 100644 --- a/libowlps/Makefile +++ b/libowlps/Makefile @@ -15,9 +15,9 @@ AR = ar RANLIB = ranlib # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v -SYMLINK=ln -svf +RM = rm -f +CP = cp +SYMLINK = ln -sf # Variables générales LIB_CIBLE=libowlps diff --git a/libowlps/Makefile_atheros b/libowlps/Makefile_atheros index 870cfb8..d246f3b 100644 --- a/libowlps/Makefile_atheros +++ b/libowlps/Makefile_atheros @@ -18,9 +18,9 @@ AR = ar RANLIB = ranlib # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v -SYMLINK=ln -svf +RM = rm -f +CP = cp +SYMLINK = ln -sf # Variables générales LIB_CIBLE=libowlps diff --git a/libowlps/Makefile_atheros_openwrt-10.03 b/libowlps/Makefile_atheros_openwrt-10.03 index 738d5e7..690563c 100644 --- a/libowlps/Makefile_atheros_openwrt-10.03 +++ b/libowlps/Makefile_atheros_openwrt-10.03 @@ -18,9 +18,9 @@ AR = ar RANLIB = ranlib # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v -SYMLINK=ln -svf +RM = rm -f +CP = cp +SYMLINK = ln -sf # Variables générales LIB_CIBLE=libowlps diff --git a/owlps-aggregator/Makefile b/owlps-aggregator/Makefile index e2d6985..2102615 100644 --- a/owlps-aggregator/Makefile +++ b/owlps-aggregator/Makefile @@ -17,8 +17,8 @@ ifeq ($(COLORGCC), 0) endif # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-aggregatord @@ -63,10 +63,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) + @$(RM) $(TARGET) ## Aide ## diff --git a/owlps-client/Makefile b/owlps-client/Makefile index accff24..022e8b5 100644 --- a/owlps-client/Makefile +++ b/owlps-client/Makefile @@ -17,8 +17,8 @@ ifeq ($(COLORGCC), 0) endif # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-client @@ -74,10 +74,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) $(TARGET).static + @$(RM) $(TARGET) $(TARGET).static ## Aide ## diff --git a/owlps-client/Makefile_atheros b/owlps-client/Makefile_atheros index 89fbb3c..b3abecc 100644 --- a/owlps-client/Makefile_atheros +++ b/owlps-client/Makefile_atheros @@ -20,8 +20,8 @@ INSTALL_MAN= $(PREFIX)/share/man CC = $(TOOLCHAIN_BIN)/mips-linux-gcc # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-client @@ -87,10 +87,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) $(TARGET).static $(TARGET).semistatic + @$(RM) $(TARGET) $(TARGET).static $(TARGET).semistatic ## Aide ## diff --git a/owlps-client/Makefile_atheros_openwrt-10.03 b/owlps-client/Makefile_atheros_openwrt-10.03 index 27545d2..2956be6 100644 --- a/owlps-client/Makefile_atheros_openwrt-10.03 +++ b/owlps-client/Makefile_atheros_openwrt-10.03 @@ -20,8 +20,8 @@ INSTALL_MAN= $(PREFIX)/share/man CC = $(TOOLCHAIN_BIN)/mips-openwrt-linux-gcc # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-client @@ -87,10 +87,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) $(TARGET).static $(TARGET).semistatic + @$(RM) $(TARGET) $(TARGET).static $(TARGET).semistatic ## Aide ## diff --git a/owlps-listener/Makefile b/owlps-listener/Makefile index 1c7f66b..df13ec7 100644 --- a/owlps-listener/Makefile +++ b/owlps-listener/Makefile @@ -17,8 +17,8 @@ ifeq ($(COLORGCC), 0) endif # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-listenerd @@ -69,10 +69,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) + @$(RM) $(TARGET) ## Aide ## diff --git a/owlps-listener/Makefile_atheros b/owlps-listener/Makefile_atheros index bf5260e..d8e2305 100644 --- a/owlps-listener/Makefile_atheros +++ b/owlps-listener/Makefile_atheros @@ -20,8 +20,8 @@ INSTALL_MAN= $(PREFIX)/share/man CC = $(TOOLCHAIN_BIN)/mips-linux-gcc # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-listenerd @@ -85,10 +85,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) $(TARGET).static $(TARGET).semistatic + @$(RM) $(TARGET) $(TARGET).static $(TARGET).semistatic ## Aide ## diff --git a/owlps-listener/Makefile_atheros_openwrt-10.03 b/owlps-listener/Makefile_atheros_openwrt-10.03 index 91409a3..80cc034 100644 --- a/owlps-listener/Makefile_atheros_openwrt-10.03 +++ b/owlps-listener/Makefile_atheros_openwrt-10.03 @@ -20,8 +20,8 @@ INSTALL_MAN= $(PREFIX)/share/man CC = $(TOOLCHAIN_BIN)/mips-openwrt-linux-gcc # Commandes d'installation et de désinstallation -RM=rm -fv -CP=cp -v +RM = rm -f +CP = cp # Cible TARGET=owlps-listenerd @@ -85,10 +85,10 @@ uninstall : ## Nettoyage ## clean : - @$(RM) -fv *~ *.o *.d + @$(RM) *~ *.o *.d purge : clean - @$(RM) -fv $(TARGET) $(TARGET).static $(TARGET).semistatic + @$(RM) $(TARGET) $(TARGET).static $(TARGET).semistatic ## Aide ## diff --git a/owlps-positioning/Makefile b/owlps-positioning/Makefile index 8b9d85f..b441ab7 100644 --- a/owlps-positioning/Makefile +++ b/owlps-positioning/Makefile @@ -15,11 +15,10 @@ PREFIX = /usr/local INSTALL_DIR = $(PREFIX)/bin # System tools -RM = rm -fv +RM = rm -f RM_RECURSIVE = \rm -fr -RM_RECURSIVE_VERBOSE = rm -frv -CP = cp -v -MKDIR = mkdir -pv +CP = cp +MKDIR = mkdir -p # Other tools STYLE = astyle --style=gnu --formatted @@ -309,7 +308,7 @@ doc: clean: @$(RM) *~ */*~ *.orig */*.orig - @$(RM_RECURSIVE_VERBOSE) $(OBJ_DIR) + @$(RM_RECURSIVE) $(OBJ_DIR) @$(RM) $(TESTS_XX) $(TESTS_DIR)/*.o purge: clean