Skip to content

Commit 655e6b4

Browse files
committed
Updated README, removed NOSAMPLES flag, added samples make option, now not built by default
1 parent 56a4d35 commit 655e6b4

File tree

2 files changed

+14
-19
lines changed

2 files changed

+14
-19
lines changed

Makefile

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,20 @@ LIB = $(LIB_STATIC) $(LIB_SHARE)
6262

6363
all: $(LIB)
6464

65-
ifneq (,$(findstring NOSAMPLES,$(MAKEFLAGS)))
66-
make -C sample/
67-
else
68-
69-
endif
70-
71-
72-
7365
$(LIB): $(OBJS)
74-
$(AR) cq $(LIB_STATIC) $(OBJS)
75-
$(CXX) -shared -Wl,-soname,$(LIB_SHARE) -o $(LIB_SHARE) $(OBJS)
66+
$(AR) cq $(LIB_STATIC) $(OBJS)
67+
$(CXX) -shared -Wl,-soname,$(LIB_SHARE) -o $(LIB_SHARE) $(OBJS)
7668

7769
clean:
78-
rm -f $(LIB_STATIC) $(LIB_SHARE) $(OBJS)
70+
rm -f $(LIB_STATIC) $(LIB_SHARE) $(OBJS)
7971

8072
install:
81-
cp -rf $(DIR)/$(LIB_STATIC) /usr/local/lib/
82-
cp -rf $(DIR)/$(LIB_SHARE) /usr/local/lib/
83-
cp -rf $(DIR)/hardware /usr/local/include/
84-
cp -rf $(DIR)/libraries /usr/local/include/
85-
cp -rf $(DIR)/sample/core.h /usr/local/include/
73+
cp -rf $(DIR)/$(LIB_STATIC) /usr/local/lib/
74+
cp -rf $(DIR)/$(LIB_SHARE) /usr/local/lib/
75+
cp -rf $(DIR)/hardware /usr/local/include/
76+
cp -rf $(DIR)/libraries /usr/local/include/
77+
cp -rf $(DIR)/sample/core.h /usr/local/include/
78+
79+
samples:
80+
make -C sample/
81+

README

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
Installation instructions:
22

3-
"$ make"
4-
"$ sudo make install"
5-
3+
Run "$ make" first then if you want to build the examples run
4+
"$ make samples". Finally run "$ sudo make install" to copy headers and libraries to your pcduino
65

0 commit comments

Comments
 (0)