Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Replacing spaces between include path argument and the directories to be added to the include path. #142

Browse Source
This commit is contained in:
Bernard Davison
2012-03-03 14:03:15 +11:00
parent 5ab3306f49
commit 47f340faa7
18 changed files with 49 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/multimon/Makefile
+15 -18
View File
@@ -3,8 +3,21 @@ Q=@
DEBUG =n DEBUG =n
MACHINE := $(shell uname -m) MACHINE := $(shell uname -m)
AS86 =as86 -0 -a
LD86 =ld86 -0
AS =as
LD =ld
LDFLAGS =-lm
HOSTCC =gcc
CC =gcc
MAKE =make
CPP =$(CC) -E
AR =ar
STRIP =strip
MKDIR =mkdir
OCAMLC =ocamlc
CFLAGS =-Wall -Wstrict-prototypes -I/usr/X11R6/include -I `ocamlc -where` CFLAGS =-Wall -Wstrict-prototypes -I/usr/X11R6/include -I`$(OCAMLC) -where`
ifeq ($(DEBUG),y) ifeq ($(DEBUG),y)
CFLAGS +=-g -O CFLAGS +=-g -O
else else
@@ -20,25 +33,9 @@ endif
LDFLAGSX =-lX11 -L/usr/X11R6/lib LDFLAGSX =-lX11 -L/usr/X11R6/lib
#BINDIR =bin-$(shell uname -m) #BINDIR =bin-$(shell uname -m)
BINDIR =. BINDIR =.
AS86 =as86 -0 -a
LD86 =ld86 -0
AS =as
LD =ld
LDFLAGS =-lm
HOSTCC =gcc
CC =gcc
MAKE =make
CPP =$(CC) -E
AR =ar
STRIP =strip
MKDIR =mkdir
OCAMLC =ocamlc
UNAME = $(shell uname -s) UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Linux") ifeq ("$(UNAME)","Linux")
OBJFILES=pprzlib.o hdlc.o demod_afsk12.o demodml.o costabi.o gen_hdlc.o ml_hdlc.o demod.cmo hdlc.cmo OBJFILES=pprzlib.o hdlc.o demod_afsk12.o demodml.o costabi.o gen_hdlc.o ml_hdlc.o demod.cmo hdlc.cmo
@@ -100,7 +97,7 @@ costabi.c costabf.c: $(BINDIR)/mkcostab
libtest: pprzlib.o demodml.c demod.ml test.ml libtest: pprzlib.o demodml.c demod.ml test.ml
ocamlc -custom -o $@ pprzlib.o demodml.c -I +lablgtk2 unix.cma lablgtk.cma demod.ml test.ml $(OCAMLC) -custom -o $@ pprzlib.o demodml.c -I +lablgtk2 unix.cma lablgtk.cma demod.ml test.ml
hdlc_test : multimon.cma test_gen_hdlc.ml hdlc_test : multimon.cma test_gen_hdlc.ml
$(OCAMLC) -o $@ -custom -I +lablgtk2 -thread unix.cma threads.cma lablgtk.cma gtkThread.cmo -I . $^ -cclib -ljack $(OCAMLC) -o $@ -custom -I +lablgtk2 -thread unix.cma threads.cma lablgtk.cma gtkThread.cmo -I . $^ -cclib -ljack
sw/in_progress/button/Makefile
-2
View File
@@ -57,8 +57,6 @@ gtk_export.ml : export.glade
grep -v invisible_char $< > /tmp/$< grep -v invisible_char $< > /tmp/$<
lablgladecc2 -root export -hide-default /tmp/$< | grep -B 1000000 " end" > $@ lablgladecc2 -root export -hide-default /tmp/$< | grep -B 1000000 " end" > $@
pt : ahrsview imuview ahrs2fg pt : ahrsview imuview ahrs2fg
CC = gcc CC = gcc
sw/in_progress/motor_bench/Makefile
+1 -2
View File
@@ -2,7 +2,6 @@ CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -I../../../var/MB CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -I../../../var/MB
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy
motor_bench : main.c motor_bench : main.c
$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
@@ -13,6 +12,6 @@ LOG=mb_log.txt
plot_test: plot_test:
scilab -f test.sce -args $(LOG) scilab -f test.sce -args $(LOG)
clean: clean:
rm -f *~ motor_bench rm -f *~ motor_bench
sw/lib/ocaml/Makefile
+1 -1
View File
@@ -36,7 +36,7 @@ OCAMLC=ocamlc
OCAMLOPT=ocamlopt OCAMLOPT=ocamlopt
OCAMLLEX=ocamllex OCAMLLEX=ocamllex
OCAMLYACC=ocamlyacc OCAMLYACC=ocamlyacc
OCAMLLIBDIR=$(shell ocamlc -where) OCAMLLIBDIR=$(shell $(OCAMLC) -where)
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
sw/logalizer/Makefile
+5 -5
View File
@@ -106,7 +106,7 @@ disp3d: disp3d.c
$(CC) $(MORE_CFLAGS) -g -o $@ $^ $(MORE_FLAGS) $(CC) $(MORE_CFLAGS) -g -o $@ $^ $(MORE_FLAGS)
plotprofile: plotprofile.c plotprofile: plotprofile.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
test1: test1.c test1: test1.c
$(CC) $(MORE_CFLAGS) -g -o $@ $^ $(MORE_FLAGS) -lglut $(CC) $(MORE_CFLAGS) -g -o $@ $^ $(MORE_FLAGS) -lglut
@@ -153,16 +153,16 @@ test_samere: test_samere.c network.c flight_gear.c utils.c
$(CC) $(CFLAGS) -I../airborne -I../airborne/test -I../include -g -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) -I../airborne -I../airborne/test -I../include -g -o $@ $^ $(LDFLAGS)
ivy_example: ivy_example.c ivy_example: ivy_example.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
tmclient: tmclient.c tmclient: tmclient.c
gcc -g -O1 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) -g -O1 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
ffjoystick: ffjoystick.c ffjoystick: ffjoystick.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm $(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm
ctrlstick: ctrlstick.c ctrlstick: ctrlstick.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
# #
# Dependencies # Dependencies