diff --git a/Examples/python/import_packages/split_modules/Makefile b/Examples/python/import_packages/split_modules/Makefile index dd1f2152e..65d635bb7 100644 --- a/Examples/python/import_packages/split_modules/Makefile +++ b/Examples/python/import_packages/split_modules/Makefile @@ -1,7 +1,7 @@ TOP = ../../.. LIBS = -subdirs = builtin vanilla builtin_split vanilla_split +subdirs = vanilla vanilla_split check: build diff --git a/Examples/python/import_packages/split_modules/README b/Examples/python/import_packages/split_modules/README index 6fb61d399..6776ec40f 100644 --- a/Examples/python/import_packages/split_modules/README +++ b/Examples/python/import_packages/split_modules/README @@ -10,6 +10,3 @@ additional code in the python wrappers. vanilla # "plane Jane" module both halves in pkg1 vanilla_split # python 1/2 in pkg1 C 1/2 in global namespace -builtin # both halves in pkg1 (-builtin passed to swig) -builtin # python 1/2 in pkg1 C 1/2 in global namespace (with -builtin) - diff --git a/Examples/python/import_packages/split_modules/builtin/Makefile b/Examples/python/import_packages/split_modules/builtin/Makefile deleted file mode 100644 index b679d60a0..000000000 --- a/Examples/python/import_packages/split_modules/builtin/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -TOP = ../../../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -SWIGOPT = -LIBS = - -check: build - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run - -build: - cd pkg1 && $(MAKE) build - -static: - cd pkg1 && $(MAKE) static - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean - cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean diff --git a/Examples/python/import_packages/split_modules/builtin/pkg1/Makefile b/Examples/python/import_packages/split_modules/builtin/pkg1/Makefile deleted file mode 100644 index da9240e6f..000000000 --- a/Examples/python/import_packages/split_modules/builtin/pkg1/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -TOP = ../../../../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -SWIGOPT = -builtin -LIBS = - -build: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \ - INTERFACE='foo.i' python_cpp - -static: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' \ - INTERFACE='foo.i' python_cpp_static - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean - diff --git a/Examples/python/import_packages/split_modules/builtin/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin/pkg1/__init__.py deleted file mode 100644 index 7b1594cc8..000000000 --- a/Examples/python/import_packages/split_modules/builtin/pkg1/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# killroy was here diff --git a/Examples/python/import_packages/split_modules/builtin/pkg1/foo.i b/Examples/python/import_packages/split_modules/builtin/pkg1/foo.i deleted file mode 100644 index 60ce16ec3..000000000 --- a/Examples/python/import_packages/split_modules/builtin/pkg1/foo.i +++ /dev/null @@ -1,10 +0,0 @@ -%module(package="pkg1") foo -%{ -static unsigned count(void) -{ - return 3; -} -%} - -unsigned count(void); - diff --git a/Examples/python/import_packages/split_modules/builtin/runme.py b/Examples/python/import_packages/split_modules/builtin/runme.py deleted file mode 100644 index 8a6055bf1..000000000 --- a/Examples/python/import_packages/split_modules/builtin/runme.py +++ /dev/null @@ -1,3 +0,0 @@ -import pkg1.foo - -assert(pkg1.foo.count() == 3) diff --git a/Examples/python/import_packages/split_modules/builtin_split/Makefile b/Examples/python/import_packages/split_modules/builtin_split/Makefile deleted file mode 100644 index 5fe9271c4..000000000 --- a/Examples/python/import_packages/split_modules/builtin_split/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -TOP = ../../../.. -SWIGEXE = $(TOP)/../swig -SWIG_LIB_DIR = $(TOP)/../$(TOP_BUILDDIR_TO_TOP_SRCDIR)Lib -SWIGOPT = -builtin -outdir pkg1 -LIBS = - -check: build - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' python_run - -build: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp - -static: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' \ - SWIG_LIB_DIR='$(SWIG_LIB_DIR)' SWIGEXE='$(SWIGEXE)' \ - SWIGOPT='$(SWIGOPT)' LIBS='$(LIBS)' TARGET='foo' INTERFACE='foo.i' python_cpp_static - -clean: - $(MAKE) -f $(TOP)/Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean - cd pkg1 && $(MAKE) -f $(TOP)/../Makefile SRCDIR='$(SRCDIR)' TARGET='foo' python_clean diff --git a/Examples/python/import_packages/split_modules/builtin_split/foo.i b/Examples/python/import_packages/split_modules/builtin_split/foo.i deleted file mode 100644 index 60ce16ec3..000000000 --- a/Examples/python/import_packages/split_modules/builtin_split/foo.i +++ /dev/null @@ -1,10 +0,0 @@ -%module(package="pkg1") foo -%{ -static unsigned count(void) -{ - return 3; -} -%} - -unsigned count(void); - diff --git a/Examples/python/import_packages/split_modules/builtin_split/pkg1/__init__.py b/Examples/python/import_packages/split_modules/builtin_split/pkg1/__init__.py deleted file mode 100644 index 7b1594cc8..000000000 --- a/Examples/python/import_packages/split_modules/builtin_split/pkg1/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# killroy was here diff --git a/Examples/python/import_packages/split_modules/builtin_split/runme.py b/Examples/python/import_packages/split_modules/builtin_split/runme.py deleted file mode 100644 index 8a6055bf1..000000000 --- a/Examples/python/import_packages/split_modules/builtin_split/runme.py +++ /dev/null @@ -1,3 +0,0 @@ -import pkg1.foo - -assert(pkg1.foo.count() == 3)