diff --git a/conf/firmwares/subsystems/fixedwing/autopilot.makefile b/conf/firmwares/subsystems/fixedwing/autopilot.makefile index 4b4b08358b..f52b13f9a2 100644 --- a/conf/firmwares/subsystems/fixedwing/autopilot.makefile +++ b/conf/firmwares/subsystems/fixedwing/autopilot.makefile @@ -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 # 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.CFLAGS += -DDOWNLINK -DPERIODIC_TELEMETRY -DDOWNLINK_TRANSPORT=IvyTransport diff --git a/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile b/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile index 9e6d5a42da..a529ca4778 100644 --- a/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile +++ b/conf/firmwares/subsystems/fixedwing/fdm_crrcsim.makefile @@ -22,7 +22,7 @@ nps.srcs += $(fbw_srcs) $(ap_srcs) nps.CFLAGS += -DSITL -DUSE_NPS 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.LDFLAGS += $(shell sdl-config --libs) diff --git a/conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile b/conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile index 6d1a04f232..40c5f276eb 100644 --- a/conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile +++ b/conf/firmwares/subsystems/fixedwing/fdm_jsbsim.makefile @@ -26,7 +26,7 @@ nps.srcs += $(fbw_srcs) $(ap_srcs) nps.CFLAGS += -DSITL -DUSE_NPS 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.LDFLAGS += $(shell sdl-config --libs) diff --git a/conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile b/conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile index 069a8cfabc..ffb90f843c 100644 --- a/conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile +++ b/conf/firmwares/subsystems/rotorcraft/fdm_jsbsim.makefile @@ -22,7 +22,7 @@ nps.MAKEFILE = nps nps.CFLAGS += -DSITL -DUSE_NPS 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.LDFLAGS += $(shell sdl-config --libs) diff --git a/sw/ground_segment/cockpit/Makefile b/sw/ground_segment/cockpit/Makefile index dc832fa4ed..8a38286eb7 100644 --- a/sw/ground_segment/cockpit/Makefile +++ b/sw/ground_segment/cockpit/Makefile @@ -97,8 +97,8 @@ clean: CC = gcc -CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -fPIC -LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy +CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) -fPIC +LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -s -lglibivy ant_track : ant_track.c diff --git a/sw/ground_segment/tmtc/GSM/Makefile b/sw/ground_segment/tmtc/GSM/Makefile index b4a17b6b54..75ded860ec 100644 --- a/sw/ground_segment/tmtc/GSM/Makefile +++ b/sw/ground_segment/tmtc/GSM/Makefile @@ -4,7 +4,7 @@ Q=@ all: SMS_GS 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: $(Q)rm -f SMS_GS diff --git a/sw/ground_segment/tmtc/Makefile b/sw/ground_segment/tmtc/Makefile index d8422d7e21..77a51e6cd6 100644 --- a/sw/ground_segment/tmtc/Makefile +++ b/sw/ground_segment/tmtc/Makefile @@ -126,10 +126,10 @@ settings.cmo : ../cockpit/page_settings.cmi CC = gcc -GLIB_CFLAGS = -Wall `pkg-config glib-2.0 --cflags` -fPIC -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 +GLIB_CFLAGS = -Wall $(shell pkg-config glib-2.0 --cflags) -fPIC +GLIB_LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lglibivy $(shell pcre-config --libs) -fPIC +GTK_CFLAGS = -Wall $(shell pkg-config gtk+-2.0 --cflags) -fPIC +GTK_LDFLAGS = $(shell pkg-config gtk+-2.0 --libs) -lglibivy $(shell pcre-config --libs) -fPIC UNAME = $(shell uname -s) diff --git a/sw/in_progress/button/Makefile b/sw/in_progress/button/Makefile index bfec52d75c..293b592504 100644 --- a/sw/in_progress/button/Makefile +++ b/sw/in_progress/button/Makefile @@ -70,10 +70,10 @@ gtk_export.ml : export.glade pt : ahrsview imuview ahrs2fg CC = gcc -CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox -lglibivy +CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) +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 @@ -107,7 +107,7 @@ FGFS_ARGS = $(FGFS_COMMON_ARGS) $(FGFS_IN_GUI_ARGS) #FGFS_GAME_ARGS) 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 diff --git a/sw/in_progress/fdm/Makefile b/sw/in_progress/fdm/Makefile index 265f34be4f..e8838c11a4 100644 --- a/sw/in_progress/fdm/Makefile +++ b/sw/in_progress/fdm/Makefile @@ -26,11 +26,11 @@ Q=@ all: fdm_step 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 - 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 diff --git a/sw/in_progress/inertial/C/Makefile b/sw/in_progress/inertial/C/Makefile index c0e8483ea6..e21ba15fde 100644 --- a/sw/in_progress/inertial/C/Makefile +++ b/sw/in_progress/inertial/C/Makefile @@ -2,14 +2,14 @@ # Quiet compilation Q=@ -CFLAGS = -g -Wall `pkg-config glib-2.0 --cflags` -LDFLAGS = `pkg-config glib-2.0 --libs` -lm +CFLAGS = -g -Wall $(shell pkg-config glib-2.0 --cflags) +LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lm %.o: %.c gcc -c -Wall $(CFLAGS) -o $@ $< -CFLAGS += `pkg-config gtk+-2.0 --cflags` -LDFLAGS += `pkg-config gtk+-2.0 --libs` -lgtkdatabox +CFLAGS += $(shell pkg-config gtk+-2.0 --cflags) +LDFLAGS += $(shell pkg-config gtk+-2.0 --libs) -lgtkdatabox # # diff --git a/sw/in_progress/ir_calibration/Makefile b/sw/in_progress/ir_calibration/Makefile index 662e015cf3..9ea82a8d2d 100644 --- a/sw/in_progress/ir_calibration/Makefile +++ b/sw/in_progress/ir_calibration/Makefile @@ -4,8 +4,8 @@ Q=@ CC = gcc -CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -LDFLAGS=`pkg-config gtk+-2.0 --libs` -lglibivy -lm -lgtkdatabox +CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) +LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -lglibivy -lm -lgtkdatabox ir_calib : main.c calibrator.c gui.c $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) diff --git a/sw/in_progress/motor_bench/Makefile b/sw/in_progress/motor_bench/Makefile index f103caabec..760e85cb6b 100644 --- a/sw/in_progress/motor_bench/Makefile +++ b/sw/in_progress/motor_bench/Makefile @@ -2,8 +2,8 @@ Q=@ CC = gcc -CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -I../../../var/MB -LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy +CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) -I../../../var/MB +LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -s -lglibivy motor_bench : main.c $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) diff --git a/sw/in_progress/satcom/Makefile b/sw/in_progress/satcom/Makefile index a45c21e257..6e035235ed 100644 --- a/sw/in_progress/satcom/Makefile +++ b/sw/in_progress/satcom/Makefile @@ -8,9 +8,9 @@ email2udp: email2udp.c udp2tcp: udp2tcp.c gcc -g -O2 -Wall -o $@ $^ 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 - 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: $(Q)rm -f email2udp udp2tcp tcp2ivy diff --git a/sw/in_progress/wind_tunnel/Makefile b/sw/in_progress/wind_tunnel/Makefile index b96cb01933..cfa55d232c 100644 --- a/sw/in_progress/wind_tunnel/Makefile +++ b/sw/in_progress/wind_tunnel/Makefile @@ -3,8 +3,8 @@ Q=@ CC = gcc -GLIB_CFLAGS = -Wall `pkg-config glib-2.0 --cflags` -GLIB_LDFLAGS = `pkg-config glib-2.0 --libs` -lglibivy -lpcre +GLIB_CFLAGS = -Wall $(shell pkg-config glib-2.0 --cflags) +GLIB_LDFLAGS = $(shell pkg-config glib-2.0 --libs) -lglibivy $(shell pcre-config --libs) main: main.c serial_port.c $(CC) $(GLIB_CFLAGS) -o $@ main.c serial_port.c $(GLIB_LDFLAGS) diff --git a/sw/logalizer/Makefile b/sw/logalizer/Makefile index 33d00f0ed9..3b817667b8 100644 --- a/sw/logalizer/Makefile +++ b/sw/logalizer/Makefile @@ -96,8 +96,8 @@ gtk_export.ml : export.glade pt : ahrsview imuview ahrs2fg CC = gcc -CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` -LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox -lglibivy +CFLAGS=-g -O2 -Wall $(shell pkg-config gtk+-2.0 --cflags) +LDFLAGS=$(shell pkg-config gtk+-2.0 --libs) -s -lgtkdatabox -lglibivy motor_bench : motor_bench.c sliding_plot.c $(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) 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 @@ -132,7 +132,7 @@ disp3d: disp3d.c plotprofile: plotprofile.c @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 @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) 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 - $(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 - $(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 - $(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: $(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