summaryrefslogtreecommitdiffstats
path: root/events/src/Makefile.am
diff options
context:
space:
mode:
authorAravinda VK <avishwan@redhat.com>2016-08-18 14:51:44 +0530
committerAravinda VK <avishwan@redhat.com>2016-08-24 01:23:06 -0700
commitd1aa35c3619847922e092b7dbfb201bceea8fa33 (patch)
treea2f936c481b9201b63a4bf77f1346946f69cb8a3 /events/src/Makefile.am
parent4aa52061a51b97c4f865b402f977b3b43f5471a7 (diff)
eventsapi: Fix disable-events issue
Events related sources are not loaded in libglusterfs when configure is run with --disable-events option. Due to this every call of gf_event should be guarded with USE_EVENTS macro. To prevent this, USE_EVENTS macro was included in events.c itself(Patch #15054) Instead of disabling building entire directory "events", selectively disabled the code. So that constants and empty function gf_event is exposed. Code will not fail even if gf_event is called when events is disabled. BUG: 1368042 Change-Id: Ia6abfe9c1e46a7640c4d8ff5ccf0e9c30c87f928 Signed-off-by: Aravinda VK <avishwan@redhat.com> Reviewed-on: http://review.gluster.org/15198 Smoke: Gluster Build System <jenkins@build.gluster.org> Reviewed-by: Niels de Vos <ndevos@redhat.com> CentOS-regression: Gluster Build System <jenkins@build.gluster.org> NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Diffstat (limited to 'events/src/Makefile.am')
-rw-r--r--events/src/Makefile.am15
1 files changed, 10 insertions, 5 deletions
diff --git a/events/src/Makefile.am b/events/src/Makefile.am
index 423bc8891fb..d292fbebc12 100644
--- a/events/src/Makefile.am
+++ b/events/src/Makefile.am
@@ -6,18 +6,21 @@ BUILT_SOURCES = eventtypes.py
CLEANFILES = eventtypes.py
eventsdir = $(libexecdir)/glusterfs/events
+events_PYTHON = __init__.py gf_event.py eventsapiconf.py eventtypes.py \
+ utils.py
+
+eventtypes.py:
+ $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER
+
+if BUILD_EVENTS
eventspeerscriptdir = $(libexecdir)/glusterfs
eventsconfdir = $(sysconfdir)/glusterfs
eventsconf_DATA = eventsconfig.json
-events_PYTHON = __init__.py eventsapiconf.py eventtypes.py handlers.py \
- utils.py gf_event.py
+events_PYTHON += handlers.py
events_SCRIPTS = glustereventsd.py
eventspeerscript_SCRIPTS = peer_eventsapi.py
-eventtypes.py: $(top_srcdir)/events/eventskeygen.py
- $(PYTHON) $(top_srcdir)/events/eventskeygen.py PY_HEADER
-
install-exec-hook:
$(mkdir_p) $(DESTDIR)$(sbindir)
rm -f $(DESTDIR)$(sbindir)/glustereventsd
@@ -30,3 +33,5 @@ install-exec-hook:
uninstall-hook:
rm -f $(DESTDIR)$(sbindir)/glustereventsd
rm -f $(DESTDIR)$(sbindir)/gluster-eventsapi
+
+endif