Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rework C++ makefiles #25

Merged
merged 3 commits into from
Nov 17, 2017
Merged

Rework C++ makefiles #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6821536
C++: Navio: update Makefile
Nov 9, 2017
8f0c1df
C++: Examples: update Makefile
Nov 9, 2017
f28b71d
C++: Examples: add auto-dependency libnavio in examples
Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions C++/Examples/ADC/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CXX) -std=gnu++11 $(INCLUDES) ADC.cpp -L$(NAVIO) -lnavio -o ADC

clean:
Expand Down
1 change: 1 addition & 0 deletions C++/Examples/AHRS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CXX) -std=c++11 $(INCLUDES) AHRS.cpp -L$(NAVIO) -lnavio -o AHRS -lrt -lpthread

clean:
Expand Down
1 change: 1 addition & 0 deletions C++/Examples/AccelGyroMag/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CXX) -std=c++11 $(INCLUDES) -L$(NAVIO) AccelGyroMag.cpp -lnavio -o AccelGyroMag

clean:
Expand Down
1 change: 1 addition & 0 deletions C++/Examples/Barometer/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CXX) $(INCLUDES) Barometer.cpp -L$(NAVIO) -lnavio -o Barometer

clean:
Expand Down
1 change: 1 addition & 0 deletions C++/Examples/FRAM/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CC) $(INCLUDES) FRAM.cpp -L$(NAVIO) -lnavio -o FRAM

clean:
Expand Down
1 change: 1 addition & 0 deletions C++/Examples/GPS/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CXX) -std=c++11 $(INCLUDES) gps.cpp -L$(NAVIO) -lnavio -o gps
rm -rf *.o

Expand Down
1 change: 1 addition & 0 deletions C++/Examples/LED/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ INCLUDES = -I ../../Navio
CFLAGS = -std=c++11

all:
$(MAKE) -C ../../Navio all
$(CXX) $(CFLAGS) $(INCLUDES) -L$(NAVIO) LED.cpp -lnavio -o LED

clean:
Expand Down
26 changes: 10 additions & 16 deletions C++/Examples/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
MODULES = AccelGyroMag ADC AHRS Barometer FRAM GPS LED Multithread Servo RCInput
MODULES = $(wildcard */*.cpp)
EXE = $(MODULES:.cpp=)


all: $(EXE)

%: %.cpp
$(MAKE) -C $(@D) all


all:
cd ../Navio; \
($(MAKE) ); \
cd ../Examples; \
for dir in $(MODULES); do \
cd $$dir; \
($(MAKE) ); \
cd ..; \
done

clean:
for dir in $(MODULES); do \
cd $$dir; \
($(MAKE) clean); \
cd ..; \
done
rm $(EXE)
1 change: 1 addition & 0 deletions C++/Examples/Multithread/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CC) $(INCLUDES) threaded_baro.cpp -L$(NAVIO) -lnavio -lpthread -o threaded_baro

clean:
Expand Down
3 changes: 2 additions & 1 deletion C++/Examples/RCInput/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ LIB = -L$(PIGPIO_PATH)
INCLUDES = -I ../../Navio -I$(PIGPIO_PATH)

all:
$(CXX) -std=gnu++11 $(INCLUDES) $(LIB) main.cpp -L$(NAVIO) -lnavio -o RCInput -lrt -lpthread -lpigpio || $(MAKE) pigpio
$(MAKE) -C ../../Navio all
$(CXX) -std=gnu++11 $(INCLUDES) $(LIB) RCInput.cpp -L$(NAVIO) -lnavio -o RCInput -lrt -lpthread -lpigpio || $(MAKE) pigpio

clean:
rm RCInput
Expand Down
1 change: 1 addition & 0 deletions C++/Examples/Servo/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ NAVIO = ../../Navio
INCLUDES = -I ../../Navio

all:
$(MAKE) -C ../../Navio all
$(CXX) -std=gnu++11 $(INCLUDES) Servo.cpp -L$(NAVIO) -lnavio -o Servo

clean:
Expand Down
18 changes: 13 additions & 5 deletions C++/Navio/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
all:
g++ -std=c++11 -Wno-psabi -I . -c Common/*.cpp Navio2/*.cpp Navio+/*.cpp
ar rcs libnavio.a *.o
rm *.o
CXX = g++
CFLAGS = -std=c++11 -Wno-psabi -c -I .

SRC=$(wildcard */*.cpp)
OBJECTS = $(SRC:.cpp=.o)

%.o: %.cpp
$(CXX) $(CFLAGS) -o $@ $<

all: $(OBJECTS)
ar rcs libnavio.a $(OBJECTS)

clean:
rm *.o
rm */*.o