Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-30 19:47:50 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

[Makefile] add pcre lib to jsbsim, cleanup shell commands

Browse Source
This commit is contained in:
Felix Ruess
2014-02-21 23:04:17 +01:00
parent 54141b085b
commit 74c176e500
15 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/subsystems/fixedwing/autopilot.makefile
+1 -1
View File
@@ -228,7 +228,7 @@ jsbsim.CFLAGS += -DSITL -DUSE_JSBSIM
jsbsim.srcs += $(SIMDIR)/sim_ac_jsbsim.c $(SIMDIR)/sim_ac_fw.c $(SIMDIR)/sim_ac_flightgear.c jsbsim.srcs += $(SIMDIR)/sim_ac_jsbsim.c $(SIMDIR)/sim_ac_fw.c $(SIMDIR)/sim_ac_flightgear.c
# external libraries # external libraries
jsbsim.CFLAGS += -I/usr/include $(shell pkg-config glib-2.0 --cflags) jsbsim.CFLAGS += -I/usr/include $(shell pkg-config glib-2.0 --cflags) $(shell pcre-config --libs)
jsbsim.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lglibivy -lm jsbsim.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lglibivy -lm
jsbsim.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=IvyTransport jsbsim.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=IvyTransport
conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile
+1 -1
View File
@@ -22,7 +22,7 @@ nps.srcs += $(fbw_srcs) $(ap_srcs)
nps.CFLAGS += -DSITL -DUSE_NPS nps.CFLAGS += -DSITL -DUSE_NPS
nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags) nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags)
nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy -lpcre -lgsl -lgslcblas nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy $(shell pcre-config --libs) -lgsl -lgslcblas
nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps
nps.LDFLAGS += $(shell sdl-config --libs) nps.LDFLAGS += $(shell sdl-config --libs)
conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile
+1 -1
View File
@@ -26,7 +26,7 @@ nps.srcs += $(fbw_srcs) $(ap_srcs)
nps.CFLAGS += -DSITL -DUSE_NPS nps.CFLAGS += -DSITL -DUSE_NPS
nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags) nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags)
nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy -lpcre -lgsl -lgslcblas nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy $(shell pcre-config --libs) -lgsl -lgslcblas
nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps
nps.LDFLAGS += $(shell sdl-config --libs) nps.LDFLAGS += $(shell sdl-config --libs)
conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile
+1 -1
View File
@@ -22,7 +22,7 @@ nps.MAKEFILE = nps
nps.CFLAGS += -DSITL -DUSE_NPS nps.CFLAGS += -DSITL -DUSE_NPS
nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags) nps.CFLAGS += $(shell pkg-config glib-2.0 --cflags)
nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy -lpcre -lgsl -lgslcblas nps.LDFLAGS += $(shell pkg-config glib-2.0 --libs) -lm -lglibivy $(shell pcre-config --libs) -lgsl -lgslcblas
nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps nps.CFLAGS += -I$(NPSDIR) -I$(SRC_FIRMWARE) -I$(SRC_BOARD) -I../simulator -I$(PAPARAZZI_HOME)/conf/simulator/nps
nps.LDFLAGS += $(shell sdl-config --libs) nps.LDFLAGS += $(shell sdl-config --libs)
sw/ground_segment/cockpit/Makefile
+2 -2
View File
@@ -97,8 +97,8 @@ clean:
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -fPIC CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) -fPIC
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -s -lglibivy
ant_track : ant_track.c ant_track : ant_track.c
sw/ground_segment/tmtc/GSM/Makefile
+1 -1
View File
@@ -4,7 +4,7 @@ Q=@
all: SMS_GS all: SMS_GS
SMS_GS: SMS_Ground_UDtest_final.c SMS_GS: SMS_Ground_UDtest_final.c
gcc -g -O2 -Wall `pkg-config --cflags glib-2.0 gtk+-2.0` -L/usr/lib -lglibivy -o SMS_GS SMS_Ground_UDtest_final.c `pkg-config --libs glib-2.0 gtk+-2.0` -lglibivy gcc -g -O2 -Wall $(shell pkg-config --cflags glib-2.0 gtk+-2.0) -L/usr/lib -lglibivy -o SMS_GS SMS_Ground_UDtest_final.c $(shell pkg-config --libs glib-2.0 gtk+-2.0) -lglibivy
clean: clean:
$(Q)rm -f SMS_GS $(Q)rm -f SMS_GS
sw/ground_segment/tmtc/Makefile
+4 -4
View File
@@ -126,10 +126,10 @@ settings.cmo : ../cockpit/page_settings.cmi
CC = gcc CC = gcc
GLIB_CFLAGS = -Wall `pkg-config glib-2.0 --cflags` -fPIC GLIB_CFLAGS = -Wall $(shell pkg-config glib-2.0 --cflags) -fPIC
GLIB_LDFLAGS = `pkg-config glib-2.0 --libs` -lglibivy -lpcre -fPIC GLIB_LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lglibivy $(shell pcre-config --libs) -fPIC
GTK_CFLAGS = -Wall `pkg-config gtk+-2.0 --cflags` -fPIC GTK_CFLAGS = -Wall $(shell pkg-config gtk+-2.0 --cflags) -fPIC
GTK_LDFLAGS = `pkg-config gtk+-2.0 --libs` -lglibivy -lpcre -fPIC GTK_LDFLAGS = $(shell pkg-config gtk+-2.0 --libs) -lglibivy $(shell pcre-config --libs) -fPIC
UNAME = $(shell uname -s) UNAME = $(shell uname -s)
sw/in_progress/button/Makefile
+4 -4
View File
@@ -70,10 +70,10 @@ gtk_export.ml : export.glade
pt : ahrsview imuview ahrs2fg pt : ahrsview imuview ahrs2fg
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags)
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox -lglibivy LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -s -lgtkdatabox -lglibivy
MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL -Wl,--rpath -Wl,/usr/local/lib -lglibivy `pcre-config --libs` MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL -Wl,--rpath -Wl,/usr/local/lib -lglibivy $(shell pcre-config --libs)
MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1 -I. -I. -I.. -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1 -I. -I. -I.. -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
@@ -107,7 +107,7 @@ FGFS_ARGS = $(FGFS_COMMON_ARGS) $(FGFS_IN_GUI_ARGS)
#FGFS_GAME_ARGS) #FGFS_GAME_ARGS)
panic: panic.c panic: panic.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lhid gcc -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy -lhid
# #
# Dependencies # Dependencies
sw/in_progress/fdm/Makefile
+2 -2
View File
@@ -26,11 +26,11 @@ Q=@
all: fdm_step all: fdm_step
fdm_step: fdm_step.c fdm_step: fdm_step.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy gcc -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy
fms_steps_attitude: fms_steps_attitude.c fms_steps_attitude: fms_steps_attitude.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy gcc -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy
sw/in_progress/inertial/C/Makefile
+4 -4
View File
@@ -2,14 +2,14 @@
# Quiet compilation # Quiet compilation
Q=@ Q=@
CFLAGS = -g -Wall `pkg-config glib-2.0 --cflags` CFLAGS = -g -Wall $(shell pkg-config glib-2.0 --cflags)
LDFLAGS = `pkg-config glib-2.0 --libs` -lm LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lm
%.o: %.c %.o: %.c
gcc -c -Wall $(CFLAGS) -o $@ $< gcc -c -Wall $(CFLAGS) -o $@ $<
CFLAGS += `pkg-config gtk+-2.0 --cflags` CFLAGS += $(shell pkg-config gtk+-2.0 --cflags)
LDFLAGS += `pkg-config gtk+-2.0 --libs` -lgtkdatabox LDFLAGS += $(shell pkg-config gtk+-2.0 --libs) -lgtkdatabox
# #
# #
sw/in_progress/ir_calibration/Makefile
+2 -2
View File
@@ -4,8 +4,8 @@ Q=@
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags)
LDFLAGS=`pkg-config gtk+-2.0 --libs` -lglibivy -lm -lgtkdatabox LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -lglibivy -lm -lgtkdatabox
ir_calib : main.c calibrator.c gui.c ir_calib : main.c calibrator.c gui.c
$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
sw/in_progress/motor_bench/Makefile
+2 -2
View File
@@ -2,8 +2,8 @@
Q=@ Q=@
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -I../../../var/MB CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) -I../../../var/MB
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy LDFLAGS=$(shell 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)
sw/in_progress/satcom/Makefile
+2 -2
View File
@@ -8,9 +8,9 @@ email2udp: email2udp.c
udp2tcp: udp2tcp.c udp2tcp: udp2tcp.c
gcc -g -O2 -Wall -o $@ $^ gcc -g -O2 -Wall -o $@ $^
tcp2ivy: tcp2ivy.c tcp2ivy: tcp2ivy.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm gcc -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy -lm
tcp2ivy_generic: tcp2ivy_generic.c tcp2ivy_generic: tcp2ivy_generic.c
gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -I../../../var/${AIRCRAFT} -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm gcc -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -I../../../var/${AIRCRAFT} -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy -lm
clean: clean:
$(Q)rm -f email2udp udp2tcp tcp2ivy $(Q)rm -f email2udp udp2tcp tcp2ivy
sw/in_progress/wind_tunnel/Makefile
+2 -2
View File
@@ -3,8 +3,8 @@
Q=@ Q=@
CC = gcc CC = gcc
GLIB_CFLAGS = -Wall `pkg-config glib-2.0 --cflags` GLIB_CFLAGS = -Wall $(shell pkg-config glib-2.0 --cflags)
GLIB_LDFLAGS = `pkg-config glib-2.0 --libs` -lglibivy -lpcre GLIB_LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lglibivy $(shell pcre-config --libs)
main: main.c serial_port.c main: main.c serial_port.c
$(CC) $(GLIB_CFLAGS) -o $@ main.c serial_port.c $(GLIB_LDFLAGS) $(CC) $(GLIB_CFLAGS) -o $@ main.c serial_port.c $(GLIB_LDFLAGS)
sw/logalizer/Makefile
+8 -8
View File
@@ -96,8 +96,8 @@ gtk_export.ml : export.glade
pt : ahrsview imuview ahrs2fg pt : ahrsview imuview ahrs2fg
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags)
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox -lglibivy LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -s -lgtkdatabox -lglibivy
motor_bench : motor_bench.c sliding_plot.c motor_bench : motor_bench.c sliding_plot.c
$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
@@ -122,7 +122,7 @@ ifeq ("$(UNAME)","Darwin")
IVY_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) IVY_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 endif
MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL -Wl,--rpath -Wl,/usr/local/lib -lglibivy `pcre-config --libs` MORE_FLAGS = -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include -rdynamic /usr/lib/libgtkgl.so -L/usr/lib -L/usr/X11R6/lib /usr/lib/libgtk.so /usr/lib/libgdk.so /usr/lib/libgmodule.so /usr/lib/libglib.so -ldl -lXi -lXext -lX11 -lm -lGLU -lGL -Wl,--rpath -Wl,/usr/local/lib -lglibivy $(shell pcre-config --libs)
MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1 -I. -I. -I.. -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include MORE_CFLAGS = -DHAVE_DLFCN_H=1 -DSTDC_HEADERS=1 -I. -I. -I.. -g -O2 -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
@@ -132,7 +132,7 @@ disp3d: disp3d.c
plotprofile: plotprofile.c plotprofile: plotprofile.c
@echo CC $@ @echo CC $@
$(Q)$(CC) $(IVY_C_LIBRARYS) $(IVY_C_INCLUDES) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lpcre $(Q)$(CC) $(IVY_C_LIBRARYS) $(IVY_C_INCLUDES) -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy $(shell pcre-config --libs)
test1: test1.c test1: test1.c
@echo CC $@ @echo CC $@
@@ -179,16 +179,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
$(CC) $(IVY_C_LIBRARYS) $(IVY_C_INCLUDES) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) $(IVY_C_LIBRARYS) $(IVY_C_INCLUDES) -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy
tmclient: tmclient.c tmclient: tmclient.c
$(CC) $(IVY_C_LIBRARYS) $(IVY_C_INCLUDES) -g -O1 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) $(IVY_C_LIBRARYS) $(IVY_C_INCLUDES) -g -O1 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy
ffjoystick: ffjoystick.c ffjoystick: ffjoystick.c
$(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lm $(CC) -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy -lm
ctrlstick: ctrlstick.c ctrlstick: ctrlstick.c
$(CC) -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy $(CC) -g -O2 -Wall $(shell pkg-config glib-2.0 --cflags) -o $@ $^ $(shell pkg-config glib-2.0 --libs) -lglibivy
clean: clean:
$(Q)rm -f *.opt *.out *~ core *.o *.bak .depend *.cm* play ahrsview imuview ahrs2fg plot plotter gtk_export.ml openlog2tlm disp3d plotprofile test1 test3 test_samere ivy_example tmclient ffjoystick ctrlstick sd2log motor_bench $(Q)rm -f *.opt *.out *~ core *.o *.bak .depend *.cm* play ahrsview imuview ahrs2fg plot plotter gtk_export.ml openlog2tlm disp3d plotprofile test1 test3 test_samere ivy_example tmclient ffjoystick ctrlstick sd2log motor_bench