From 81d88ed344e9cfaf7ab719ced32d61eeb2eea23d Mon Sep 17 00:00:00 2001 From: Bernard Davison Date: Thu, 1 Mar 2012 18:12:33 +1100 Subject: [PATCH] Removing spaces between linker path options (-L) and the path to be added. Fixing issue 142 --- sw/ground_segment/lpc21iap/Makefile | 2 +- sw/ground_segment/misc/Makefile | 2 +- sw/simulator/old_booz/tests/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sw/ground_segment/lpc21iap/Makefile b/sw/ground_segment/lpc21iap/Makefile index 419a2717a3..5a0eacc199 100644 --- a/sw/ground_segment/lpc21iap/Makefile +++ b/sw/ground_segment/lpc21iap/Makefile @@ -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 diff --git a/sw/ground_segment/misc/Makefile b/sw/ground_segment/misc/Makefile index 08572c95ae..ae8bb2e300 100644 --- a/sw/ground_segment/misc/Makefile +++ b/sw/ground_segment/misc/Makefile @@ -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 diff --git a/sw/simulator/old_booz/tests/Makefile b/sw/simulator/old_booz/tests/Makefile index 13d0e57905..55f4f5b531 100644 --- a/sw/simulator/old_booz/tests/Makefile +++ b/sw/simulator/old_booz/tests/Makefile @@ -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 = ..