afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updates to support 2/3 along with not using vcmd c extension

Browse source
This commit is contained in:
bharnden 2019-06-02 19:06:25 -07:00
parent 864c7b69a1
commit ecc63f4abb
22 changed files with 680 additions and 636 deletions
Download patch file Download diff file Expand all files Collapse all files

64
netns/Makefile.am
View file

@ -30,38 +30,38 @@ netns_SOURCES = $(SRC_NETNS)
# this triggers automake to run setup.py for building the Python libraries
# actual library names are netns.so and vcmd.so
# SOURCES line prevents 'make dist' from looking for a 'libnetns.c' file
if WANT_PYTHON
noinst_LIBRARIES = libnetns.a
libnetns_a_SOURCES = netnsmodule.c vcmdmodule.c
libnetns.a:
LDFLAGS="$(LDFLAGS) @libev_LIBS@" CFLAGS="$(CFLAGS) @libev_CFLAGS@" $(PYTHON) setup.py build_ext
# Python libraries install
install-exec-local:
$(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
--root=/$(DESTDIR) \
--prefix=$(prefix) \
--install-lib=$(pythondir) \
--single-version-externally-managed \
--no-compile
# Python libraries uninstall
uninstall-hook:
rm -rf core_netns.egg-info
rm -rf $(DESTDIR)/$(pythondir)/core_netns-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg-info
rm -f $(DESTDIR)/$(bindir)/{vnoded,vcmd,netns}
rm -f $(DESTDIR)/$(pythondir)/{netns.so,vcmd.so}
# Python libraries cleanup
clean-local: clean-local-check
.PHONY: clean-local-check
clean-local-check:
-rm -rf build
distclean-local:
-rm -rf core_netns.egg-info
endif
#if WANT_PYTHON
#noinst_LIBRARIES = libnetns.a
#libnetns_a_SOURCES = netnsmodule.c vcmdmodule.c
#libnetns.a:
# LDFLAGS="$(LDFLAGS) @libev_LIBS@" CFLAGS="$(CFLAGS) @libev_CFLAGS@" $(PYTHON) setup.py build_ext
#
## Python libraries install
#install-exec-local:
# $(PYTHON) $(SETUPPY) $(SETUPPYFLAGS) install \
# --root=/$(DESTDIR) \
# --prefix=$(prefix) \
# --install-lib=$(pythondir) \
# --single-version-externally-managed \
# --no-compile
#
## Python libraries uninstall
#uninstall-hook:
# rm -rf core_netns.egg-info
# rm -rf $(DESTDIR)/$(pythondir)/core_netns-$(PACKAGE_VERSION)-py$(PYTHON_VERSION).egg-info
# rm -f $(DESTDIR)/$(bindir)/{vnoded,vcmd,netns}
# rm -f $(DESTDIR)/$(pythondir)/{netns.so,vcmd.so}
#
## Python libraries cleanup
#clean-local: clean-local-check
#.PHONY: clean-local-check
#clean-local-check:
# -rm -rf build
#
#distclean-local:
# -rm -rf core_netns.egg-info
#
#endif
# endif WANT_PYTHON
# extra cruft to remove