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

[makefile] ocaml: -threads is sufficient

Browse Source 
no need to add the threads package explicitly or add gtkThread.cm[ox]
This commit is contained in:
Felix Ruess
2013-03-19 15:50:32 +01:00
parent 2f2a0fafcd
commit bcb56b8ea5
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/Makefile
+3 -3
View File
@@ -40,7 +40,7 @@ LIBS=
LIBSX=$(LIBS:.cma=.cmxa) LIBSX=$(LIBS:.cma=.cmxa)
INCLUDES= -I ../multimon INCLUDES= -I ../multimon
PKG = -package pprz.xlib,threads PKG = -package pprz.xlib
LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz.xlib LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz.xlib
ML= gtk_setting_time.ml gtk_strip.ml horizon.ml strip.ml gtk_save_settings.ml saveSettings.ml page_settings.ml pages.ml speech.ml plugin.ml sectors.ml map2d.ml editFP.ml live.ml particules.ml papgets.ml gcs.ml ML= gtk_setting_time.ml gtk_strip.ml horizon.ml strip.ml gtk_save_settings.ml saveSettings.ml page_settings.ml pages.ml speech.ml plugin.ml sectors.ml map2d.ml editFP.ml live.ml particules.ml papgets.ml gcs.ml
@@ -54,11 +54,11 @@ opt : $(MAIN).opt
$(MAIN) : $(CMO) $(XLIBPPRZCMA) $(LIBPPRZCMA) $(MAIN) : $(CMO) $(XLIBPPRZCMA) $(LIBPPRZCMA)
@echo OL $@ @echo OL $@
$(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LIBS) $(LINKPKG) gtkThread.cmo myGtkInit.cmo $(CMO) -o $@ $(Q)$(OCAMLFIND) $(OCAMLC) $(OCAMLCFLAGS) $(INCLUDES) $(LIBS) $(LINKPKG) myGtkInit.cmo $(CMO) -o $@
$(MAIN).opt : $(CMX) $(MAIN).opt : $(CMX)
@echo OOL $@ @echo OOL $@
$(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(LIBSX) $(LINKPKG) gtkThread.cmx gtkInit.cmx $(CMX) -o $@ $(Q)$(OCAMLFIND) $(OCAMLOPT) $(OCAMLCFLAGS) $(INCLUDES) $(LIBSX) $(LINKPKG) gtkInit.cmx $(CMX) -o $@
%.cmo: %.ml %.cmo: %.ml