m/g810-led
1
0
Fork 0
mirror of https://github.com/MatMoul/g810-led.git synced 2024-12-23 09:16:11 +00:00
Code

makefile: Fix issues on code review

Browse Source 
Code review: https://github.com/gentoo/gentoo/pull/9476#discussion_r216123340
This commit is contained in:
Haelwenn (lanodan) Monnier 2018-09-09 05:15:17 +02:00
parent 5fa7760e53
commit 87b2de95c9
No known key found for this signature in database
GPG Key ID: D5B7A8E43C997DEE
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
makefile
View File

@ -1,12 +1,12 @@
CXX?=g++ CXX?=g++
CXXFLAGS?=-Wall -O2 -std=gnu++11 CXXFLAGS?=-Wall -O2
LIB?=hidapi LIB?=hidapi
ifeq ($(LIB),libusb) ifeq ($(LIB),libusb)
CPPFLAGS=-Dlibusb CPPFLAGS=-Dlibusb
LDFLAGS+=-lusb-1.0 LIBS=-lusb-1.0
else else
CPPFLAGS=-Dhidapi CPPFLAGS=-Dhidapi
LDFLAGS+=-lhidapi-hidraw LIBS=-lhidapi-hidraw
endif endif
SYSTEMDDIR?=/usr/lib/systemd SYSTEMDDIR?=/usr/lib/systemd
@ -20,7 +20,7 @@ MAJOR=0
MINOR=2 MINOR=2
MICRO=7 MICRO=7
CXXFLAGS+=-DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\" CXXFLAGS+=-std=gnu++11 -DVERSION=\"$(MAJOR).$(MINOR).$(MICRO)\"
APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h APPSRCS=src/main.cpp src/helpers/*.cpp src/helpers/*.h
LIBSRCS=src/classes/*.cpp src/classes/*.h LIBSRCS=src/classes/*.cpp src/classes/*.h
@ -32,19 +32,19 @@ bin: bin/$(PROGN)
bin/$(PROGN): $(APPSRCS) $(LIBSRCS) bin/$(PROGN): $(APPSRCS) $(LIBSRCS)
@mkdir -p bin @mkdir -p bin
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS)
debug: CXXFLAGS += -g -Wextra -pedantic debug: CXXFLAGS += -g -Wextra -pedantic
debug: bin/$(PROGN) debug: bin/$(PROGN)
lib/lib$(PROGN).so: $(LIBSRCS) lib/lib$(PROGN).so: $(LIBSRCS)
@mkdir -p lib @mkdir -p lib
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LDFLAGS) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -fPIC -shared -Wl,-soname,lib$(PROGN).so -o lib/lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) $^ $(LIBS)
@ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so @ln -sf lib$(PROGN).so.$(MAJOR).$(MINOR).$(MICRO) lib/lib$(PROGN).so
bin-linked: lib/lib$(PROGN).so bin-linked: lib/lib$(PROGN).so
@mkdir -p bin @mkdir -p bin
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LDFLAGS) -L./lib -l$(PROGN) $(CXX) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) $(APPSRCS) -o bin/$(PROGN) $(LIBS) -L./lib -l$(PROGN)
lib: lib/lib$(PROGN).so lib: lib/lib$(PROGN).so