Skip to content

Commit

Permalink
Updated README, removed NOSAMPLES flag, added samples make option, no…
Browse files Browse the repository at this point in the history
…w not built by default
  • Loading branch information
willoftw committed Feb 5, 2015
1 parent 56a4d35 commit 655e6b4
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 19 deletions.
28 changes: 12 additions & 16 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -62,24 +62,20 @@ LIB = $(LIB_STATIC) $(LIB_SHARE)

all: $(LIB)

ifneq (,$(findstring NOSAMPLES,$(MAKEFLAGS)))
make -C sample/
else

endif



$(LIB): $(OBJS)
$(AR) cq $(LIB_STATIC) $(OBJS)
$(CXX) -shared -Wl,-soname,$(LIB_SHARE) -o $(LIB_SHARE) $(OBJS)
$(AR) cq $(LIB_STATIC) $(OBJS)
$(CXX) -shared -Wl,-soname,$(LIB_SHARE) -o $(LIB_SHARE) $(OBJS)

clean:
rm -f $(LIB_STATIC) $(LIB_SHARE) $(OBJS)
rm -f $(LIB_STATIC) $(LIB_SHARE) $(OBJS)

install:
cp -rf $(DIR)/$(LIB_STATIC) /usr/local/lib/
cp -rf $(DIR)/$(LIB_SHARE) /usr/local/lib/
cp -rf $(DIR)/hardware /usr/local/include/
cp -rf $(DIR)/libraries /usr/local/include/
cp -rf $(DIR)/sample/core.h /usr/local/include/
cp -rf $(DIR)/$(LIB_STATIC) /usr/local/lib/
cp -rf $(DIR)/$(LIB_SHARE) /usr/local/lib/
cp -rf $(DIR)/hardware /usr/local/include/
cp -rf $(DIR)/libraries /usr/local/include/
cp -rf $(DIR)/sample/core.h /usr/local/include/

samples:
make -C sample/

5 changes: 2 additions & 3 deletions README
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Installation instructions:

"$ make"
"$ sudo make install"

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

0 comments on commit 655e6b4

Please sign in to comment.