[makefile] silence clean target and add missing Makefile

Ro9ueAdmin · Feb 23, 2013 · 737d7d3 · 737d7d3
1 parent 4462319
commit 737d7d3
Show file tree

Hide file tree

Showing 46 changed files with 175 additions and 48 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
+	$(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
@@ -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