mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-05-28 18:07:25 +08:00
[fix][tmtc] find ivy includes on OSX for ivy_serial_bridge
also add the built binaries to clean target
This commit is contained in:
@@ -38,7 +38,7 @@ VAR = ../../../var
|
||||
all: link server messages settings dia diadec $(VAR)/boa.conf ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge
|
||||
|
||||
clean:
|
||||
rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp
|
||||
rm -f link server messages settings dia diadec *.bak *~ core *.o .depend *.opt *.out *.cm* ivy_tcp_aircraft ivy_tcp_controller broadcaster ivy2udp ivy_serial_bridge gpsd2ivy
|
||||
|
||||
OCAMLC = ocamlc
|
||||
OCAMLOPT = ocamlopt
|
||||
@@ -139,20 +139,27 @@ GLIB_LDFLAGS = `pkg-config glib-2.0 --libs` -lglibivy -lpcre $(FPIC)
|
||||
GTK_CFLAGS = -Wall `pkg-config gtk+-2.0 --cflags` $(FPIC)
|
||||
GTK_LDFLAGS = `pkg-config gtk+-2.0 --libs` -lglibivy -lpcre $(FPIC)
|
||||
|
||||
UNAME = $(shell uname -s)
|
||||
|
||||
ifeq ("$(UNAME)","Darwin")
|
||||
C_LIBRARYS = $(shell if test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; elif test -d /opt/local/lib; then echo "-L/opt/local/lib"; fi)
|
||||
C_INCLUDES = $(shell if test -d /opt/paparazzi/include; then echo "-I/opt/paparazzi/include"; elif test -d /opt/local/include; then echo "-I/opt/local/include"; fi)
|
||||
endif
|
||||
|
||||
gpsd2ivy: gpsd2ivy.c
|
||||
$(CC) $(GLIB_CFLAGS) -o $@ $< $(GLIB_LDFLAGS) -lgps
|
||||
$(CC) $(GLIB_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GLIB_LDFLAGS) -lgps
|
||||
|
||||
c_ivy_client_example_1: c_ivy_client_example_1.c
|
||||
$(CC) $(GLIB_CFLAGS) -o $@ $< $(GLIB_LDFLAGS)
|
||||
$(CC) $(GLIB_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GLIB_LDFLAGS)
|
||||
|
||||
c_ivy_client_example_2: c_ivy_client_example_2.c
|
||||
$(CC) $(GLIB_CFLAGS) -o $@ $< $(GLIB_LDFLAGS)
|
||||
$(CC) $(GLIB_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GLIB_LDFLAGS)
|
||||
|
||||
c_ivy_client_example_3: c_ivy_client_example_3.c
|
||||
$(CC) $(GTK_CFLAGS) -o $@ $< $(GTK_LDFLAGS)
|
||||
$(CC) $(GTK_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GTK_LDFLAGS)
|
||||
|
||||
ivy_serial_bridge: ivy_serial_bridge.c
|
||||
$(CC) $(GTK_CFLAGS) -o $@ $< $(GTK_LDFLAGS)
|
||||
$(CC) $(GTK_CFLAGS) $(C_LIBRARYS) $(C_INCLUDES) -o $@ $< $(GTK_LDFLAGS)
|
||||
|
||||
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user