summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rw-r--r--lib/tevent/configure.ac2
-rw-r--r--lib/tevent/rules.mk2
-rw-r--r--lib/tevent/tests.py2
-rw-r--r--lib/tevent/tevent.mk42
5 files changed, 24 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore
index e2f7500781..046ee92fc9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -347,3 +347,4 @@ librpc/gen_ndr/*_c.h
librpc/gen_ndr/*_s.c
librpc/gen_ndr/cli_named_pipe_auth.[ch]
librpc/gen_ndr/srv_named_pipe_auth.[ch]
+lib/tevent/Makefile
diff --git a/lib/tevent/configure.ac b/lib/tevent/configure.ac
index 75719d13b4..d9d39e0e72 100644
--- a/lib/tevent/configure.ac
+++ b/lib/tevent/configure.ac
@@ -37,4 +37,4 @@ if test -z "$PYTHON_CONFIG"; then
PYTHON_INSTALL_TARGET=""
PYTHON_CHECK_TARGET=""
fi
-AC_OUTPUT(Makefile events.pc)
+AC_OUTPUT(Makefile tevent.pc)
diff --git a/lib/tevent/rules.mk b/lib/tevent/rules.mk
index cfe548039b..6fd990fbf4 100644
--- a/lib/tevent/rules.mk
+++ b/lib/tevent/rules.mk
@@ -4,7 +4,7 @@
$(SWIG) -O -Wall -python -keyword $<
showflags::
- @echo 'libevents will be compiled with flags:'
+ @echo 'libtevent will be compiled with flags:'
@echo ' CFLAGS = $(CFLAGS)'
@echo ' CPPFLAGS = $(CPPFLAGS)'
@echo ' LDFLAGS = $(LDFLAGS)'
diff --git a/lib/tevent/tests.py b/lib/tevent/tests.py
index 006426207e..b14f7e6250 100644
--- a/lib/tevent/tests.py
+++ b/lib/tevent/tests.py
@@ -17,7 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
-from samba import events
+import events
import unittest
# Just test the bindings are there and that calling them doesn't crash
diff --git a/lib/tevent/tevent.mk b/lib/tevent/tevent.mk
index 2bc6221689..223bd981cf 100644
--- a/lib/tevent/tevent.mk
+++ b/lib/tevent/tevent.mk
@@ -1,14 +1,13 @@
+TEVENT_SONAME = libtevent.$(SHLIBEXT).0
+TEVENT_SOLIB = libtevent.$(SHLIBEXT).$(PACKAGE_VERSION)
-EVENTS_SONAME = libevents.$(SHLIBEXT).0
-EVENTS_SOLIB = libevents.$(SHLIBEXT).$(PACKAGE_VERSION)
+libtevent.a: $(TEVENT_OBJ)
+ ar -rv libtevent.a $(TEVENT_OBJ)
-libevents.a: $(EVENTS_OBJ)
- ar -rv libevents.a $(EVENTS_OBJ)
-
-libevents.$(SHLIBEXT): $(EVENTS_SOLIB)
+libtevent.$(SHLIBEXT): $(TEVENT_SOLIB)
ln -fs $< $@
-$(EVENTS_SONAME): $(EVENTS_SOLIB)
+$(TEVENT_SONAME): $(TEVENT_SOLIB)
ln -fs $< $@
dirs::
@@ -20,40 +19,39 @@ installdirs::
mkdir -p $(DESTDIR)$(libdir)/pkgconfig
installheaders:: installdirs
- cp $(srcdir)/events.h $(DESTDIR)$(includedir)
+ cp $(srcdir)/tevent.h $(DESTDIR)$(includedir)
installlibs:: installdirs
- cp events.pc $(DESTDIR)$(libdir)/pkgconfig
- cp libevents.a $(EVENTS_SOLIB) $(DESTDIR)$(libdir)
+ cp tevent.pc $(DESTDIR)$(libdir)/pkgconfig
+ cp libtevent.a $(TEVENT_SOLIB) $(DESTDIR)$(libdir)
install:: all installdirs installheaders installlibs $(PYTHON_INSTALL_TARGET)
clean::
- rm -f $(EVENTS_SONAME) $(EVENTS_SOLIB) libevents.a libevents.$(SHLIBEXT)
- rm -f events.pc
- rm -f _libevents.$(SHLIBEXT)
-
+ rm -f $(TEVENT_SONAME) $(TEVENT_SOLIB) libtevent.a libtevent.$(SHLIBEXT)
+ rm -f tevent.pc
+ rm -f _libtevent.$(SHLIBEXT)
#python stuff
check-python:: build-python
- $(LIB_PATH_VAR)=. PYTHONPATH=".:$(eventsdir)" $(PYTHON) $(eventsdir)/python/tests/simple.py
+ $(LIB_PATH_VAR)=. PYTHONPATH=".:$(teventdir)" $(PYTHON) $(teventdir)/tests.py
install-swig::
mkdir -p $(DESTDIR)`$(SWIG) -swiglib`
- cp events.i $(DESTDIR)`$(SWIG) -swiglib`
+ cp tevent.i $(DESTDIR)`$(SWIG) -swiglib`
-build-python:: _libevents.$(SHLIBEXT)
+build-python:: _events.$(SHLIBEXT)
-events_wrap.o: $(eventsdir)/events_wrap.c
- $(CC) $(PICFLAG) -c $(eventsdir)/events_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
+events_wrap.o: $(teventdir)/events_wrap.c
+ $(CC) $(PICFLAG) -c $(teventdir)/events_wrap.c $(CFLAGS) `$(PYTHON_CONFIG) --cflags`
-_libevents.$(SHLIBEXT): libevents.$(SHLIBEXT) events_wrap.o
- $(SHLD) $(SHLD_FLAGS) -o $@ events_wrap.o -L. -levents `$(PYTHON_CONFIG) --libs`
+_events.$(SHLIBEXT): libtevent.$(SHLIBEXT) events_wrap.o
+ $(SHLD) $(SHLD_FLAGS) -o $@ events_wrap.o -L. -ltevent `$(PYTHON_CONFIG) --libs`
install-python:: build-python
mkdir -p $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"` \
$(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`
- cp $(eventsdir)/events.py $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"`
+ cp $(teventdir)/events.py $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(0, prefix='$(prefix)')"`
cp _libevents.$(SHLIBEXT) $(DESTDIR)`$(PYTHON) -c "import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, prefix='$(prefix)')"`