Skip to content

Commit

Permalink
[makefile] print paparazzi_version when building sim, remove throwing…
Browse files Browse the repository at this point in the history
… error on old UART_NR configure
  • Loading branch information
flixr committed Feb 28, 2013
1 parent 7ce7fc9 commit de3055e
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 8 deletions.
2 changes: 1 addition & 1 deletion Makefile.ac
Expand Up @@ -158,7 +158,7 @@ $(SETTINGS_TELEMETRY) : $(PERIODIC_H)
jsbsim jsbsim.compile: jsbsim.ac_h
cd $(AIRBORNE); $(MAKE) TARGET=jsbsim ARCHI=jsbsim ARCH=jsbsim all

sim sim.compile: sim.ac_h
sim sim.compile: sim.ac_h print_version
cd $(AIRBORNE); $(MAKE) TARGET=sim ARCHI=sim ARCH=sim all

# Rules for backward compatibility (old guys are used to !)
Expand Down
7 changes: 0 additions & 7 deletions sw/airborne/Makefile
Expand Up @@ -55,13 +55,6 @@ ifneq ($(MAKECMDGOALS),clean)
$(TARGET).srcs := $(sort $($(TARGET).srcs))
endif

# check for obsolete MODEM_UART_NR and GPS_UART_NR makefile vars
ifdef GPS_UART_NR
$(error GPS_UART_NR is obsolete, please use GPS_PORT instead to define the Uart to use, e.g. <configure name="GPS_PORT" value="UART1"/>)
endif
ifdef MODEM_UART_NR
$(error MODEM_UART_NR is obsolete, please use MODEM_PORT instead to define the Uart to use, e.g. <configure name="MODEM_PORT" value="UART1"/>)
endif

$(TARGET).install : warn_conf

Expand Down

0 comments on commit de3055e

Please sign in to comment.