Skip to content

Commit

Permalink
[build] fix build dep for tools (#2472)
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger authored and OpenUAS committed Dec 11, 2019
1 parent 521f3cf commit 1b57ff1
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
6 changes: 3 additions & 3 deletions Makefile
Expand Up @@ -144,7 +144,7 @@ static: cockpit tmtc generators sim_static joystick static_h

libpprzlink:
$(MAKE) -C $(EXT) pprzlink.update
$(Q)Q=$(Q) DESTDIR=$(PPRZLINK_INSTALL) PPRZLINK_LIB_VERSION=${PPRZLINK_LIB_VERSION} $(MAKE) -C $(PPRZLINK_DIR) libpprzlink-install
$(Q)Q=$(Q) MAKEFLAGS=-j1 DESTDIR=$(PPRZLINK_INSTALL) PPRZLINK_LIB_VERSION=${PPRZLINK_LIB_VERSION} $(MAKE) -C $(PPRZLINK_DIR) libpprzlink-install

libpprz: libpprzlink _save_build_version
$(MAKE) -C $(LIB)/ocaml
Expand Down Expand Up @@ -184,7 +184,7 @@ subdirs: $(SUBDIRS)

$(MISC): ext

$(SUBDIRS):
$(SUBDIRS): libpprz
$(MAKE) -C $@

$(PPRZCENTER): libpprz
Expand All @@ -193,7 +193,7 @@ $(LOGALIZER): libpprz

static_h: pprzlink_protocol $(GEN_HEADERS)

pprzlink_protocol :
pprzlink_protocol : libpprz
$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
$(Q)test -d $(STATICLIB) || mkdir -p $(STATICLIB)
ifeq ("$(wildcard $(CUSTOM_MESSAGES_XML))","")
Expand Down
4 changes: 4 additions & 0 deletions sw/lib/ocaml/Makefile
Expand Up @@ -123,8 +123,12 @@ xlib-pprz.cmxa dllxlib-pprz.so: $(XCMX)

# trying to set correct dependencies for parallel build
# these are order only depedencies
lib-pprz.cma: | liblib-pprz.a dlllib-pprz.so

lib-pprz.cmxa: | liblib-pprz.a dlllib-pprz.so

xlib-pprz.cma: | libxlib-pprz.a dllxlib-pprz.so

xlib-pprz.cmxa: | libxlib-pprz.a dllxlib-pprz.so

xml_get.cmo : xml_get.ml lib-pprz.cma
Expand Down

0 comments on commit 1b57ff1

Please sign in to comment.