Skip to content

Commit

Permalink
Add c2p as submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
LivInTheLookingGlass committed May 19, 2017
1 parent e6c76ad commit e5610f7
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .gitmodules
Expand Up @@ -4,3 +4,6 @@
[submodule "c_src/msgpack-c"]
path = c_src/msgpack-c
url = https://github.com/msgpack/msgpack-c
[submodule "c2p"]
path = c2p
url = https://github.com/p2p-today/c2p
14 changes: 7 additions & 7 deletions Makefile
Expand Up @@ -57,9 +57,9 @@ endif
#End python setup section
#Begin C section

## Initialize the msgpack module (and incidentally other submodules)
msgpack_module:
@git submodule update --init
## Initialize submodules
submodules:
@git submodule update --init --recursive

#End C section
#Begin Javascript section
Expand Down Expand Up @@ -184,7 +184,7 @@ cpython: python

else
## Build binary and python code for whatever your default system python is (python-only if that's pypy)
cpython: python msgpack_module
cpython: python submodules
@echo "Building with C extensions..."
ifeq ($(debug), true)
@python setup.py build --debug
Expand All @@ -194,7 +194,7 @@ endif
endif

## Build binary and python code for whatever your system python3 version is
cpython3: python3 msgpack_module
cpython3: python3 submodules
@echo "Building with C extensions..."
ifeq ($(debug), true)
@$(python3) setup.py build --debug
Expand All @@ -203,7 +203,7 @@ else
endif

## Build binary and python code for whatever your system python2 version is
cpython2: python2 msgpack_module
cpython2: python2 submodules
@echo "Building with C extensions..."
ifeq ($(debug), true)
@$(python2) setup.py build --debug
Expand Down Expand Up @@ -292,7 +292,7 @@ mypy:
@$(python3) -m mypy . --check-untyped-defs --ignore-missing-imports --disallow-untyped-calls --disallow-untyped-defs

## Build html documentation
html: jsdocs msgpack_module
html: jsdocs submodules
@python $(docs_deps)
@cd docs; $(MAKE) clean html

Expand Down
1 change: 1 addition & 0 deletions c2p
Submodule c2p added at d0073d

0 comments on commit e5610f7

Please sign in to comment.