Skip to content

Commit

Permalink
build: remove recursive Makefile.am in python bindings
Browse files Browse the repository at this point in the history
Combine the Makefile.am files in src/bindings/python/flux and
src/bindings/python/flux/core into a single Makefile.am. Use nobase_
prefix so that all Python source files can be listed in the same
rule. The special `fluxpycoredir` automake variable is no longer
needed, so it can be dropped.

This should make the bindings Makefiles a bit easier to maintain
by reducing duplication and the number of files to edit when new
Python source files are added.
  • Loading branch information
grondo committed Aug 25, 2020
1 parent 96b3edc commit a367872
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 29 deletions.
1 change: 0 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,6 @@ AC_CONFIG_FILES( \
src/bindings/lua/Makefile \
src/bindings/python/Makefile \
src/bindings/python/flux/Makefile \
src/bindings/python/flux/core/Makefile \
src/bindings/python/_flux/Makefile \
src/broker/Makefile \
src/cmd/Makefile \
Expand Down
37 changes: 20 additions & 17 deletions src/bindings/python/flux/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,25 +1,28 @@
fluxpy_PYTHON=\
__init__.py\
kvs.py\
wrapper.py\
rpc.py\
message.py\
constants.py\
job.py \
util.py \
future.py \
memoized_property.py \
debugged.py
nobase_fluxpy_PYTHON = \
__init__.py \
kvs.py \
wrapper.py \
rpc.py \
message.py \
constants.py \
job.py \
util.py \
future.py \
memoized_property.py \
debugged.py \
core/__init__.py \
core/watchers.py \
core/inner.py \
core/handle.py \
core/trampoline.py

if HAVE_FLUX_SECURITY
fluxpy_PYTHON += security.py
nobase_fluxpy_PYTHON += security.py
endif

clean-local:
-rm -f *.pyc *.pyo
-rm -rf __pycache__

SUBDIRS = core
-rm -f *.pyc */*.pyc *.pyo */*.pyo
-rm -rf __pycache__ */__pycache__

install-data-hook:
$(AM_V_at)echo Linking python modules in non-standard location... && \
Expand Down
11 changes: 0 additions & 11 deletions src/bindings/python/flux/core/Makefile.am

This file was deleted.

0 comments on commit a367872

Please sign in to comment.