Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 09:58:23 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

reverted the changes to not use hardcoded make, needs to be handled better than MAKE:=

Browse Source
This commit is contained in:
Felix Ruess
2012-02-13 14:34:55 +01:00
parent 49992264e0
commit 0e94dfea1d
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+3 -3
View File
@@ -46,7 +46,7 @@ MULTIMON=sw/ground_segment/multimon
MISC=sw/ground_segment/misc MISC=sw/ground_segment/misc
LOGALIZER=sw/logalizer LOGALIZER=sw/logalizer
SIMULATOR=sw/simulator SIMULATOR=sw/simulator
MAKE:=$(MAKE) PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) MAKE=make PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
CONF=$(PAPARAZZI_SRC)/conf CONF=$(PAPARAZZI_SRC)/conf
STATICINCLUDE =$(PAPARAZZI_HOME)/var/include STATICINCLUDE =$(PAPARAZZI_HOME)/var/include
MESSAGES_H=$(STATICINCLUDE)/messages.h MESSAGES_H=$(STATICINCLUDE)/messages.h
@@ -248,7 +248,7 @@ cleanspaces:
distclean : dist_clean distclean : dist_clean
dist_clean : dist_clean :
@echo "Warning: This removes all non-repository files. This means you will loose your aircraft list, your maps, your logfiles, ... if you want this, then run: $(MAKE) dist_clean_irreversible" @echo "Warning: This removes all non-repository files. This means you will loose your aircraft list, your maps, your logfiles, ... if you want this, then run: make dist_clean_irreversible"
dist_clean_irreversible: clean dist_clean_irreversible: clean
rm -rf conf/srtm_data rm -rf conf/srtm_data
@@ -266,7 +266,7 @@ test_all_example_airframes:
$(MAKE) AIRCRAFT=EasyStar_ETS clean_ac ap sim $(MAKE) AIRCRAFT=EasyStar_ETS clean_ac ap sim
test_all_example_airframes2: test_all_example_airframes2:
for ap in `grep name conf/conf.xml.example | sed -e 's/.*name=\"//' | sed -e 's/"//'`; do echo "Making $$ap"; $(MAKE) -C ./ AIRCRAFT=$$ap clean_ac ap.compile || exit 1; done for ap in `grep name conf/conf.xml.example | sed -e 's/.*name=\"//' | sed -e 's/"//'`; do echo "Making $$ap"; make -C ./ AIRCRAFT=$$ap clean_ac ap.compile || exit 1; done
commands: paparazzi sw/simulator/launchsitl commands: paparazzi sw/simulator/launchsitl
Makefile.ac
+3 -3
View File
@@ -51,7 +51,7 @@ SETTINGS_FILE=$(SETTINGS:settings%=%)
#TUNING_FILE=$(subst ,_,$(SETTINGS:settings/%.xml=%)).h #TUNING_FILE=$(subst ,_,$(SETTINGS:settings/%.xml=%)).h
TUNING_H=$(AC_GENERATED)/tuning.h TUNING_H=$(AC_GENERATED)/tuning.h
SUPERVISION=./paparazzi SUPERVISION=./paparazzi
MAKE:=$(MAKE) PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) MAKE=make PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME)
MODULES_H=$(AC_GENERATED)/modules.h MODULES_H=$(AC_GENERATED)/modules.h
AIRCRAFT_MD5=$(AIRCRAFT_CONF_DIR)/aircraft.md5 AIRCRAFT_MD5=$(AIRCRAFT_CONF_DIR)/aircraft.md5
@@ -138,7 +138,7 @@ $(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out $(CONF)/modules/
$(SETTINGS_MODULES) : $(MODULES_H) $(SETTINGS_MODULES) : $(MODULES_H)
%.ac_h : $(TOOLS)/gen_aircraft.out %.ac_h : $(TOOLS)/gen_aircraft.out
$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type '$(MAKE) AIRCRAFT=AircraftName ...'"; exit 1; fi $(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
@echo BUILD $(AIRCRAFT), TARGET $* @echo BUILD $(AIRCRAFT), TARGET $*
+$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) TARGET=$* Q=$(Q) $(TOOLS)/gen_aircraft.out $(AIRCRAFT) +$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) TARGET=$* Q=$(Q) $(TOOLS)/gen_aircraft.out $(AIRCRAFT)
@@ -187,5 +187,5 @@ check_fuses_fbw: fbw.check_fuses
hard_ac ac: ac_h fbw ap hard_ac ac: ac_h fbw ap
clean_ac : clean_ac :
$(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type '$(MAKE) AIRCRAFT=AircraftName ...'"; exit 1; fi $(Q)if (expr "$(AIRCRAFT)"); then : ; else echo "AIRCRAFT undefined: type 'make AIRCRAFT=AircraftName ...'"; exit 1; fi
rm -fr $(PAPARAZZI_HOME)/var/$(AIRCRAFT) rm -fr $(PAPARAZZI_HOME)/var/$(AIRCRAFT)
sw/ground_segment/multimon/Makefile
+1 -1
View File
@@ -32,7 +32,7 @@ LD =ld
LDFLAGS =-lm LDFLAGS =-lm
HOSTCC =gcc HOSTCC =gcc
CC =gcc CC =gcc
MAKE :=$(MAKE) MAKE =make
CPP =$(CC) -E CPP =$(CC) -E
AR =ar AR =ar
STRIP =strip STRIP =strip