summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2018-07-12 19:26:14 -0700
committerJhon Honce <jhonce@redhat.com>2018-07-13 12:50:12 -0700
commit74ccd9ce5f29a1df4ffe70b4d8bd00c29d5d9d15 (patch)
tree75ba256d70545d79aa61d7c57c20df886be1555f /Makefile
parent44b523c946c88e540b50d7ba59f441b5f8e0bad0 (diff)
downloadpodman-74ccd9ce5f29a1df4ffe70b4d8bd00c29d5d9d15.tar.gz
podman-74ccd9ce5f29a1df4ffe70b4d8bd00c29d5d9d15.tar.bz2
podman-74ccd9ce5f29a1df4ffe70b4d8bd00c29d5d9d15.zip
Update python directories to better support setup.py
Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 13 insertions, 5 deletions
diff --git a/Makefile b/Makefile
index 4a1a34316..d829df773 100644
--- a/Makefile
+++ b/Makefile
@@ -114,7 +114,12 @@ bin/podman.cross.%: .gopathok
python-podman:
ifdef HAS_PYTHON3
- $(MAKE) -C contrib/python python-podman
+ $(MAKE) -C contrib/python/podman python-podman
+endif
+
+python-pypodman:
+ifdef HAS_PYTHON3
+ $(MAKE) -C contrib/python/pypodman python-pypodman
endif
clean:
@@ -128,9 +133,10 @@ clean:
test/copyimg/copyimg \
test/testdata/redis-image \
cmd/podman/varlink/ioprojectatomicpodman.go \
- $(MANPAGES)
+ $(MANPAGES) ||:
ifdef HAS_PYTHON3
- $(MAKE) -C contrib/python clean
+ $(MAKE) -C contrib/python/podman clean
+ $(MAKE) -C contrib/python/pypodman clean
endif
find . -name \*~ -delete
find . -name \#\* -delete
@@ -169,12 +175,13 @@ localintegration: varlink_generate test-binaries clientintegration
ginkgo -v -cover -flakeAttempts 3 -progress -trace -noColor test/e2e/.
clientintegration:
- $(MAKE) -C contrib/python integration
+ $(MAKE) -C contrib/python/podman integration
+ $(MAKE) -C contrib/python/pypodman integration
vagrant-check:
BOX=$(BOX) sh ./vagrant.sh
-binaries: varlink_generate podman python-podman
+binaries: varlink_generate podman python-podman python-pypodman
test-binaries: test/bin2img/bin2img test/copyimg/copyimg test/checkseccomp/checkseccomp
@@ -313,4 +320,5 @@ validate: gofmt .gitvalidation
validate \
install.libseccomp.sudo \
python-podman \
+ python-pypodman \
clientintegration