more makefile updates regarding unneeded libs

This commit is contained in:
Felix Ruess
2011-10-15 20:24:33 +02:00
parent 1180d1b328
commit 6062bd8724
2 changed files with 2 additions and 5 deletions
+1 -1
View File
@@ -131,7 +131,7 @@ run_ahrs_on_synth: run_ahrs_on_synth.c $(RAOS_SRCS) $(AHRS_SRCS)
$(Q) $(CC) $(CFLAGS) $(AHRS_CFLAGS) -o $@ $^ $(LDFLAGS)
IVY_CFLAGS=-g -O2 -Wall `pkg-config glib-2.0 --cflags`
IVY_LDFLAGS=`pkg-config glib-2.0 --libs` `pcre-config --libs` -lglibivy
IVY_LDFLAGS=`pkg-config glib-2.0 --libs` -lglibivy
run_ahrs_on_synth_ivy: run_ahrs_on_synth_ivy.c $(RAOS_SRCS) $(AHRS_SRCS)
$(CC) $(CFLAGS) $(AHRS_CFLAGS) $(IVY_CFLAGS) -o $@ $^ $(LDFLAGS) $(IVY_LDFLAGS)
+1 -4
View File
@@ -9,7 +9,7 @@
#CFLAGS += -I /usr/include/meschach -I /usr/local/include/
#LDFLAGS += -lmeschach -L /usr/lib
#CFLAGS += `pkg-config glib-2.0 --cflags`
#LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lpcre -lglibivy
#LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lglibivy -lpcre
#test1: nps_test1.c nps_jsbsim.c
# $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
@@ -28,13 +28,10 @@ CFLAGS = -Wall \
-I ../../../var/BOOZ2_A1 \
-I ../../airborne \
-I ../../include \
-I /usr/include/meschach \
-I $(JSBSIM)/include/JSBSim \
`pkg-config glib-2.0 --cflags` \
LDFLAGS = -lm \
-lmeschach \
-lpcre \
-lglibivy \
-L $(JSBSIM)/lib -lJSBSim \
`pkg-config glib-2.0 --libs` \