Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-06 07:53:43 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

[conf] remove duplicates after setting all flags and sources

Browse Source
This commit is contained in:
Gautier Hattenberger
2013-01-16 23:23:03 +01:00
parent 82af4d1d55
commit 70168207ab
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/airborne/Makefile
+2
View File
@@ -33,6 +33,8 @@ ifneq ($(MAKECMDGOALS),clean)
include $(PAPARAZZI_HOME)/var/$(AIRCRAFT)/Makefile.ac
$(TARGET).srcs += $($(TARGET).EXTRA_SRCS)
include ../../conf/Makefile.local
$(TARGET).CFLAGS := $(sort $($(TARGET).CFLAGS))
$(TARGET).srcs := $(sort $($(TARGET).srcs))
# check if ARCHDIR is set
ifeq ($($(TARGET).ARCHDIR), )
sw/tools/gen_aircraft.ml
+1 -1
View File
@@ -87,7 +87,7 @@ let dump_module_section = fun xml f ->
List.iter (fun target -> fprintf f "%s.CFLAGS += -I modules -I arch/$(ARCH)/modules\n" target) target_list;
**)
(** include modules directory for ALL targets and not just the defined ones **)
fprintf f "$(TARGET).CFLAGS += -I modules -I arch/$(ARCH)/modules\n";
fprintf f "$(TARGET).CFLAGS += -Imodules -Iarch/$(ARCH)/modules\n";
List.iter (fun dir -> let dir_name = (String.uppercase dir)^"_DIR" in fprintf f "%s = modules/%s\n" dir_name dir) dir_list;
(* parse each module *)
List.iter (fun m ->