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

removed linking of libpcre where not needed, otherwise place after glibivy

Browse Source
This commit is contained in:
Felix Ruess
2011-10-15 20:17:43 +02:00
parent 2bb9dc530c
commit 1180d1b328
10 changed files with 43 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sw/ground_segment/cockpit/Makefile
+1 -1
View File
@@ -96,7 +96,7 @@ clean:
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` $(FPIC) CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` $(FPIC)
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s `pcre-config --libs` -lglibivy LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy
ant_track : ant_track.c ant_track : ant_track.c
sw/ground_segment/joystick/Makefile
+4 -5
View File
@@ -1,4 +1,4 @@
# #
# $Id$ # $Id$
# Copyright (C) 2004 Pascal Brisset, Antoine Drouin # Copyright (C) 2004 Pascal Brisset, Antoine Drouin
# #
@@ -17,8 +17,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to # along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, # the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
# Quiet compilation # Quiet compilation
Q=@ Q=@
@@ -32,7 +32,7 @@ LIBPPRZCMA=$(OCAMLLIB)/lib-pprz.cma
all: test_stick input2ivy all: test_stick input2ivy
test_stick: test_stick.o test_stick: test_stick.o
gcc -g -O2 -Wall -DSTICK_DBG `pkg-config glib-2.0 --cflags` -o $@ $^ usb_stick.c `pkg-config glib-2.0 --libs` `pcre-config --libs` -lglibivy gcc -g -O2 -Wall -DSTICK_DBG `pkg-config glib-2.0 --cflags` -o $@ $^ usb_stick.c `pkg-config glib-2.0 --libs` -lglibivy
input2ivy: usb_stick.o ml_usb_stick.o input2ivy.cmo input2ivy: usb_stick.o ml_usb_stick.o input2ivy.cmo
$(OCAMLC) $(OCAMLINCLUDES) -custom -o $@ unix.cma str.cma glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma $(TOOLSDIR)/fp_proc.cmo $^ $(OCAMLC) $(OCAMLINCLUDES) -custom -o $@ unix.cma str.cma glibivy-ocaml.cma xml-light.cma lib-pprz.cma lablgtk.cma $(TOOLSDIR)/fp_proc.cmo $^
@@ -47,4 +47,3 @@ input2ivy: usb_stick.o ml_usb_stick.o input2ivy.cmo
clean: clean:
rm -f *~ core *.o *.bak .depend test_stick *.cmo *.cmi input2ivy rm -f *~ core *.o *.bak .depend test_stick *.cmo *.cmi input2ivy
sw/ground_segment/tmtc/GSM/Makefile
+1 -1
View File
@@ -1,7 +1,7 @@
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` `pcre-config --libs` -lglibivy 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
clean: clean:
rm SMS_GS rm SMS_GS
sw/in_progress/button/Makefile
+9 -9
View File
@@ -1,4 +1,4 @@
# #
# $Id: Makefile 5874 2010-09-15 03:41:04Z aibara $ # $Id: Makefile 5874 2010-09-15 03:41:04Z aibara $
# Copyright (C) 2004 Pascal Brisset, Antoine Drouin # Copyright (C) 2004 Pascal Brisset, Antoine Drouin
# #
@@ -17,15 +17,15 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to # along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, # the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
# Quiet compilation # Quiet compilation
Q=@ Q=@
OCAMLC = ocamlc OCAMLC = ocamlc
OCAMLOPT = ocamlopt OCAMLOPT = ocamlopt
INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../../lib/ocaml INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../../lib/ocaml
all: panic all: panic
@@ -63,10 +63,10 @@ pt : ahrsview imuview ahrs2fg
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags`
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox `pcre-config --libs` -lglibivy LDFLAGS=`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 `pcre-config --libs` -lglibivy
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
clean: clean:
@@ -99,7 +99,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` `pcre-config --libs` -lglibivy -lhid gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy -lhid
# #
# Dependencies # Dependencies
@@ -108,6 +108,6 @@ panic: panic.c
.depend: Makefile .depend: Makefile
ocamldep -I ../../lib/ocaml *.ml* > .depend ocamldep -I ../../lib/ocaml *.ml* > .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend
endif endif
sw/in_progress/fdm/Makefile
+5 -6
View File
@@ -1,4 +1,4 @@
# #
# $Id$ # $Id$
# Copyright (C) 2004 Pascal Brisset, Antoine Drouin # Copyright (C) 2004 Pascal Brisset, Antoine Drouin
# #
@@ -17,8 +17,8 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to # along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, # the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
# Quiet compilation # Quiet compilation
Q=@ Q=@
@@ -26,14 +26,13 @@ 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` `pcre-config --libs` -lglibivy gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `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` `pcre-config --libs` -lglibivy gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
clean: clean:
rm -f *~ core *.o *.bak .depend fdm_step fms_steps_attitude rm -f *~ core *.o *.bak .depend fdm_step fms_steps_attitude
sw/in_progress/ir_calibration/Makefile
+2 -2
View File
@@ -2,10 +2,10 @@
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags`
LDFLAGS=`pkg-config gtk+-2.0 --libs` `pcre-config --libs` -lglibivy -lm -lgtkdatabox LDFLAGS=`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)
clean: clean:
rm -f *~ ir_calib rm -f *~ ir_calib
sw/in_progress/motor_bench/Makefile
+1 -1
View File
@@ -1,6 +1,6 @@
CC = gcc 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 `pcre-config --libs` -lglibivy LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lglibivy
motor_bench : main.c motor_bench : main.c
sw/lib/ocaml/Makefile
+4 -4
View File
@@ -1,4 +1,4 @@
# #
# $Id$ # $Id$
# Copyright (C) 2003 Pascal Brisset, Antoine Drouin # Copyright (C) 2003 Pascal Brisset, Antoine Drouin
# #
@@ -17,7 +17,7 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to # along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, # the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
@@ -25,7 +25,7 @@ Q=@
LBITS := $(shell getconf LONG_BIT) LBITS := $(shell getconf LONG_BIT)
ifeq ($(LBITS),64) ifeq ($(LBITS),64)
FPIC = -ccopt -fPIC FPIC = -ccopt -fPIC
else else
FPIC = FPIC =
endif endif
@@ -164,6 +164,6 @@ clean :
.depend: Makefile .depend: Makefile
ocamldep *.ml* > .depend ocamldep *.ml* > .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend
endif endif
sw/lib/ocaml/ivy/Makefile
+2 -2
View File
@@ -63,7 +63,7 @@ deb :
cp debian/changelog.$(DISTRO) debian/changelog cp debian/changelog.$(DISTRO) debian/changelog
dpkg-buildpackage -rfakeroot dpkg-buildpackage -rfakeroot
ivy : ivy-ocaml.cma ivy-ocaml.cmxa ivy : ivy-ocaml.cma ivy-ocaml.cmxa
glibivy : glibivy-ocaml.cma glibivy-ocaml.cmxa glibivy : glibivy-ocaml.cma glibivy-ocaml.cmxa
tkivy : tkivy-ocaml.cma tkivy-ocaml.cmxa tkivy : tkivy-ocaml.cma tkivy-ocaml.cmxa
@@ -101,7 +101,7 @@ tkivy-ocaml.cmxa : $(TKIVYCMX) civy.o ctkivy.o
.ml.cmo : .ml.cmo :
$(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $< $(OCAMLC) $(OCAMLFLAGS) $(INCLUDES) -c $<
.c.o : .c.o :
$(CC) -Wall -c $(FPIC) -I /opt/local/include/ $(OCAMLINC) $(GLIBINC) $< $(CC) -Wall -c $(FPIC) -I /opt/local/include/ $(OCAMLINC) $(GLIBINC) $<
.mli.cmi : .mli.cmi :
$(OCAMLMLI) $(OCAMLFLAGS) -c $< $(OCAMLMLI) $(OCAMLFLAGS) -c $<
sw/logalizer/Makefile
+14 -14
View File
@@ -1,4 +1,4 @@
# #
# $Id$ # $Id$
# Copyright (C) 2004 Pascal Brisset, Antoine Drouin # Copyright (C) 2004 Pascal Brisset, Antoine Drouin
# #
@@ -17,15 +17,15 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with paparazzi; see the file COPYING. If not, write to # along with paparazzi; see the file COPYING. If not, write to
# the Free Software Foundation, 59 Temple Place - Suite 330, # the Free Software Foundation, 59 Temple Place - Suite 330,
# Boston, MA 02111-1307, USA. # Boston, MA 02111-1307, USA.
# #
# Quiet compilation # Quiet compilation
Q=@ Q=@
OCAMLC = ocamlc OCAMLC = ocamlc
OCAMLOPT = ocamlopt OCAMLOPT = ocamlopt
INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../lib/ocaml INCLUDES= $(shell ocamlfind query -r -i-format xml-light) $(shell ocamlfind query -r -i-format lablgtk2) -I ../lib/ocaml
all: play plotter plot sd2log plotprofile all: play plotter plot sd2log plotprofile
@@ -81,7 +81,7 @@ pt : ahrsview imuview ahrs2fg
CC = gcc CC = gcc
CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags` CFLAGS=-g -O2 -Wall `pkg-config gtk+-2.0 --cflags`
LDFLAGS=`pkg-config gtk+-2.0 --libs` -s -lgtkdatabox `pcre-config --libs` -lglibivy LDFLAGS=`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)
@@ -98,15 +98,15 @@ plot_roll_loop : plot_roll_loop.c sliding_plot.c
test_sliding_plot: test_sliding_plot.c sliding_plot.c test_sliding_plot: test_sliding_plot.c sliding_plot.c
$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
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 `pcre-config --libs` -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_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
disp3d: disp3d.c 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` `pcre-config --libs` -lglibivy gcc -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
@@ -146,23 +146,23 @@ FGFS_ARGS = $(FGFS_COMMON_ARGS) $(FGFS_IN_GUI_ARGS)
run_fg: run_fg:
$(FGFS_ENV) $(FGFS) $(FGFS_ARGS) $(FGFS_ENV) $(FGFS) $(FGFS_ARGS)
ahrs2fg: ahrs2fg.c network.c flight_gear.c utils.c ahrs2fg: ahrs2fg.c network.c flight_gear.c utils.c
$(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS) $(CC) $(CFLAGS) -g -o $@ $^ $(LDFLAGS)
test_samere: test_samere.c network.c flight_gear.c utils.c 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` `pcre-config --libs` -lglibivy gcc -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` `pcre-config --libs` -lglibivy gcc -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` `pcre-config --libs` -lglibivy -lm gcc -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` `pcre-config --libs` -lglibivy gcc -g -O2 -Wall `pkg-config glib-2.0 --cflags` -o $@ $^ `pkg-config glib-2.0 --libs` -lglibivy
# #
# Dependencies # Dependencies
@@ -171,6 +171,6 @@ ctrlstick: ctrlstick.c
.depend: Makefile .depend: Makefile
ocamldep -I ../lib/ocaml *.ml* > .depend ocamldep -I ../lib/ocaml *.ml* > .depend
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
-include .depend -include .depend
endif endif