Skip to content

Commit

Permalink
[pprzlink] update ocaml lib install
Browse files Browse the repository at this point in the history
  • Loading branch information
gautierhattenberger committed Jan 3, 2016
1 parent 1b21a2b commit fc10fee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
14 changes: 7 additions & 7 deletions Makefile
Expand Up @@ -91,8 +91,9 @@ XSENS_XML = $(CONF)/xsens_MTi-G.xml
#
# generated header files
#
MESSAGES_INSTALL=$(PAPARAZZI_HOME)/var
PPRZLINK_DIR=sw/ext/pprzlink
PPRZLINK_INSTALL=$(PAPARAZZI_HOME)/var/lib/ocaml
MESSAGES_INSTALL=$(PAPARAZZI_HOME)/var
UBX_PROTOCOL_H=$(STATICINCLUDE)/ubx_protocol.h
MTK_PROTOCOL_H=$(STATICINCLUDE)/mtk_protocol.h
XSENS_PROTOCOL_H=$(STATICINCLUDE)/xsens_protocol.h
Expand Down Expand Up @@ -136,7 +137,10 @@ ground_segment.opt: ground_segment cockpit.opt tmtc.opt

static: cockpit tmtc generators sim_static joystick static_h

libpprz: _save_build_version
libpprzlink:
DESTDIR=$(PPRZLINK_INSTALL) $(MAKE) -C $(PPRZLINK_DIR) libpprzlink-install

libpprz: libpprzlink _save_build_version
$(MAKE) -C $(LIB)/ocaml

multimon:
Expand Down Expand Up @@ -183,11 +187,7 @@ $(LOGALIZER): libpprz

static_h: pprzlink_protocol $(GEN_HEADERS)

pprzlink:
@echo BUILD PPRZLINK
$(Q)$(MAKE) -C $(PPRZLINK_DIR) generators

pprzlink_protocol : $(MESSAGES_XML) pprzlink
pprzlink_protocol : $(MESSAGES_XML)
$(Q)test -d $(STATICINCLUDE) || mkdir -p $(STATICINCLUDE)
$(Q)test -d $(STATICLIB) || mkdir -p $(STATICLIB)
@echo GENERATE $@
Expand Down
2 changes: 1 addition & 1 deletion sw/ext/pprzlink

0 comments on commit fc10fee

Please sign in to comment.