diff --git a/conf/Makefile.avr b/conf/Makefile.avr index 7f38e698cde..621820347d3 100644 --- a/conf/Makefile.avr +++ b/conf/Makefile.avr @@ -171,7 +171,7 @@ check_arch : $(Q)if ($(UISP) $(UISP_FLAGS) 2>&1 | tr '[:upper:]' '[:lower:]' | grep $($(TARGET).MCU)); then : ; else echo "Wrong architecture (mcu0 vs mcu1 ?)"; exit 1; fi avr_clean: - rm -rf $(OBJDIR) + $(Q)rm -rf $(OBJDIR) # diff --git a/conf/gps/Makefile b/conf/gps/Makefile index 9cc7e8a4ec2..17a823a9836 100644 --- a/conf/gps/Makefile +++ b/conf/gps/Makefile @@ -1,11 +1,14 @@ +# Quiet compilation +Q=@ + CC=gcc MODCFLAGS=-Wall all: ublox_conf clean: - rm -f core *.o ublox_conf + $(Q)rm -f core *.o ublox_conf ublox_conf: ublox_conf.c Makefile $(CC) $(MODCFLAGS) ublox_conf.c -o ublox_conf diff --git a/data/maps/Makefile b/data/maps/Makefile index 9e8dd00a43b..a2cd1e6bc10 100644 --- a/data/maps/Makefile +++ b/data/maps/Makefile @@ -9,7 +9,7 @@ TMPDIR ?= /tmp all: $(PAPARAZZI_HOME)/conf/maps.xml clean: - rm -f $(DATADIR)/maps.google.com + $(Q)rm -f $(DATADIR)/maps.google.com $(DATADIR): mkdir $(DATADIR) diff --git a/doc/ccc07/Makefile b/doc/ccc07/Makefile index 51e8d67950e..85582a8b981 100644 --- a/doc/ccc07/Makefile +++ b/doc/ccc07/Makefile @@ -1,8 +1,11 @@ +# Quiet compilation +Q=@ + slides : slides.tex $(PDF) $(ANIMS) pdflatex slides clean: - rm -f *~ *.log *.nav *.out *.snm *.toc *.aux slides.pdf + $(Q)rm -f *~ *.log *.nav *.out *.snm *.toc *.aux slides.pdf diff --git a/doc/pprz_algebra/Makefile b/doc/pprz_algebra/Makefile index 47828837b55..fce77e95fa2 100644 --- a/doc/pprz_algebra/Makefile +++ b/doc/pprz_algebra/Makefile @@ -1,8 +1,11 @@ +# Quiet compilation +Q=@ + doc_pprz_algebra.pdf: headfile.tex pdflatex $< bib: bibtex headfile clean: - rm -f *~ *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps - find . -name '*~' -exec rm -f {} \; + $(Q)rm -f *~ *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps + $(Q)find . -name '*~' -exec rm -f {} \; diff --git a/doc/pprz_geodetic/Makefile b/doc/pprz_geodetic/Makefile index 47828837b55..fce77e95fa2 100644 --- a/doc/pprz_geodetic/Makefile +++ b/doc/pprz_geodetic/Makefile @@ -1,8 +1,11 @@ +# Quiet compilation +Q=@ + doc_pprz_algebra.pdf: headfile.tex pdflatex $< bib: bibtex headfile clean: - rm -f *~ *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps - find . -name '*~' -exec rm -f {} \; + $(Q)rm -f *~ *.aux *.bbl *.blg *.log *.out *.toc *.dvi *.ps + $(Q)find . -name '*~' -exec rm -f {} \; diff --git a/sw/Makefile.ocaml b/sw/Makefile.ocaml new file mode 100644 index 00000000000..70b8699ce80 --- /dev/null +++ b/sw/Makefile.ocaml @@ -0,0 +1,37 @@ +# Hey Emacs, this is a -*- makefile -*- +# +# Copyright (C) 2013 Gautier Hattenberger +# +# This file is part of paparazzi. +# +# paparazzi is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# paparazzi is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with paparazzi; see the file COPYING. If not, write to +# the Free Software Foundation, 59 Temple Place - Suite 330, +# Boston, MA 02111-1307, USA. +# + +# General ocaml compiling tools and pprz lib + +OCAML = ocaml +OCAMLC = ocamlc +OCAMLOPT = ocamlopt +OCAMLDEP = ocamldep +OCAMLFIND = ocamlfind +LIBPPRZDIR = $(PAPARAZZI_SRC)/sw/lib/ocaml +INCLUDES = -I $(LIBPPRZDIR) +LIBPPRZCMA = $(LIBPPRZDIR)/lib-pprz.cma +LIBPPRZCMXA=$(LIBPPRZCMA:.cma=.cmxa) +XLIBPPRZCMA=$(LIBPPRZDIR)/xlib-pprz.cma +XLIBPPRZCMXA=$(XLIBPPRZCMA:.cma=.cmxa) +OCAMLDLL = -dllpath $(LIBPPRZDIR) +OCAMLXDLL = -dllpath $(LIBPPRZDIR) diff --git a/sw/airborne/Makefile b/sw/airborne/Makefile index ae60d2915f7..6062f64897f 100644 --- a/sw/airborne/Makefile +++ b/sw/airborne/Makefile @@ -21,6 +21,9 @@ # Boston, MA 02111-1307, USA. # +# Quiet compilation +Q=@ + OBJDIR = $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/$(TARGET) VARINCLUDE=$(PAPARAZZI_HOME)/var/include @@ -75,5 +78,5 @@ warn_conf : @echo clean : - rm -f *~ a.out *.elf + $(Q)rm -f *~ a.out *.elf .PHONY: clean diff --git a/sw/airborne/arch/lpc21/lpcusb/examples/Makefile b/sw/airborne/arch/lpc21/lpcusb/examples/Makefile index e9073abae58..ed8af37aa39 100644 --- a/sw/airborne/arch/lpc21/lpcusb/examples/Makefile +++ b/sw/airborne/arch/lpc21/lpcusb/examples/Makefile @@ -1,3 +1,6 @@ +# Quiet compilation +Q=@ + LIBNAME = ../libusbstack APPNAME = main @@ -41,7 +44,7 @@ crt.o: crt.s $(CC) -c $(AFLAGS) -Wa,-ahlms=crt.lst crt.s -o crt.o clean: - rm -f *.hex *.elf *.o *.lst *.dmp *.map .depend + $(Q)rm -f *.hex *.elf *.o *.lst *.dmp *.map .depend # recompile if the Makefile changes $(OBJS): Makefile diff --git a/sw/airborne/arch/lpc21/test/bootloader/Makefile b/sw/airborne/arch/lpc21/test/bootloader/Makefile index 7f7bc7666b3..faec6d79e14 100644 --- a/sw/airborne/arch/lpc21/test/bootloader/Makefile +++ b/sw/airborne/arch/lpc21/test/bootloader/Makefile @@ -1,3 +1,6 @@ +# Quiet compilation +Q=@ + #PROC_AP PROC_FBW PROC_TINY PROC_TINYJ #PROC = TINYJ ALLFLAGS = -DPROC_$(PROC) @@ -37,9 +40,9 @@ LIBOBJS = usbhw_lpc.o usbcontrol.o usbstdreq.o usbinit.o usbdescrip.o all: lib app app_ram clean: - $(RM) -f $(LIBNAME).a $(LIBOBJS) - $(RM) -f $(APPNAME).hex $(APPNAME).elf $(OBJS) *.lst $(APPNAME).dmp $(APPNAME).map - $(RM) -f $(APPNAME_RAM).hex $(APPNAME_RAM).elf $(APPNAME_RAM).dmp $(APPNAME_RAM).map + $(Q)$(RM) -f $(LIBNAME).a $(LIBOBJS) + $(Q)$(RM) -f $(APPNAME).hex $(APPNAME).elf $(OBJS) *.lst $(APPNAME).dmp $(APPNAME).map + $(Q)$(RM) -f $(APPNAME_RAM).hex $(APPNAME_RAM).elf $(APPNAME_RAM).dmp $(APPNAME_RAM).map # build lib lib: $(LIBOBJS) diff --git a/sw/airborne/booz/test/Makefile b/sw/airborne/booz/test/Makefile index f2188035255..164960f6e79 100644 --- a/sw/airborne/booz/test/Makefile +++ b/sw/airborne/booz/test/Makefile @@ -21,6 +21,9 @@ # Boston, MA 02111-1307, USA. ## +# Quiet compilation +Q=@ + CC = gcc CFLAGS = -std=gnu99 -Wall -I.. -I../.. -I../../test/ -I../../../include -I../../booz_priv LDFLAGS = -lm @@ -51,4 +54,4 @@ test_att_ref: test_att_ref.c ../stabilization/booz_stabilization_attitude_ref_qu clean: - rm -f *~ test_att_ref + $(Q)rm -f *~ test_att_ref diff --git a/sw/airborne/firmwares/non_ap/led_flasher/Makefile b/sw/airborne/firmwares/non_ap/led_flasher/Makefile index 9408d7238f1..33305dca624 100644 --- a/sw/airborne/firmwares/non_ap/led_flasher/Makefile +++ b/sw/airborne/firmwares/non_ap/led_flasher/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + MCU = attiny25 PROG = dragon_isp @@ -19,7 +22,7 @@ SOURCES = blitzer.c all: $(APPNAME) clean: - $(RM) -f core $(APPNAME).o $(APPNAME) $(APPNAME).elf $(APPNAME).hex + $(Q)$(RM) -f core $(APPNAME).o $(APPNAME) $(APPNAME).elf $(APPNAME).hex app: $(APPNAME) diff --git a/sw/airborne/firmwares/vor/Makefile b/sw/airborne/firmwares/vor/Makefile index 2a8cdd9f0c2..d55b7cd51d4 100644 --- a/sw/airborne/firmwares/vor/Makefile +++ b/sw/airborne/firmwares/vor/Makefile @@ -1,3 +1,6 @@ +# Quiet compilation +Q=@ + all: CFLAGS = -Wall -I.. @@ -25,7 +28,7 @@ play_audio: sndfile-play.c gcc $(CFLAGS) $^ -o $@ $(LDFLAGS) -lsndfile -lasound clean: - rm -f i86_vor_test_float_demod \ + $(Q)rm -f i86_vor_test_float_demod \ i86_vor_test_int_demod \ i86_vor_test_filters \ *~ \#* diff --git a/sw/airborne/fms/Makefile b/sw/airborne/fms/Makefile index 6e568312f71..588e846c28f 100644 --- a/sw/airborne/fms/Makefile +++ b/sw/airborne/fms/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + CFLAGS = -Wall $(shell pkg-config --cflags glib-2.0) -g LDFLAGS = $(shell pkg-config --libs glib-2.0) @@ -49,4 +52,4 @@ onboard_logger: onboard_logger.c $(CC) $(CFLAGS) -o $@ $^ -lpcap clean: - rm -f *~ fms test_telemetry + $(Q)rm -f *~ fms test_telemetry diff --git a/sw/airborne/fms/libeknav/Makefile b/sw/airborne/fms/libeknav/Makefile index 5f0c3e111f7..b79daa59ba2 100644 --- a/sw/airborne/fms/libeknav/Makefile +++ b/sw/airborne/fms/libeknav/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + raw_log_to_ascii: raw_log_to_ascii.c gcc -I../../ -I../../../include -std=gnu99 -Wall raw_log_to_ascii.c -DOVERO_LINK_MSG_UP=AutopilotMessageVIUp -DOVERO_LINK_MSG_DOWN=AutopilotMessageVIDown -o raw_log_to_ascii @@ -26,4 +29,4 @@ run_filter_on_log: ./libeknav_from_log.cpp $(LIBEKNAV_SRCS) ../../math/pprz_geod g++ -I/usr/include/eigen2 -I../.. -I../../../include -I../../../../var/FY $(eknavOnLogFlags) -o $@ $^ clean: - -rm -f *.o *~ *.d + $(Q)rm -f *.o *~ *.d diff --git a/sw/airborne/math/Makefile b/sw/airborne/math/Makefile index 7030d668bf6..f9caa61f302 100644 --- a/sw/airborne/math/Makefile +++ b/sw/airborne/math/Makefile @@ -1,6 +1,9 @@ # Build shared pprz math library # +# Quiet compilation +Q=@ + CC= gcc CFLAGS= -fpic INCLUDES= -I$(PAPARAZZI_SRC)/sw/include -I$(PAPARAZZI_SRC)/sw/airborne @@ -43,5 +46,5 @@ $(BUILDDIR)/%.o: %.c $(CC) -c $< $(CFLAGS) $(INCLUDES) -o $@ clean: - rm -f $(BUILDDIR)/*.o $(BUILDDIR)/$(LIBNAME).so + $(Q)rm -f $(BUILDDIR)/*.o $(BUILDDIR)/$(LIBNAME).so diff --git a/sw/airborne/test/Makefile b/sw/airborne/test/Makefile index 13aeae8f7dc..f8e05d1151f 100644 --- a/sw/airborne/test/Makefile +++ b/sw/airborne/test/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + CC = gcc CFLAGS = -std=c99 -I.. -I../../include -I../booz -I../../booz -Wall @@ -33,4 +36,4 @@ test_fmul: test_fmul.c $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) clean: - rm -f *~ test_geodetic test_algebra *.exe + $(Q)rm -f *~ test_geodetic test_algebra *.exe diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile index bcf5b72688c..64d24ea6296 100644 --- a/sw/ground_segment/cockpit/Makefile +++ b/sw/ground_segment/cockpit/Makefile @@ -90,7 +90,7 @@ compass : compass.ml clean: - rm -f *~* *.cm* *.o *.out *.opt map2d gcs .depend gtk_strip.ml gtk_setting_time.ml gtk_save_settings.ml compass ant_track ant_track_pmm test_enose actuators + $(Q)rm -f *~* *.cm* *.o *.out *.opt map2d gcs .depend gtk_strip.ml gtk_setting_time.ml gtk_save_settings.ml compass ant_track ant_track_pmm test_enose actuators .PHONY: all opt clean diff --git a/sw/ground_segment/joystick/Makefile b/sw/ground_segment/joystick/Makefile index 8c99c3b6b8d..94fb7be2dc5 100644 --- a/sw/ground_segment/joystick/Makefile +++ b/sw/ground_segment/joystick/Makefile @@ -60,7 +60,7 @@ sdl_stick.so : sdl_stick.o ml_sdl_stick.o $(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLINCLUDES) -c -package $(PKGCOMMON) $< clean: - rm -f *~ core *.o *.bak .depend test*stick *.cmo *.cmi input2ivy + $(Q)rm -f *~ core *.o *.bak .depend test*stick *.cmo *.cmi input2ivy .PHONY: all clean diff --git a/sw/ground_segment/lpc21iap/Makefile b/sw/ground_segment/lpc21iap/Makefile index aa21d78a0bb..d23ffc95b98 100644 --- a/sw/ground_segment/lpc21iap/Makefile +++ b/sw/ground_segment/lpc21iap/Makefile @@ -1,5 +1,8 @@ #MS VC: cl lpc21iap.c elf.c lpcusb.c libusb.lib +# Quiet compilation +Q=@ + LIBNAME = usb APPNAME = lpc21iap @@ -38,7 +41,7 @@ SOURCES = lpc21iap.c elf.c lpcusb.c all: $(APPNAME) clean: - $(RM) -f core $(APPNAME).o $(APPNAME) $(APPNAME).obj $(APPNAME).exe + $(Q)$(RM) -f core $(APPNAME).o $(APPNAME) $(APPNAME).obj $(APPNAME).exe app: $(APPNAME) diff --git a/sw/ground_segment/misc/Makefile b/sw/ground_segment/misc/Makefile index b07280b1301..b703963916b 100644 --- a/sw/ground_segment/misc/Makefile +++ b/sw/ground_segment/misc/Makefile @@ -38,7 +38,7 @@ endif all: davis2ivy kestrel2ivy clean: - rm -f *.o davis2ivy kestrel2ivy + $(Q)rm -f *.o davis2ivy kestrel2ivy davis2ivy: davis2ivy.o $(Q)$(CC) -o davis2ivy davis2ivy.o $(LIBRARYS) -livy diff --git a/sw/ground_segment/tmtc/GSM/Makefile b/sw/ground_segment/tmtc/GSM/Makefile index 697b8399d90..b4a17b6b542 100644 --- a/sw/ground_segment/tmtc/GSM/Makefile +++ b/sw/ground_segment/tmtc/GSM/Makefile @@ -1,7 +1,10 @@ +# Quiet compilation +Q=@ + all: SMS_GS SMS_GS: SMS_Ground_UDtest_final.c gcc -g -O2 -Wall `pkg-config --cflags glib-2.0 gtk+-2.0` -L/usr/lib -lglibivy -o SMS_GS SMS_Ground_UDtest_final.c `pkg-config --libs glib-2.0 gtk+-2.0` -lglibivy clean: - rm -f SMS_GS + $(Q)rm -f SMS_GS diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile index 735aa4e1a13..c410f21add4 100644 --- a/sw/ground_segment/tmtc/Makefile +++ b/sw/ground_segment/tmtc/Makefile @@ -49,7 +49,7 @@ all: link server messages dia diadec $(VAR)/boa.conf ivy_tcp_aircraft ivy_tcp_co #settings clean: - rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge gpsd2ivy c_ivy_client_example_1 c_ivy_client_example_2 c_ivy_client_example_3 + $(Q)rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge gpsd2ivy c_ivy_client_example_1 c_ivy_client_example_2 c_ivy_client_example_3 $(VAR)/boa.conf :$(CONF)/boa.conf diff --git a/sw/in_progress/button/Makefile b/sw/in_progress/button/Makefile index 73f653b0d57..f655b57a5dd 100644 --- a/sw/in_progress/button/Makefile +++ b/sw/in_progress/button/Makefile @@ -72,7 +72,7 @@ MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/incl MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1 -I. -I. -I.. -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include clean: - rm -f *.opt *.out *~ core *.o *.bak .depend *.cm* panic + $(Q)rm -f *.opt *.out *~ core *.o *.bak .depend *.cm* panic #FGFS_PREFIX=/home/poine/local FGFS_PREFIX=/home/poine/flightgear diff --git a/sw/in_progress/fdm/Makefile b/sw/in_progress/fdm/Makefile index 15897090036..265f34be4f3 100644 --- a/sw/in_progress/fdm/Makefile +++ b/sw/in_progress/fdm/Makefile @@ -35,4 +35,4 @@ fms_steps_attitude: fms_steps_attitude.c clean: - rm -f *~ core *.o *.bak .depend fdm_step fms_steps_attitude + $(Q)rm -f *~ core *.o *.bak .depend fdm_step fms_steps_attitude diff --git a/sw/in_progress/inertial/C/Makefile b/sw/in_progress/inertial/C/Makefile index 2c893ed041f..c0e8483ea6e 100644 --- a/sw/in_progress/inertial/C/Makefile +++ b/sw/in_progress/inertial/C/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + CFLAGS = -g -Wall `pkg-config glib-2.0 --cflags` LDFLAGS = `pkg-config glib-2.0 --libs` -lm @@ -127,4 +130,4 @@ test_ukf: $(OBJS_TEST_UKF) clean: - rm -f *~ *.o tilt_ukf tilt_ekf tilt_fast_ekf ahrs_euler_ekf ahrs_quat_ukf ahrs_quat_ekf ahrs_quat_fast_ekf test_matrix test_ukf \ No newline at end of file + $(Q)rm -f *~ *.o tilt_ukf tilt_ekf tilt_fast_ekf ahrs_euler_ekf ahrs_quat_ukf ahrs_quat_ekf ahrs_quat_fast_ekf test_matrix test_ukf diff --git a/sw/in_progress/ir_calibration/Makefile b/sw/in_progress/ir_calibration/Makefile index 6924422e1de..662e015cf3a 100644 --- a/sw/in_progress/ir_calibration/Makefile +++ b/sw/in_progress/ir_calibration/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + CC = gcc CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` @@ -8,4 +11,4 @@ ir_calib : main.c calibrator.c gui.c $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) clean: - rm -f *~ ir_calib + $(Q)rm -f *~ ir_calib diff --git a/sw/in_progress/ir_usb_i2c/Makefile b/sw/in_progress/ir_usb_i2c/Makefile index ea917551d1a..0de9eb6d927 100644 --- a/sw/in_progress/ir_usb_i2c/Makefile +++ b/sw/in_progress/ir_usb_i2c/Makefile @@ -2,12 +2,15 @@ # Makefile # +# Quiet compilation +Q=@ + APP = i2c_usb all: $(APP) clean: - rm -f $(APP) + $(Q)rm -f $(APP) $(APP): $(APP).c $(CC) -Wall -o $@ $(APP).c -lusb diff --git a/sw/in_progress/log_parser/Makefile b/sw/in_progress/log_parser/Makefile index 7461a91191d..6c5e307a657 100644 --- a/sw/in_progress/log_parser/Makefile +++ b/sw/in_progress/log_parser/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + #LIBNAME = efsl APPNAME = linuxtest @@ -24,7 +27,7 @@ SOURCES = linuxtest.c all: $(APPNAME) clean: - $(RM) -f core $(APPNAME).o $(APPNAME) $(APPNAME).obj $(APPNAME).exe + $(Q)$(RM) -f core $(APPNAME).o $(APPNAME) $(APPNAME).obj $(APPNAME).exe app: $(APPNAME) diff --git a/sw/in_progress/motor_bench/Makefile b/sw/in_progress/motor_bench/Makefile index b08228faecf..f103caabec4 100644 --- a/sw/in_progress/motor_bench/Makefile +++ b/sw/in_progress/motor_bench/Makefile @@ -1,3 +1,6 @@ +# Quiet compilation +Q=@ + CC = gcc CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -I../../../var/MB LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy @@ -13,5 +16,5 @@ plot_test: scilab -f test.sce -args $(LOG) clean: - rm -f *~ motor_bench + $(Q)rm -f *~ motor_bench diff --git a/sw/in_progress/satcom/Makefile b/sw/in_progress/satcom/Makefile index 0c780f676d0..a45c21e2575 100644 --- a/sw/in_progress/satcom/Makefile +++ b/sw/in_progress/satcom/Makefile @@ -1,3 +1,6 @@ +# Quiet compilation +Q=@ + all: email2udp udp2tcp tcp2ivy email2udp: email2udp.c @@ -10,4 +13,4 @@ tcp2ivy_generic: tcp2ivy_generic.c gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -I../../../var/${AIRCRAFT} -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm clean: - rm -f email2udp udp2tcp tcp2ivy + $(Q)rm -f email2udp udp2tcp tcp2ivy diff --git a/sw/in_progress/turbine/Makefile b/sw/in_progress/turbine/Makefile index 08d8029d5de..05f36c78569 100644 --- a/sw/in_progress/turbine/Makefile +++ b/sw/in_progress/turbine/Makefile @@ -1,11 +1,14 @@ +# Quiet compilation +Q=@ + CC=gcc MODCFLAGS=-Wall all: turb_simu clean: - rm -f core *.o turb_simu + $(Q)rm -f core *.o turb_simu ublox_conf: ublox_conf.c Makefile $(CC) $(MODCFLAGS) turb_simu.c -o turb_simu diff --git a/sw/in_progress/wind_tunnel/Makefile b/sw/in_progress/wind_tunnel/Makefile index 00d292d5b92..b96cb01933c 100644 --- a/sw/in_progress/wind_tunnel/Makefile +++ b/sw/in_progress/wind_tunnel/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + CC = gcc GLIB_CFLAGS = -Wall `pkg-config glib-2.0 --cflags` GLIB_LDFLAGS = `pkg-config glib-2.0 --libs` -lglibivy -lpcre @@ -8,4 +11,4 @@ main: main.c serial_port.c clean: - rm -f main \ No newline at end of file + $(Q)rm -f main diff --git a/sw/lib/ocaml/Makefile b/sw/lib/ocaml/Makefile index 4b4b5617a5a..21c926fac64 100644 --- a/sw/lib/ocaml/Makefile +++ b/sw/lib/ocaml/Makefile @@ -173,7 +173,7 @@ gtk_papget_led_editor.ml : widgets.glade @rm $(TMPDIR)/$@_$< clean : - rm -f *~ *.cm* *.out *.opt .depend *.a *.o *.so caml_from_c_example tests gtk_papget_*.ml expr_parser.ml expr_parser.mli expr_lexer.ml expr_lexer.mli + $(Q)rm -f *~ *.cm* *.out *.opt .depend *.a *.o *.so caml_from_c_example tests gtk_papget_*.ml expr_parser.ml expr_parser.mli expr_lexer.ml expr_lexer.mli .PHONY: all opt clean diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile index 48198af98a3..6a16b23398e 100644 --- a/sw/logalizer/Makefile +++ b/sw/logalizer/Makefile @@ -182,7 +182,7 @@ ctrlstick: ctrlstick.c $(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy clean: - rm -f *.opt *.out *~ core *.o *.bak .depend *.cm* play ahrsview imuview ahrs2fg plot plotter gtk_export.ml openlog2tlm disp3d plotprofile test1 test3 test_samere ivy_example tmclient ffjoystick ctrlstick sd2log motor_bench + $(Q)rm -f *.opt *.out *~ core *.o *.bak .depend *.cm* play ahrsview imuview ahrs2fg plot plotter gtk_export.ml openlog2tlm disp3d plotprofile test1 test3 test_samere ivy_example tmclient ffjoystick ctrlstick sd2log motor_bench .PHONY: all clean pt run_fg diff --git a/sw/logalizer/matlab/Makefile b/sw/logalizer/matlab/Makefile index 8d25b837bc9..209d0dac42d 100644 --- a/sw/logalizer/matlab/Makefile +++ b/sw/logalizer/matlab/Makefile @@ -1,2 +1,5 @@ +# Quiet compilation +Q=@ + clean: - rm -f *~ + $(Q)rm -f *~ diff --git a/sw/simulator/Makefile b/sw/simulator/Makefile index 3e3ce7929f9..83f6f22f58e 100644 --- a/sw/simulator/Makefile +++ b/sw/simulator/Makefile @@ -91,7 +91,7 @@ diffusion : stdlib.cmo diffusion.cmo simhitl diffusion gaia: $(LIBPPRZCMA) clean : - rm -f *.cm* *~ *.out .depend *.o *.a *.so gaia simhitl diffusion + $(Q)rm -f *.cm* *~ *.out .depend *.o *.a *.so gaia simhitl diffusion .PHONY: all clean diff --git a/sw/simulator/old_booz/tests/Makefile b/sw/simulator/old_booz/tests/Makefile index eb7ed640479..4fbd86e7792 100644 --- a/sw/simulator/old_booz/tests/Makefile +++ b/sw/simulator/old_booz/tests/Makefile @@ -3,6 +3,8 @@ # #JSBSIM = /usr/local +Q=@ + #CC = g++ #CFLAGS = -Wall -I$(JSBSIM)/include/JSBSim -I../include #LDFLAGS = -L$(JSBSIM)/lib -lJSBSim @@ -70,4 +72,5 @@ test_sensors : $(TEST_SENSORS_SRCS) gcc $(CFLAGS) -o $@ $^ $(LDFLAGS) clean: + $(Q)rm -f *.o diff --git a/sw/simulator/scilab/q3d/Makefile b/sw/simulator/scilab/q3d/Makefile index 0fcfc631b1c..006ed84ac5a 100644 --- a/sw/simulator/scilab/q3d/Makefile +++ b/sw/simulator/scilab/q3d/Makefile @@ -1,4 +1,7 @@ +# Quiet compilation +Q=@ + @@ -7,4 +10,4 @@ out.mpg: ffmpeg -f image2 -i images/frame_%04d.ppm out.mpg clean: - rm -f *~ \#*\# \ No newline at end of file + $(Q)rm -f *~ \#*\# diff --git a/sw/simulator/scilab/q3d/fonts/Makefile b/sw/simulator/scilab/q3d/fonts/Makefile index f99fbddd803..366ca571856 100644 --- a/sw/simulator/scilab/q3d/fonts/Makefile +++ b/sw/simulator/scilab/q3d/fonts/Makefile @@ -1,3 +1,6 @@ +# Quiet compilation +Q=@ + CC = gcc GLIB_CFLAGS = -Wall `pkg-config glib-2.0 --cflags` GLIB_LDFLAGS = `pkg-config glib-2.0 --libs` -lglibivy -lpcre @@ -6,5 +9,5 @@ ttx2scilab: ttx2scilab.c $(CC) -Wall $(GLIB_CFLAGS) -o $@ $< $(GLIB_LDFLAGS) clean: - rm -f ttx2scilab + $(Q)rm -f ttx2scilab diff --git a/sw/simulator/scilab/q3d/povray/Makefile b/sw/simulator/scilab/q3d/povray/Makefile index 2d511221a7d..96349617b7c 100644 --- a/sw/simulator/scilab/q3d/povray/Makefile +++ b/sw/simulator/scilab/q3d/povray/Makefile @@ -1,2 +1,5 @@ +# Quiet compilation +Q=@ + clean: - rm -f *~ foo*.png test.avi q3d.pov \ No newline at end of file + $(Q)rm -f *~ foo*.png test.avi q3d.pov diff --git a/sw/simulator/scilab/q6d/povray/Makefile b/sw/simulator/scilab/q6d/povray/Makefile index f799787b8ae..2e0f53adbc9 100644 --- a/sw/simulator/scilab/q6d/povray/Makefile +++ b/sw/simulator/scilab/q6d/povray/Makefile @@ -1,5 +1,8 @@ +# Quiet compilation +Q=@ + test: povray test.pov +Oimg001.png Display=false +W800 +H600 +Q9 +A0.3 +R5 clean: - rm -f *~ img*.png test.avi q3d.pov + $(Q)rm -f *~ img*.png test.avi q3d.pov diff --git a/sw/supervision/Makefile b/sw/supervision/Makefile index d3467991dd2..d6e7279a6cf 100644 --- a/sw/supervision/Makefile +++ b/sw/supervision/Makefile @@ -60,7 +60,7 @@ pc_common.cmo: gtk_process.cmo paparazzicenter.cmo : gtk_pc.cmo clean: - \rm -f *.cm* gtk_pc.ml gtk_process.ml .depend paparazzicenter + $(Q)rm -f *.cm* gtk_pc.ml gtk_process.ml .depend paparazzicenter .PHONY: all clean diff --git a/sw/tools/Makefile b/sw/tools/Makefile index 8957d4766ce..cb959ef8807 100644 --- a/sw/tools/Makefile +++ b/sw/tools/Makefile @@ -61,7 +61,7 @@ mergelogs: mergelogs.c gcc mergelogs.c -o mergelogs clean: - rm -f *.cm* *.out *~ .depend fp_parser.ml fp_parser.mli mergelogs + $(Q)rm -f *.cm* *.out *~ .depend fp_parser.ml fp_parser.mli mergelogs .PHONY: all clean diff --git a/sw/tools/wiki_gen/Makefile b/sw/tools/wiki_gen/Makefile index 766bb4b5615..3bae53e3d40 100644 --- a/sw/tools/wiki_gen/Makefile +++ b/sw/tools/wiki_gen/Makefile @@ -46,4 +46,4 @@ OCAMLNETCMA=$(shell ocamlfind query -r -a-format -predicates byte netstring) $(Q)$(OCAMLYACC) $< clean: - rm -f *.cm* *.out *~ + $(Q)rm -f *.cm* *.out *~ diff --git a/tests/Makefile b/tests/Makefile index bdbbfa35c6a..a06af1922af 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -28,5 +28,5 @@ test: $(Q)$(PERLENV) $(PERL) "-e" "$(RUNTESTS)" clean: - rm -rf results/* + $(Q)rm -rf results/*