Skip to content

Commit

Permalink
[makefile] some cosmetic
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger committed Mar 21, 2014
1 parent 0fe7689 commit ac9178c
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 16 deletions.
3 changes: 2 additions & 1 deletion sw/ground_segment/cockpit/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ actuators : actuators.c
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
3 changes: 2 additions & 1 deletion sw/ground_segment/joystick/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ clean:
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
3 changes: 2 additions & 1 deletion sw/ground_segment/lpc21iap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,8 @@ clean:
app: $(APPNAME)

$(APPNAME): $(SOURCES) Makefile
$(CC) $(CFLAGS) $(SOURCES) -o $(APPNAME) -l$(LIBNAME)
@echo LD $@
$(Q)$(CC) $(CFLAGS) $(SOURCES) -o $(APPNAME) -l$(LIBNAME)

# Builds archive tar file
arch: clean
Expand Down
15 changes: 10 additions & 5 deletions sw/ground_segment/multimon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -106,13 +106,16 @@ $(BINDIR)/multimon: $(OBJ_L2) $(OBJ_L1) $(OBJ_MISC)
$(Q)$(CC) $^ $(LDFLAGS) $(LDFLAGSX) -o $@

$(BINDIR)/gen: $(OBJ_GEN)
$(CC) $^ $(LDFLAGS) -o $@
@echo LD $@
$(Q)$(CC) $^ $(LDFLAGS) -o $@

$(BINDIR)/mkcostab: $(BINDIR)/mkcostab.o
$(CC) $^ $(LDFLAGS) -o $@
@echo LD $@
$(Q)$(CC) $^ $(LDFLAGS) -o $@

costabi.c costabf.c: $(BINDIR)/mkcostab
$(BINDIR)/mkcostab
@echo EXEC $<
$(Q)$(BINDIR)/mkcostab


libtest: pprzlib.o demodml.c demod.ml test.ml
Expand All @@ -124,10 +127,12 @@ hdlc_test : multimon.cma test_gen_hdlc.ml
hdlc.cmo : hdlc.cmi

%.cmo : %.ml
$(OCAMLC) -c $<
@echo OC $<
$(Q)$(OCAMLC) -c $<

%.cmi : %.mli
$(OCAMLC) $<
@echo OC $<
$(Q)$(OCAMLC) $<

clean:
$(Q)rm -fr *.cm* mkcostab .depend
Expand Down
6 changes: 4 additions & 2 deletions sw/ground_segment/tmtc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,8 @@ c_ivy_client_example_3: c_ivy_client_example_3.c
$(CC) $(GTK_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GTK_LDFLAGS)

ivy_serial_bridge: ivy_serial_bridge.c
$(CC) $(GTK_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GTK_LDFLAGS)
@echo OL $@
$(Q)$(CC) $(GTK_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GTK_LDFLAGS)


.PHONY: all opt clean
Expand All @@ -161,7 +162,8 @@ ivy_serial_bridge: ivy_serial_bridge.c
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) -I ../multimon *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) -I ../multimon *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
3 changes: 2 additions & 1 deletion sw/lib/ocaml/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,8 @@ clean :
#

.depend: Makefile $(GEN_DEP)
$(OCAMLDEP) *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
3 changes: 2 additions & 1 deletion sw/logalizer/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,8 @@ clean:
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
3 changes: 2 additions & 1 deletion sw/simulator/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,8 @@ clean :
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
3 changes: 2 additions & 1 deletion sw/supervision/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ clean:
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml* > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down
8 changes: 6 additions & 2 deletions sw/tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
# Quiet compilation
Q=@

CC = gcc

include ../Makefile.ocaml

INCLUDES =
Expand All @@ -44,7 +46,8 @@ all: find_free_msg_id.out mergelogs
$(Q)$(OCAMLC) $(INCLUDES) $(PKG) -c $<

mergelogs: mergelogs.c
gcc mergelogs.c -o mergelogs
@echo LD $@
$(Q)$(CC) mergelogs.c -o mergelogs

clean:
$(Q)rm -f *.cm* *.out *~ .depend mergelogs
Expand All @@ -56,7 +59,8 @@ clean:
#

.depend: Makefile
$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml *.mli > .depend
@echo DEPEND $@
$(Q)$(OCAMLDEP) -I $(LIBPPRZDIR) *.ml *.mli > .depend

ifneq ($(MAKECMDGOALS),clean)
-include .depend
Expand Down

0 comments on commit ac9178c

Please sign in to comment.