Hi, On Thu, Oct 06, 2016 at 09:00:06AM +0100, David CARLIER wrote: > Hi, > > DEVICEATLAS_SRC instead of DEVICEATLAS_LIB might be more appropriated here > ... > +ifeq ($(DEVICEATLAS_LIB),) > ... > > Otherwise seems ok to me.
Indeed, you are right. You will find attached a new version of the patch. Cheers, Bertrand > Cheers. > > On 6 October 2016 at 00:39, Bertrand Jacquin <[email protected]> wrote: > > DeviceAtlas might be installed in a location where a user might not have > > enough permissions to write json.o and dac.o > > --- > > Makefile | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/Makefile b/Makefile > > index 0ce4b325305c..a10d2e4c1040 100644 > > --- a/Makefile > > +++ b/Makefile > > @@ -622,8 +622,12 @@ endif > > DEVICEATLAS_SRC = > > DEVICEATLAS_INC = $(DEVICEATLAS_SRC) > > DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) > > +ifeq ($(DEVICEATLAS_LIB),) > > +OPTIONS_LDFLAGS += -lda > > +else > > OPTIONS_OBJS += $(DEVICEATLAS_LIB)/json.o > > OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o > > +endif > > OPTIONS_OBJS += src/da.o > > OPTIONS_CFLAGS += -DUSE_DEVICEATLAS $(if > > $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC)) > > BUILD_OPTIONS += $(call ignore_implicit,USE_DEVICEATLAS) -- Bertrand
From 430ed00dfedb25b686b327cbd0f685aa29bea5a1 Mon Sep 17 00:00:00 2001 From: Bertrand Jacquin <[email protected]> Date: Thu, 6 Oct 2016 00:32:39 +0100 Subject: [PATCH] MINOR: build: Allow linking to device-atlas library file DeviceAtlas might be installed in a location where a user might not have enough permissions to write json.o and dac.o --- Makefile | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Makefile b/Makefile index 0ce4b325305c..226a32627b9f 100644 --- a/Makefile +++ b/Makefile @@ -622,8 +622,12 @@ endif DEVICEATLAS_SRC = DEVICEATLAS_INC = $(DEVICEATLAS_SRC) DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) +ifeq ($(DEVICEATLAS_SRC),) +OPTIONS_LDFLAGS += -lda +else OPTIONS_OBJS += $(DEVICEATLAS_LIB)/json.o OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o +endif OPTIONS_OBJS += src/da.o OPTIONS_CFLAGS += -DUSE_DEVICEATLAS $(if $(DEVICEATLAS_INC),-I$(DEVICEATLAS_INC)) BUILD_OPTIONS += $(call ignore_implicit,USE_DEVICEATLAS)
signature.asc
Description: Digital signature
