Revert "Changed the compile settings, the subdirectory event will be compiled as static library and included in the two ther directorys. Just a beauty thing :)"

Build is slower than before, on link we have DSO errors and I think it's worse than before. We have one more library to link. This reverts commit 61d0d63bd0.
9 years ago · f10de61725
parent 61d0d63bd0
commit f10de61725
6 changed files with 9 additions and 23 deletions
--- a/.gitignore
+++ b/.gitignore
@ -32,10 +32,6 @@ src/bin/.deps/
 src/bin/Makefile
 src/bin/Makefile.in
 src/bin/entrance_client
-src/event/.deps/
-src/event/Makefile
-src/event/Makefile.in
-src/event/libevent.a
 src/daemon/.deps/
 src/daemon/Makefile
 src/daemon/Makefile.in
--- a/configure.ac
+++ b/configure.ac
@ -2,7 +2,7 @@ AC_INIT([entrance], [0.0.99], [enlightenment-devel@lists.sourceforge.net])
 AC_PREREQ([2.59])
 AC_CONFIG_SRCDIR([configure.ac])
 AC_CONFIG_MACRO_DIR([m4])
-AC_PROG_RANLIB
+
 AM_INIT_AUTOMAKE([1.6 dist-bzip2])
 AC_CONFIG_HEADERS([config.h])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
@ -196,7 +196,6 @@ AC_FUNC_ALLOCA
 AC_OUTPUT([
 Makefile
 src/Makefile
-src/event/Makefile
 src/bin/Makefile
 src/daemon/Makefile
 data/Makefile
--- a/src/Makefile.am
+++ b/src/Makefile.am
@ -1,3 +1,3 @@
-SUBDIRS = event bin daemon
+SUBDIRS = bin daemon

 MAINTAINERCLEANFILES = Makefile.in
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@ -12,6 +12,8 @@ internal_bindir=$(libdir)/entrance
 internal_bin_PROGRAMS = entrance_client

 entrance_client_SOURCES = \
+../event/entrance_event.h \
+../event/entrance_event.c \
 entrance_client.h         \
 entrance_client.c         \
 entrance_conf.h           \
@ -27,4 +29,5 @@ entrance_gui.c


 entrance_client_LDFLAGS =
-entrance_client_LDADD = @ENTRANCE_CLIENT_LIBS@ ../event/libevent.a
+entrance_client_LDADD = @ENTRANCE_CLIENT_LIBS@
+
--- a/src/daemon/Makefile.am
+++ b/src/daemon/Makefile.am
@ -30,6 +30,8 @@ entrance_session.h     \
 entrance_session.c     \
 entrance_xserver.h     \
 entrance_xserver.c     \
+../event/entrance_event.c \
+../event/entrance_event.h \
 entrance_server.h     \
 entrance_server.c     \
 entrance_history.h    \
@ -41,7 +43,7 @@ entrance.c


 entrance_LDFLAGS =
-entrance_LDADD = @ENTRANCE_LIBS@ ../event/libevent.a
+entrance_LDADD = @ENTRANCE_LIBS@

 entrance_wait_SOURCES = \
 entrance_wait.c
--- a/src/event/Makefile.am
+++ b/src/event/Makefile.am
@ -1,14 +0,0 @@
-
-MAINTAINERCLEANFILES = Makefile.in
-
-AM_CPPFLAGS = \
-I$(top_srcdir)/src/event \
-I$(top_builddir)/src/event \
-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
-DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \
-DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \
-DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \
-@ENTRANCE_CFLAGS@
-
-noinst_LIBRARIES = libevent.a
-libevent_a_SOURCES = entrance_event.c