mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-09 22:49:53 +08:00
[build] try to improve dependency and not do unnecessary things (#2244)
This commit is contained in:
committed by
GitHub
parent
606cd4eea2
commit
da4cc6bea9
+9
-10
@@ -153,14 +153,15 @@ print_version:
|
||||
@echo "Paparazzi version" $(GIT_DESC)$(VERSION_MATCH)
|
||||
@echo "-----------------------------------------------------------------------"
|
||||
|
||||
all_ac_h: $(SRCS_LIST) qt_project
|
||||
all_ac_h: $(SRCS_LIST) qt_project generate_keys
|
||||
|
||||
$(SRCS_LIST) : $(CONF_XML) $(AIRFRAME_H) $(MODULES_H) autopilot_h $(SETTINGS_H) $(MAKEFILE_AC) $(PERIODIC_H)
|
||||
$(SRCS_LIST) : $(CONF_XML) $(AIRFRAME_H) $(MODULES_H) $(SETTINGS_H) $(MAKEFILE_AC) $(PERIODIC_H)
|
||||
@echo "TARGET: " $(TARGET) > $(SRCS_LIST)
|
||||
@echo "CFLAGS: " $(CFLAGS) $(IINCDIR) $(TOPT) >> $(SRCS_LIST)
|
||||
@echo "LDFLAGS: " $($(TARGET).LDFLAGS) >> $(SRCS_LIST)
|
||||
@echo "srcs: " $($(TARGET).srcs) >> $(SRCS_LIST)
|
||||
@echo -n "headers: " >> $(SRCS_LIST)
|
||||
ifneq ($(PAPARAZZI_QT_GEN),)
|
||||
@echo $(VPATH) > $(TMP_LIST)
|
||||
@echo $($(TARGET).srcs) >> $(TMP_LIST)
|
||||
ifeq (,$(findstring cpp,$($(TARGET).srcs)))
|
||||
@@ -176,6 +177,7 @@ else
|
||||
@echo ../../sw/tools/find_vpaths.py $(CXX) $(TMP_LIST) $(PAPARAZZI_SRC)
|
||||
$(Q)cd $(PAPARAZZI_SRC) ; ./sw/tools/find_vpaths.py $(CXX) $(TMP_LIST) $(PAPARAZZI_SRC) >> $(SRCS_LIST)
|
||||
endif
|
||||
endif
|
||||
|
||||
CARGO=$(shell which cargo)
|
||||
generate_keys:
|
||||
@@ -199,7 +201,7 @@ flight_plan_ac_h : $(FLIGHT_PLAN_H) $(FLIGHT_PLAN_XML)
|
||||
|
||||
makefile_ac: $(MAKEFILE_AC)
|
||||
|
||||
$(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5) generate_keys
|
||||
$(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5) $(GENERATORS)/gen_airframe.out $(GENERATORS)/gen_autopilot.out $(CONF)/autopilot/*.xml
|
||||
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
|
||||
@echo GENERATE $@ from $(AIRFRAME_XML)
|
||||
$(eval $@_TMP := $(shell $(MKTEMP)))
|
||||
@@ -207,6 +209,8 @@ $(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5) generate_key
|
||||
$(Q)mv $($@_TMP) $@
|
||||
$(Q)chmod a+r $@
|
||||
$(Q)cp $(CONF)/airframes/airframe.dtd $(AIRCRAFT_CONF_DIR)/airframes
|
||||
@echo GENERATE autopilots in $(AUTOPILOT_DIR)
|
||||
$(Q)$(GENERATORS)/gen_autopilot.out $(CONF)/$(AIRFRAME_XML) $(AUTOPILOT_DIR) $(SETTINGS_AUTOPILOT)
|
||||
|
||||
$(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(GENERATORS)/gen_radio.out
|
||||
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
|
||||
@@ -243,7 +247,7 @@ $(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(GENERATORS)/gen_flight
|
||||
$(Q)chmod a+r $@
|
||||
|
||||
# split system settings (generated) from user settings with a '--'
|
||||
$(SETTINGS_H) : $(SETTINGS_XMLS_DEP) $(CONF_XML) $(SETTINGS_MODULES) $(SETTINGS_TELEMETRY) $(GENERATORS)/gen_settings.out autopilot_h
|
||||
$(SETTINGS_H) : $(SETTINGS_XMLS_DEP) $(CONF_XML) $(SETTINGS_MODULES) $(SETTINGS_TELEMETRY) $(SETTINGS_AUTOPILOT) $(GENERATORS)/gen_settings.out
|
||||
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
|
||||
@echo GENERATE $@
|
||||
$(eval $@_TMP := $(shell $(MKTEMP)))
|
||||
@@ -260,11 +264,6 @@ $(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(FLIGHT_PLAN_XML) $(GENERATORS)/gen_modu
|
||||
$(Q)mv $($@_TMP) $@
|
||||
$(Q)chmod a+r $@
|
||||
|
||||
autopilot_h : $(CONF)/$(AIRFRAME_XML) $(GENERATORS)/gen_autopilot.out $(CONF)/autopilot/*.xml
|
||||
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
|
||||
@echo GENERATE autopilots in $(AUTOPILOT_DIR)
|
||||
$(Q)$(GENERATORS)/gen_autopilot.out $(CONF)/$(AIRFRAME_XML) $(AUTOPILOT_DIR) $(SETTINGS_AUTOPILOT)
|
||||
|
||||
$(SETTINGS_MODULES) : $(MODULES_H)
|
||||
$(SETTINGS_TELEMETRY) : $(PERIODIC_H)
|
||||
$(SETTINGS_FLIGHTPLAN) : $(FLIGHT_PLAN_H)
|
||||
@@ -297,4 +296,4 @@ clean_ac :
|
||||
@echo "CLEANING $(AIRCRAFT)"
|
||||
$(Q)rm -fr $(AIRCRAFT_BUILD_DIR)
|
||||
|
||||
.PHONY: all_ac_h radio_ac_h flight_plan_ac_h makefile_ac clean_ac print_version
|
||||
.PHONY: all_ac_h radio_ac_h flight_plan_ac_h makefile_ac clean_ac print_version generate_keys
|
||||
|
||||
Reference in New Issue
Block a user