diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | nbb/Makefile-files | 10 | ||||
| -rw-r--r-- | nbb/nbblib/__init__.in (renamed from nbb/nbblib.in) | 0 |
5 files changed, 13 insertions, 10 deletions
diff --git a/Makefile.am b/Makefile.am index a6443da..48f5e6d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,12 @@ +nbblibdir = $(pythondir)/nbblib + CLEANFILES = BUILT_SOURCES = EXTRA_DIST = -man1_MANS = UPLOAD_FILES = +TESTS = + +man1_MANS = doc_DATA = dist_doc_DATA = bin_PROGRAMS = @@ -11,7 +15,8 @@ bin_SCRIPTS = check_SCRIPTS = python_PYTHON = nodist_python_PYTHON = -TESTS = +nodist_nbblib_PYTHON = +nbblib_PYTHON = AM_INSTALLCHECK_STD_OPTIONS_EXEMPT = # For the test cases @@ -2,7 +2,7 @@ nbb 1.20.x * Automatically call autoreconf for GNU make users. * Implement 'nbb help <command>'. * Implement global nbb options --vcs, --build-system, --dry-run. - * Rename python module from nbb_lib to nbblib. + * Rename python module from nbb_lib.py to nbblib/__init__.py. * Miscellaneous build fixes related to move to standalone nbb. nbb 1.20 diff --git a/configure.ac b/configure.ac index 8797933..09598ff 100644 --- a/configure.ac +++ b/configure.ac @@ -32,7 +32,7 @@ NDIM_DETECT_MAN2TXT()dnl AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([GNUmakefile]) -AC_CONFIG_FILES([nbb/nbblib.py:nbb/nbblib.in]) +AC_CONFIG_FILES([nbb/nbblib/__init__.py:nbb/nbblib/__init__.in]) AC_CONFIG_FILES([nbb/nbb:nbb/nbb.in], [chmod +x nbb/nbb]) AC_CONFIG_FILES([test/atlocal]) AC_CONFIG_FILES([test/Makefile]) diff --git a/nbb/Makefile-files b/nbb/Makefile-files index 1c00a4b..bc0bdc3 100644 --- a/nbb/Makefile-files +++ b/nbb/Makefile-files @@ -6,15 +6,13 @@ bin_SCRIPTS += nbb/nbb EXTRA_DIST += nbb/nbb.in CLEANFILES += nbb/nbb -nodist_python_PYTHON += nbb/nbblib.py -CLEANFILES += nbb/nbblib.py +nodist_nbblib_PYTHON += nbb/nbblib/__init__.py +CLEANFILES += nbb/nbblib/__init__.py -nbb/nbb: nbb/nbblib.py -#nbb/nbb_lib.py: $(top_builddir)/config.status -#nbb/nbb: $(top_builddir)/config.status +nbb/nbb: nbb/nbblib/__init__.py endif -CLEANFILES += nbb/nbblib.pyc +CLEANFILES += nbb/nbblib/__init__.pyc # End of Makefile-files. diff --git a/nbb/nbblib.in b/nbb/nbblib/__init__.in index b7dc03a..b7dc03a 100644 --- a/nbb/nbblib.in +++ b/nbb/nbblib/__init__.in |