Removing spaces between linker path options (-L) and the path to be added. Fixing issue 142

This commit is contained in:
Bernard Davison
2012-03-01 18:12:33 +11:00
parent 8ab6319323
commit 81d88ed344
3 changed files with 5 additions and 5 deletions
+1 -1
View File
@@ -27,7 +27,7 @@ endif
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L /opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L /opt/paparazzi/lib"; fi)
LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L/opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; fi)
INCLUDES = $(shell if test -d /opt/local/include; then echo "-I /opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I /opt/paparazzi/include"; fi)
endif
+1 -1
View File
@@ -1,7 +1,7 @@
UNAME = $(shell uname -s)
ifeq ("$(UNAME)","Darwin")
LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L /opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L /opt/paparazzi/lib"; fi)
LIBRARYS = $(shell if test -d /opt/local/lib; then echo "-L/opt/local/lib"; elif test -d /opt/paparazzi/lib; then echo "-L/opt/paparazzi/lib"; fi)
INCLUDES = $(shell if test -d /opt/local/include; then echo "-I /opt/local/include"; elif test -d /opt/paparazzi/include; then echo "-I /opt/paparazzi/include"; fi)
else
LIBRARYS = -s
+3 -3
View File
@@ -5,9 +5,9 @@
#CC = g++
#CFLAGS = -Wall -I $(JSBSIM)/include/JSBSim -I../include
#LDFLAGS = -L $(JSBSIM)/lib -lJSBSim
#LDFLAGS = -L$(JSBSIM)/lib -lJSBSim
#CFLAGS += -I /usr/include/meschach -I /usr/local/include/
#LDFLAGS += -lmeschach -L /usr/lib
#LDFLAGS += -lmeschach -L/usr/lib
#CFLAGS += `pkg-config glib-2.0 --cflags`
#LDFLAGS += `pkg-config glib-2.0 --libs` -lm -lglibivy -lpcre
@@ -33,7 +33,7 @@ CFLAGS = -Wall \
LDFLAGS = -lm \
-lglibivy \
-L $(JSBSIM)/lib -lJSBSim \
-L$(JSBSIM)/lib -lJSBSim \
`pkg-config glib-2.0 --libs` \
SIMDIR = ..