[tools] move fp_proc to pprzlib and add missing makefile

This commit is contained in:
Gautier Hattenberger
2014-03-21 18:16:22 +01:00
parent 974d966065
commit a04c837947
4 changed files with 4 additions and 6 deletions
+3 -5
View File
@@ -25,11 +25,9 @@
Q=@
include ../../Makefile.ocaml
TOOLSDIR = ../../tools/generators
CC = gcc
OCAMLINCLUDES= -I $(TOOLSDIR)
PKG = -package pprz,glibivy
LINKPKG = $(PKG) -linkpkg -dllpath-pkg pprz
@@ -72,9 +70,9 @@ test_stick: test_sdl_stick.o
@echo BUILD $@
$(Q)$(CC) -g -O2 -DSTICK_DBG $(GLIB_CFLAGS) -o $@ $^ sdl_stick.c $(GLIB_LDFLAGS) $(SDL_LDFLAGS)
input2ivy: $(TOOLSDIR)/fp_proc.cmo $(INPUT2IVY_DEPS)
input2ivy: $(LIBPPRZCMA) $(INPUT2IVY_DEPS)
@echo OL $@
$(Q)$(OCAMLC) $(OCAMLINCLUDES) -o $@ $(LINKPKG) $^ $(ML_SDL_OCAMLFLAGS) $(ML_SDL_LFLAGS)
$(Q)$(OCAMLC) -o $@ $(LINKPKG) $^ $(ML_SDL_OCAMLFLAGS) $(ML_SDL_LFLAGS)
sdl_stick.so : $(SDL_STICK_DEPS)
@@ -87,7 +85,7 @@ sdl_stick.so : $(SDL_STICK_DEPS)
%.cmo : %.ml
@echo OC $<
$(Q)$(OCAMLC) $(OCAMLINCLUDES) -c $(PKG) $<
$(Q)$(OCAMLC) -c $(PKG) $<
clean:
$(Q)rm -f *~ core *.o *.bak .depend test*stick *.cmo *.cmi input2ivy
+1 -1
View File
@@ -55,7 +55,7 @@ PKGCOMMON=xml-light,netclient,glibivy,lablgtk2
XINCLUDES=
XPKGCOMMON=xml-light,glibivy,$(LABLGTK2GNOMECANVAS),lablgtk2.glade
SRC = fig.ml debug.ml base64.ml serial.ml ocaml_tools.ml expr_syntax.ml expr_parser.ml expr_lexer.ml extXml.ml env.ml xml2h.ml latlong.ml egm96.ml srtm.ml http.ml maps_support.ml gm.ml iGN.ml geometry_2d.ml cserial.o convert.o ubx.ml pprz.ml xbee.ml logpprz.ml xmlCom.ml os_calls.ml editAirframe.ml defivybus.ml
SRC = fig.ml debug.ml base64.ml serial.ml ocaml_tools.ml expr_syntax.ml expr_parser.ml expr_lexer.ml extXml.ml env.ml xml2h.ml latlong.ml egm96.ml srtm.ml http.ml maps_support.ml gm.ml iGN.ml geometry_2d.ml cserial.o convert.o ubx.ml pprz.ml xbee.ml logpprz.ml xmlCom.ml os_calls.ml editAirframe.ml defivybus.ml fp_proc.ml
CMO = $(SRC:.ml=.cmo)
CMX = $(SRC:.ml=.cmx)