diff --git a/owlps-ardrone/Makefile b/owlps-ardrone/Makefile index ad5e98d..6ac4292 100644 --- a/owlps-ardrone/Makefile +++ b/owlps-ardrone/Makefile @@ -1,6 +1,6 @@ # Source version ifndef OWLPS_VERSION - OWLPS_VERSION = $(shell git describe || echo 'UNKNOWN_VERSION') + OWLPS_VERSION := $(shell git describe 2>/dev/null || echo 'UNKNOWN_VERSION') endif # RĂ©pertoire d'installation @@ -29,14 +29,16 @@ LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) +#CFLAGS += -g -O0 DEPFLAGS = -MMD XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG = -fPIC +OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" +OWLPSFLAGS += -D DEBUG LIBS = -L$(LIBOWLPS_DIR) -lowlps \ -L$(LIBOWLPSCLIENT_DIR) -lowlps-client \ -lrt -lm -pthread STATIC_LIBS = -OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" ## Cibles de compilation standard ## diff --git a/owlps-ardrone/Makefile_drone b/owlps-ardrone/Makefile_drone index 2385785..73af76c 100644 --- a/owlps-ardrone/Makefile_drone +++ b/owlps-ardrone/Makefile_drone @@ -1,6 +1,6 @@ # Source version ifndef OWLPS_VERSION - OWLPS_VERSION = $(shell git describe || echo 'UNKNOWN_VERSION') + OWLPS_VERSION := $(shell git describe 2>/dev/null || echo 'UNKNOWN_VERSION') endif # Emplacement de la suite de cross-compilation @@ -32,9 +32,12 @@ LIBOWLPS_DIR = ../libowlps LIBOWLPSCLIENT_DIR = ../libowlps-client CFLAGS = -O2 -Wall -Wextra -Wstrict-prototypes \ -I$(LIBOWLPS_DIR) -I$(LIBOWLPSCLIENT_DIR) +#CFLAGS += -g -O0 DEPFLAGS = -MMD XCFLAGS = $(CFLAGS) $(DEPFLAGS) $(WARN) $(HEADERS) PICFLAG = -fPIC +OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" +OWLPSFLAGS += -D DEBUG LOWLPS = -L$(LIBOWLPS_DIR) -lowlps LOWLPSA = $(LIBOWLPS_DIR)/libowlps.a LOWLPSCLIENTA = $(LIBOWLPSCLIENT_DIR)/libowlps-client.a @@ -45,8 +48,6 @@ STATIC_LIBS = $(LOWLPSA) $(LIBS) LATHEROS = -L$(TOOLCHAIN_USR)/lib -L$(TOOLCHAIN_USR_2)/lib IATHEROS = -I$(TOOLCHAIN_USR)/include -I$(TOOLCHAIN_USR_2)/include LDFLAGS = $(IATHEROS) $(LATHEROS) -OWLPSFLAGS = -D OWLPS_VERSION=\"$(OWLPS_VERSION)\" -OWLPSFLAGS += -D DEBUG ## Cibles de compilation standard ##