RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Fix libcoap make

Browse Source
This commit is contained in:
Martin Lenders 2014-02-25 20:58:36 +01:00
parent cc0de63289
commit 2cc4682716
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/libcoap/Makefile
View File

@ -1,6 +1,7 @@
PKG_NAME=libcoap
PKG_URL=http://git.code.sf.net/p/libcoap/code
PKG_VERSION=ef41ce5d02d64cec0751882ae8fd95f6c32bc018
PKG_DIR=$(CURDIR)/$(PKG_NAME)
ifneq ($(RIOTBOARD),)
include $(RIOTBOARD)/$(BOARD)/Makefile.include
@ -14,24 +15,28 @@ endif
.PHONY: all clean patch reset
all: patch
make -C $(CURDIR)/$(PKG_NAME)
make -C $(PKG_DIR)
patch: $(CURDIR)/$(PKG_NAME)/Makefile
patch: $(PKG_DIR)/Makefile
$(CURDIR)/$(PKG_NAME)/Makefile: $(CURDIR)/$(PKG_NAME)
cd "$<" && git am --ignore-whitespace $(CURDIR)/*.patch || true
$(PKG_DIR)/Makefile: $(PKG_DIR)/.git/config
cd "$(PKG_DIR)" && git am --ignore-whitespace "$(CURDIR)"/*.patch || true
$(CURDIR)/$(PKG_NAME)/:
git clone $(PKG_URL) $@ && \
cd $@ && git checkout $(PKG_VERSION)
$(PKG_DIR)/.git/config:
test -d "$(PKG_DIR)" || git clone "$(PKG_URL)" "$(PKG_DIR)"; \
cd "$(PKG_DIR)" && git checkout -f "$(PKG_VERSION)"
clean::
cd $(CURDIR)/$(PKG_NAME) && \
@echo "Cleaning up libcoap package..."
@cd "$(PKG_DIR)" 2> /dev/null > /dev/null && \
git clean -x -f && \
git reset --hard $(PKG_VERSION) || true
git am --abort && \
git reset --hard "$(PKG_VERSION)" && \
$(MAKE) patch || true
distclean::
rm -rf $(CURDIR)/$(PKG_NAME)
distclean::
rm -rf "$(PKG_DIR)"
Makefile.include:
@true

5
pkg/libcoap/Makefile.include
View File

@ -1 +1,4 @@
INCLUDES += -I $(RIOTBASE)/pkg/libcoap/libcoap
INCLUDES += -I $(RIOTBASE)/pkg/libcoap/libcoap \
-I $(RIOTBASE)/sys/posix/include \
-I $(RIOTBASE)/sys/posix/pnet/include \
-I $(RIOTBASE)/sys/net/include