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

[makefile] use mktemp to create unique temp files

Browse Source 
This assumes that mktemp is available, but should provide a better solution for issue #229.

Also create a variable holding the tempfile name which is unique to each target.
This should prevent problems with parallel builds, since these variables are global.
This commit is contained in:
Felix Ruess
2013-03-21 16:43:42 +01:00
parent 7325f9fec8
commit 77cd732702
7 changed files with 112 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+38 -27
View File
@@ -93,9 +93,6 @@ ABI_MESSAGES_H=$(STATICINCLUDE)/abi_messages.h
GEN_HEADERS = $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(DL_PROTOCOL_H) $(DL_PROTOCOL2_H) $(ABI_MESSAGES_H) GEN_HEADERS = $(MESSAGES_H) $(MESSAGES2_H) $(UBX_PROTOCOL_H) $(MTK_PROTOCOL_H) $(XSENS_PROTOCOL_H) $(DL_PROTOCOL_H) $(DL_PROTOCOL2_H) $(ABI_MESSAGES_H)
# default directory for temporary files
TMPDIR ?= /tmp
all: ground_segment ext lpctools all: ground_segment ext lpctools
print_build_version: print_build_version:
@@ -157,47 +154,61 @@ static_h: $(GEN_HEADERS)
$(MESSAGES_H) : $(MESSAGES_XML) tools $(MESSAGES_H) : $(MESSAGES_XML) tools
$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE) $(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages.out $< telemetry > $(TMPDIR)/msg.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/msg.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages.out $< telemetry > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(MESSAGES2_H) : $(MESSAGES_XML) tools $(MESSAGES2_H) : $(MESSAGES_XML) tools
$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE) $(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages2.out $< telemetry > $(TMPDIR)/msg2.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/msg2.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages2.out $< telemetry > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(UBX_PROTOCOL_H) : $(UBX_XML) tools $(UBX_PROTOCOL_H) : $(UBX_XML) tools
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_ubx.out $< > $(TMPDIR)/ubx.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/ubx.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_ubx.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(MTK_PROTOCOL_H) : $(MTK_XML) tools $(MTK_PROTOCOL_H) : $(MTK_XML) tools
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_mtk.out $< > $(TMPDIR)/mtk.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/mtk.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_mtk.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(XSENS_PROTOCOL_H) : $(XSENS_XML) tools $(XSENS_PROTOCOL_H) : $(XSENS_XML) tools
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_xsens.out $< > $(TMPDIR)/xsens.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/xsens.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_xsens.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(DL_PROTOCOL_H) : $(MESSAGES_XML) tools $(DL_PROTOCOL_H) : $(MESSAGES_XML) tools
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages.out $< datalink > $(TMPDIR)/dl.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/dl.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages.out $< datalink > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(DL_PROTOCOL2_H) : $(MESSAGES_XML) tools $(DL_PROTOCOL2_H) : $(MESSAGES_XML) tools
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages2.out $< datalink > $(TMPDIR)/dl2.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/dl2.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_messages2.out $< datalink > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(ABI_MESSAGES_H) : $(MESSAGES_XML) tools $(ABI_MESSAGES_H) : $(MESSAGES_XML) tools
@echo BUILD $@ @echo GENERATE $@
$(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_abi.out $< airborne > $(TMPDIR)/abi.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/abi.h $@ $(Q)PAPARAZZI_SRC=$(PAPARAZZI_SRC) PAPARAZZI_HOME=$(PAPARAZZI_HOME) $(TOOLS)/gen_abi.out $< airborne > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
include Makefile.ac include Makefile.ac
Makefile.ac
+34 -23
View File
@@ -62,9 +62,6 @@ endif
# telemetry periodic frequency defaults to 60Hz # telemetry periodic frequency defaults to 60Hz
TELEMETRY_FREQUENCY ?= 60 TELEMETRY_FREQUENCY ?= 60
# default directory for temporary files
TMPDIR ?= /tmp
init: init:
@[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p $(PAPARAZZI_HOME)/var/maps; mkdir -p $(PAPARAZZI_HOME)/var/include) @[ -d $(PAPARAZZI_HOME) ] || (echo "Copying config example in your $(PAPARAZZI_HOME) directory"; mkdir -p $(PAPARAZZI_HOME); cp -a conf $(PAPARAZZI_HOME); cp -a data $(PAPARAZZI_HOME); mkdir -p $(PAPARAZZI_HOME)/var/maps; mkdir -p $(PAPARAZZI_HOME)/var/include)
@@ -89,56 +86,70 @@ makefile_ac: $(MAKEFILE_AC)
$(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5) $(AIRFRAME_H) : $(CONF)/$(AIRFRAME_XML) $(CONF_XML) $(AIRCRAFT_MD5)
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > $(TMPDIR)/airframe.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/airframe.h $@ $(Q)$(TOOLS)/gen_airframe.out $(AC_ID) $(AIRCRAFT) $(MD5SUM) $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(Q)cp $(CONF)/airframes/airframe.dtd $(AIRCRAFT_CONF_DIR)/airframes $(Q)cp $(CONF)/airframes/airframe.dtd $(AIRCRAFT_CONF_DIR)/airframes
$(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(TOOLS)/gen_radio.out $(RADIO_H) : $(CONF)/$(RADIO) $(CONF_XML) $(TOOLS)/gen_radio.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_radio.out $< > $(TMPDIR)/radio.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/radio.h $@ $(Q)$(TOOLS)/gen_radio.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
$(Q)cp $< $(AIRCRAFT_CONF_DIR)/radios $(Q)cp $< $(AIRCRAFT_CONF_DIR)/radios
$(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TELEMETRY) $(MAKEFILE_AC) $(PERIODIC_H) : $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF_XML) $(CONF)/$(TELEMETRY) $(MAKEFILE_AC)
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF)/$(TELEMETRY) $(TELEMETRY_FREQUENCY) $(SETTINGS_TELEMETRY) > $@ $(eval $@_TMP := $(shell mktemp))
$(Q)$(TOOLS)/gen_periodic.out $(CONF)/$(AIRFRAME_XML) $(MESSAGES_XML) $(CONF)/$(TELEMETRY) $(TELEMETRY_FREQUENCY) $(SETTINGS_TELEMETRY) > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(Q)cp $< $(AIRCRAFT_CONF_DIR)
$(Q)cp $(CONF)/$(TELEMETRY) $(AIRCRAFT_CONF_DIR)/telemetry $(Q)cp $(CONF)/$(TELEMETRY) $(AIRCRAFT_CONF_DIR)/telemetry
$(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(TOOLS)/gen_flight_plan.out $(FLIGHT_PLAN_H) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(TOOLS)/gen_flight_plan.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_flight_plan.out $< > $(TMPDIR)/$(AC_ID)_fp.h $(eval $@_TMP := $(shell mktemp))
$(Q)mv $(TMPDIR)/$(AC_ID)_fp.h $@ $(Q)$(TOOLS)/gen_flight_plan.out $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(Q)cp $< $(AIRCRAFT_CONF_DIR)/flight_plans $(Q)cp $< $(AIRCRAFT_CONF_DIR)/flight_plans
$(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(TOOLS)/gen_flight_plan.out $(FLIGHT_PLAN_XML) : $(CONF)/$(FLIGHT_PLAN) $(CONF_XML) $(TOOLS)/gen_flight_plan.out
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_flight_plan.out -dump $< > $@ $(eval $@_TMP := $(shell mktemp))
$(Q)$(TOOLS)/gen_flight_plan.out -dump $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(SETTINGS_H) : $(SETTINGS_XMLS) $(CONF_XML) $(SETTINGS_MODULES) $(SETTINGS_TELEMETRY) $(TOOLS)/gen_settings.out $(SETTINGS_H) : $(SETTINGS_XMLS) $(CONF_XML) $(SETTINGS_MODULES) $(SETTINGS_TELEMETRY) $(TOOLS)/gen_settings.out
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_settings.out $(SETTINGS_XML) $(SETTINGS_TELEMETRY) $(SETTINGS_XMLS) $(SETTINGS_MODULES) > $@ $(eval $@_TMP := $(shell mktemp))
$(Q)$(TOOLS)/gen_settings.out $(SETTINGS_XML) $(SETTINGS_TELEMETRY) $(SETTINGS_XMLS) $(SETTINGS_MODULES) > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(Q)cp $(SETTINGS_XMLS) $(AIRCRAFT_CONF_DIR)/settings $(Q)cp $(SETTINGS_XMLS) $(AIRCRAFT_CONF_DIR)/settings
$(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out $(CONF)/modules/*.xml $(MODULES_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_modules.out $(CONF)/modules/*.xml
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_modules.out $(SETTINGS_MODULES) $< > $@ $(eval $@_TMP := $(shell mktemp))
$(Q)$(TOOLS)/gen_modules.out $(SETTINGS_MODULES) $< > $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(AUTOPILOT_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_autopilot.out $(CONF)/autopilot/*.xml $(AUTOPILOT_H) : $(CONF)/$(AIRFRAME_XML) $(TOOLS)/gen_autopilot.out $(CONF)/autopilot/*.xml
$(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED) $(Q)test -d $(AC_GENERATED) || mkdir -p $(AC_GENERATED)
@echo BUILD $@ @echo GENERATE $@
$(Q)$(TOOLS)/gen_autopilot.out $(CONF)/$(AIRFRAME_XML) $@ $(eval $@_TMP := $(shell mktemp))
$(Q)$(TOOLS)/gen_autopilot.out $(CONF)/$(AIRFRAME_XML) $($@_TMP)
$(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@ $(Q)chmod a+r $@
$(SETTINGS_MODULES) : $(MODULES_H) $(SETTINGS_MODULES) : $(MODULES_H)
data/maps/Makefile
+7 -8
View File
@@ -3,9 +3,6 @@
DATADIR = $(PAPARAZZI_HOME)/conf/maps_data DATADIR = $(PAPARAZZI_HOME)/conf/maps_data
Q=@ Q=@
# default directory for temporary files
TMPDIR ?= /tmp
all: $(PAPARAZZI_HOME)/conf/maps.xml all: $(PAPARAZZI_HOME)/conf/maps.xml
clean: clean:
@@ -25,13 +22,15 @@ $(DATADIR)/maps.google.com: $(DATADIR) FORCE
$(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com $(PAPARAZZI_HOME)/conf/maps.xml: $(DATADIR)/maps.google.com
$(eval GOOGLE_VERSION := $(shell grep -E "http://khm[0-9]+.google.com/kh/v=[0-9]+.x26" $(DATADIR)/maps.google.com | sed -E 's#.*http://khm[0-9]+.google.com/kh/v=##;s#.x26.*##')) $(eval GOOGLE_VERSION := $(shell grep -E "http://khm[0-9]+.google.com/kh/v=[0-9]+.x26" $(DATADIR)/maps.google.com | sed -E 's#.*http://khm[0-9]+.google.com/kh/v=##;s#.x26.*##'))
$(eval $@_TMP := $(shell mktemp))
@echo "Updated google maps version to $(GOOGLE_VERSION)" @echo "Updated google maps version to $(GOOGLE_VERSION)"
@echo "-----------------------------------------------" @echo "-----------------------------------------------"
$(Q)echo "<!DOCTYPE maps SYSTEM \"maps.dtd\">" > $(TMPDIR)/maps.xml $(Q)echo "<!DOCTYPE maps SYSTEM \"maps.dtd\">" > $($@_TMP)
$(Q)echo "" >> $(TMPDIR)/maps.xml $(Q)echo "" >> $($@_TMP)
$(Q)echo "<maps google_version=\"$(GOOGLE_VERSION)\"/>" >> $(TMPDIR)/maps.xml $(Q)echo "<maps google_version=\"$(GOOGLE_VERSION)\"/>" >> $($@_TMP)
$(Q)echo "" >> $(TMPDIR)/maps.xml $(Q)echo "" >> $($@_TMP)
$(Q)mv $(TMPDIR)/maps.xml $@ $(Q)mv $($@_TMP) $@
$(Q)chmod a+r $@
FORCE: FORCE:
.PHONY: all clean .PHONY: all clean
sw/in_progress/button/Makefile
+5 -6
View File
@@ -27,10 +27,6 @@ OCAMLC = ocamlc
OCAMLOPT = ocamlopt OCAMLOPT = ocamlopt
INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../../lib/ocaml INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../../lib/ocaml
# default directory for temporary files
TMPDIR ?= /tmp
all: panic all: panic
$^ $^
@@ -58,8 +54,11 @@ export.cmo : gtk_export.cmo
export.cmx : gtk_export.cmx export.cmx : gtk_export.cmx
gtk_export.ml : export.glade gtk_export.ml : export.glade
grep -v invisible_char $< > $(TMPDIR)/$< @echo GLADE $@
lablgladecc2 -root export -hide-default $(TMPDIR)/$< | grep -B 1000000 " end" > $@ $(eval $@_TMP := $(shell mktemp))
$(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)lablgladecc2 -root export -hide-default $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
pt : ahrsview imuview ahrs2fg pt : ahrsview imuview ahrs2fg
sw/lib/ocaml/Makefile
+16 -15
View File
@@ -32,9 +32,6 @@ OCAMLYACC=ocamlyacc
OCAMLMKLIB=ocamlmklib OCAMLMKLIB=ocamlmklib
OCAMLLIBDIR=$(shell $(OCAMLC) -where) OCAMLLIBDIR=$(shell $(OCAMLC) -where)
# default directory for temporary files
TMPDIR ?= /tmp
# verbose ocamlmklib: Print commands before executing them # verbose ocamlmklib: Print commands before executing them
#VERBOSITY = -verbose #VERBOSITY = -verbose
VERBOSITY = VERBOSITY =
@@ -153,27 +150,31 @@ expr_syntax.cmo : expr_syntax.cmi
gtk_papget_editor.ml : widgets.glade gtk_papget_editor.ml : widgets.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$@_$< $(eval $@_TMP := $(shell mktemp))
$(Q)lablgladecc2 -root papget_editor -hide-default $(TMPDIR)/$@_$< | grep -B 1000000 " end" > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$@_$< $(Q)lablgladecc2 -root papget_editor -hide-default $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
gtk_papget_text_editor.ml : widgets.glade gtk_papget_text_editor.ml : widgets.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$@_$< $(eval $@_TMP := $(shell mktemp))
$(Q)lablgladecc2 -root table_text_editor -hide-default $(TMPDIR)/$@_$< | grep -B 1000000 " end" > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$@_$< $(Q)lablgladecc2 -root table_text_editor -hide-default $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
gtk_papget_gauge_editor.ml : widgets.glade gtk_papget_gauge_editor.ml : widgets.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$@_$< $(eval $@_TMP := $(shell mktemp))
$(Q)lablgladecc2 -root table_gauge_editor -hide-default $(TMPDIR)/$@_$< | grep -B 1000000 " end" > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$@_$< $(Q)lablgladecc2 -root table_gauge_editor -hide-default $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
gtk_papget_led_editor.ml : widgets.glade gtk_papget_led_editor.ml : widgets.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$@_$< $(eval $@_TMP := $(shell mktemp))
$(Q)$(Q)lablgladecc2 -root table_led_editor -hide-default $(TMPDIR)/$@_$< | grep -B 1000000 " end" > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$@_$< $(Q)$(Q)lablgladecc2 -root table_led_editor -hide-default $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
clean : clean :
sw/logalizer/Makefile
+4 -6
View File
@@ -30,9 +30,6 @@ LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz
XPKG = -package pprz.xlib XPKG = -package pprz.xlib
XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib
# default directory for temporary files
TMPDIR ?= /tmp
all: play plotter plot sd2log plotprofile openlog2tlm all: play plotter plot sd2log plotprofile openlog2tlm
play : log_file.cmo play_core.cmo play.cmo play : log_file.cmo play_core.cmo play.cmo
@@ -83,9 +80,10 @@ export.cmx : gtk_export.cmx
gtk_export.ml : export.glade gtk_export.ml : export.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$< $(eval $@_TMP := $(shell mktemp))
$(Q)lablgladecc2 -root export -hide-default $(TMPDIR)/$< | grep -B 1000000 " end" > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$< $(Q)lablgladecc2 -root export -hide-default $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
pt : ahrsview imuview ahrs2fg pt : ahrsview imuview ahrs2fg
sw/supervision/Makefile
+8 -9
View File
@@ -31,9 +31,6 @@ XLINKPKG = $(XPKG) -linkpkg -dllpath-pkg pprz.xlib
PAPARAZZICENTERCMO = gtk_pc.cmo gtk_process.cmo pc_common.cmo pc_aircraft.cmo pc_control_panel.cmo paparazzicenter.cmo PAPARAZZICENTERCMO = gtk_pc.cmo gtk_process.cmo pc_common.cmo pc_aircraft.cmo pc_control_panel.cmo paparazzicenter.cmo
# default directory for temporary files
TMPDIR ?= /tmp
all: paparazzicenter all: paparazzicenter
paparazzicenter : $(PAPARAZZICENTERCMO) paparazzicenter : $(PAPARAZZICENTERCMO)
@@ -42,15 +39,17 @@ paparazzicenter : $(PAPARAZZICENTERCMO)
gtk_pc.ml : paparazzicenter.glade gtk_pc.ml : paparazzicenter.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$< $(eval $@_TMP := $(shell mktemp))
$(Q)lablgladecc2 -hide-default -root window $(TMPDIR)/$< > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$< $(Q)lablgladecc2 -hide-default -root window $($@_TMP) > $@
$(Q)rm -f $($@_TMP)
gtk_process.ml : paparazzicenter.glade gtk_process.ml : paparazzicenter.glade
@echo GLADE $@ @echo GLADE $@
$(Q)grep -v invisible_char $< > $(TMPDIR)/$< $(eval $@_TMP := $(shell mktemp))
$(Q)lablgladecc2 -hide-default -root hbox_program $(TMPDIR)/$< | grep -B 1000000 " end" > $@ $(Q)grep -v invisible_char $< > $($@_TMP)
$(Q)rm $(TMPDIR)/$< $(Q)lablgladecc2 -hide-default -root hbox_program $($@_TMP) | grep -B 1000000 " end" > $@
$(Q)rm -f $($@_TMP)
%.cmo : %.ml %.cmo : %.ml
@echo OC $< @echo OC $<