Commit ed7586fa authored by Michal 'vorner' Vaner's avatar Michal 'vorner' Vaner
Browse files

[3079] Don't enter to the makefiles

Do the condition at one level higher.
parent 806ec4bf
SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \ SUBDIRS = bind10 bindctl cfgmgr ddns loadzone msgq cmdctl auth xfrin \
xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 d2\ xfrout usermgr zonemgr stats tests resolver sockcreator dhcp4 dhcp6 d2\
dbutil sysinfo memmgr dbutil sysinfo
if USE_SHARED_MEMORY
# Build the memory manager only if we have shared memory.
# It is useless without it.
SUBDIRS += memmgr
endif
check-recursive: all-recursive check-recursive: all-recursive
if USE_SHARED_MEMORY
# If we don't have shared memory, the memory manager is useless.
# Skip building, testing and installing it completely.
SUBDIRS = . tests SUBDIRS = . tests
pkglibexecdir = $(libexecdir)/@PACKAGE@ pkglibexecdir = $(libexecdir)/@PACKAGE@
...@@ -65,5 +60,3 @@ install-data-hook: ...@@ -65,5 +60,3 @@ install-data-hook:
clean-local: clean-local:
rm -rf $(CLEANDIRS) rm -rf $(CLEANDIRS)
endif
SUBDIRS = datasrc util cc config dns log net notify testutils acl bind10 SUBDIRS = datasrc util cc config dns log net notify testutils acl bind10
SUBDIRS += xfrin log_messages server_common ddns sysinfo statistics memmgr SUBDIRS += xfrin log_messages server_common ddns sysinfo statistic
if USE_SHARED_MEMORY
# The memory manager is useless without shared memory support
SUBDIRS += memmgr
endif
python_PYTHON = __init__.py python_PYTHON = __init__.py
......
if USE_SHARED_MEMORY
# We use the memory manager only with shared memory. No reason to
# install on platforms without it and tests may fail there.
SUBDIRS = . tests SUBDIRS = . tests
python_PYTHON = __init__.py builder.py datasrc_info.py logger.py python_PYTHON = __init__.py builder.py datasrc_info.py logger.py
...@@ -28,5 +23,3 @@ CLEANDIRS = __pycache__ ...@@ -28,5 +23,3 @@ CLEANDIRS = __pycache__
clean-local: clean-local:
rm -rf $(CLEANDIRS) rm -rf $(CLEANDIRS)
endif
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment