bu5hm4n pushed a commit to branch master. http://git.enlightenment.org/misc/entrance.git/commit/?id=61d0d63bd0e2cdcdea4bb5dbe0616c362447ec65
commit 61d0d63bd0e2cdcdea4bb5dbe0616c362447ec65 Author: Marcel Hollerbach <[email protected]> Date: Fri Feb 7 11:48:55 2014 +0100 Changed the compile settings, the subdirectory event will be compiled as static library and included in the two ther directorys. Just a beauty thing :) Reviewers: michael.bouchaud CC: raster Differential Revision: https://phab.enlightenment.org/D451 --- .gitignore | 4 ++++ configure.ac | 3 ++- src/Makefile.am | 2 +- src/bin/Makefile.am | 5 +---- src/daemon/Makefile.am | 4 +--- src/event/Makefile.am | 14 ++++++++++++++ 6 files changed, 23 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 92c53f0..b2d0dab 100644 --- a/.gitignore +++ b/.gitignore @@ -32,6 +32,10 @@ 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 diff --git a/configure.ac b/configure.ac index 1b15e10..6ad0a89 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ AC_INIT([entrance], [0.0.99], [[email protected]]) 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,6 +196,7 @@ AC_FUNC_ALLOCA AC_OUTPUT([ Makefile src/Makefile +src/event/Makefile src/bin/Makefile src/daemon/Makefile data/Makefile diff --git a/src/Makefile.am b/src/Makefile.am index d7c9551..60f4ecb 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = bin daemon +SUBDIRS = event bin daemon MAINTAINERCLEANFILES = Makefile.in diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index 195d93a..99b04d2 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -12,8 +12,6 @@ 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 \ @@ -29,5 +27,4 @@ entrance_gui.c entrance_client_LDFLAGS = -entrance_client_LDADD = @ENTRANCE_CLIENT_LIBS@ - +entrance_client_LDADD = @ENTRANCE_CLIENT_LIBS@ ../event/libevent.a diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am index 428412e..9548cb7 100644 --- a/src/daemon/Makefile.am +++ b/src/daemon/Makefile.am @@ -30,8 +30,6 @@ 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 \ @@ -43,7 +41,7 @@ entrance.c entrance_LDFLAGS = -entrance_LDADD = @ENTRANCE_LIBS@ +entrance_LDADD = @ENTRANCE_LIBS@ ../event/libevent.a entrance_wait_SOURCES = \ entrance_wait.c diff --git a/src/event/Makefile.am b/src/event/Makefile.am new file mode 100644 index 0000000..d3ce13c --- /dev/null +++ b/src/event/Makefile.am @@ -0,0 +1,14 @@ + +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 --
