yoz pushed a commit to branch master. http://git.enlightenment.org/misc/entrance.git/commit/?id=c51af48c35fecb85eb2dd9c2f402951a4ffd985e
commit c51af48c35fecb85eb2dd9c2f402951a4ffd985e Author: Michaël Bouchaud (yoz) <[email protected]> Date: Tue May 13 16:04:26 2014 +0200 entrance: rewrite autofoo to use non recursive Makefile, big thx to vtorri ! --- .gitignore | 5 ++- Makefile.am | 31 +++++++++++---- configure.ac | 6 --- data/Makefile.am | 57 --------------------------- data/Makefile.mk | 62 +++++++++++++++++++++++++++++ data/themes/Makefile.am | 4 -- data/themes/default/Makefile.am | 37 ------------------ data/themes/default/Makefile.mk | 41 ++++++++++++++++++++ src/Makefile.am | 3 -- src/bin/Makefile.am | 39 ------------------- src/bin/Makefile.mk | 32 +++++++++++++++ src/daemon/Makefile.am | 72 ---------------------------------- src/daemon/Makefile.mk | 86 +++++++++++++++++++++++++++++++++++++++++ 13 files changed, 248 insertions(+), 227 deletions(-) diff --git a/.gitignore b/.gitignore index 0be111e..2d14db4 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ install-sh missing src/Makefile src/Makefile.in -src/bin/.deps/ src/bin/Makefile src/bin/Makefile.in src/bin/entrance_client @@ -42,3 +41,7 @@ src/daemon/entrance_wait src/daemon/entrance_ck_launch data/entrance.service stamp-h1 +.dirstamp +.deps +entrance-*.tar.gz +entrance-*.tar.bz2 diff --git a/Makefile.am b/Makefile.am index 812990b..a910b3f 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,18 +1,33 @@ +AUTOMAKE_OPTIONS = subdir-objects ACLOCAL_AMFLAGS = -I m4 -SUBDIRS = src data - MAINTAINERCLEANFILES = \ Makefile.in \ -config.guess \ -config.h.in \ aclocal.m4 \ +compile \ +config.h.in \ config.h.in~ \ -config.sub \ configure \ depcomp \ install-sh \ -missing \ -config.rpath \ -mkinstalldirs +missing + +EXTRA_DIST = +ENTRANCE_CLEANFILES = +internal_libdir = $(libdir)/entrance +internal_lib_PROGRAMS = + +include src/bin/Makefile.mk +include src/daemon/Makefile.mk +include data/Makefile.mk +include data/themes/default/Makefile.mk + +EXTRA_DIST += \ +autogen.sh \ +m4/ac_attribute.m4 \ +m4/efl_compiler_flag.m4 \ +utils/entrance_xephyr.sh + +clean-local: + rm -rf $(ENTRANCE_CLEANFILES) diff --git a/configure.ac b/configure.ac index 7027da6..409d45d 100644 --- a/configure.ac +++ b/configure.ac @@ -198,12 +198,6 @@ AC_FUNC_ALLOCA AC_OUTPUT([ Makefile -src/Makefile -src/bin/Makefile -src/daemon/Makefile -data/Makefile -data/themes/Makefile -data/themes/default/Makefile ]) diff --git a/data/Makefile.am b/data/Makefile.am deleted file mode 100644 index 95f24bf..0000000 --- a/data/Makefile.am +++ /dev/null @@ -1,57 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -EXTRA_DIST = entrance entrance.conf entrance.other entrance.service.in sudoers/entrance.in Xsession - -SUBDIRS = themes - -pamdir = $(sysconfdir)/pam.d/ -pam_DATA = entrance - -confdir = $(sysconfdir)/entrance -conf_DATA = entrance.conf - -internal_bindir=$(sysconfdir)/entrance -internal_bin_SCRIPTS = Xsession - - -sudoersdir = $(sysconfdir)/sudoers.d -sudoers_DATA = sudoers/entrance - -sed_process = @SED@ \ --e 's,@VERSION\@,$(VERSION),g' \ --e 's,@VMAJ\@,$(VMAJ),g' \ --e 's,@prefix\@,$(prefix),g' \ --e 's,@exec_prefix\@,$(exec_prefix),g' \ --e 's,@libdir\@,$(libdir),g' \ --e 's,@includedir\@,$(includedir),g' \ --e 's,@pkgincludedir\@,$(pkgincludedir),g' \ --e 's,@SBINDIR\@,$(sbindir),g' \ --e 's,@SYSCONFDIR\@,$(sysconfdir),g' \ -< $< > $@ || rm $@ - -pc_verbose = $(pc_verbose_@AM_V@) -pc_verbose_ = $(pc_verbose_@AM_DEFAULT_V@) -pc_verbose_0 = @echo " SED " $@; - -sudoers/entrance: $(top_srcdir)/data/sudoers/entrance.in Makefile - $(AM_V_at)$(RM) $@ - $(AM_V_at)$(MKDIR_P) sudoers/ - $(pc_verbose)$(sed_process) - -entrance.conf: $(top_srcdir)/data/entrance.conf.in Makefile - $(AM_V_at)$(RM) $@ - $(pc_verbose)$(sed_process) - -if HAVE_SYSTEMD -systemddir = /usr/lib/systemd/system/ -systemd_DATA = entrance.service - -entrance.service: $(top_srcdir)/data/entrance.service.in Makefile - $(AM_V_at)$(RM) $@ - $(pc_verbose)$(sed_process) - -endif - -clean-local: - $(RM) entrance.conf entrance.service sudoers/entrance diff --git a/data/Makefile.mk b/data/Makefile.mk new file mode 100644 index 0000000..b03cff7 --- /dev/null +++ b/data/Makefile.mk @@ -0,0 +1,62 @@ + +pamdir = $(sysconfdir)/pam.d/ +pam_DATA = data/entrance + +confdir = $(sysconfdir)/entrance +conf_DATA = data/entrance.conf + +internal_sysconfdir=$(sysconfdir)/entrance +internal_sysconf_SCRIPTS = data/Xsession + +sudoersdir = $(sysconfdir)/sudoers.d +sudoers_DATA = data/sudoers/entrance + +sed_process = @SED@ \ +-e 's,@VERSION\@,$(VERSION),g' \ +-e 's,@VMAJ\@,$(VMAJ),g' \ +-e 's,@prefix\@,$(prefix),g' \ +-e 's,@exec_prefix\@,$(exec_prefix),g' \ +-e 's,@libdir\@,$(libdir),g' \ +-e 's,@includedir\@,$(includedir),g' \ +-e 's,@pkgincludedir\@,$(pkgincludedir),g' \ +-e 's,@SBINDIR\@,$(sbindir),g' \ +-e 's,@SYSCONFDIR\@,$(sysconfdir),g' \ +< $< > $@ || rm $(top_srcdir)/$@ + +pc_verbose = $(pc_verbose_@AM_V@) +pc_verbose_ = $(pc_verbose_@AM_DEFAULT_V@) +pc_verbose_0 = @echo " SED " $@; + +data/sudoers/entrance: $(top_srcdir)/data/sudoers/entrance.in Makefile + $(AM_V_at)$(RM) $@ + $(AM_V_at)$(MKDIR_P) data/sudoers/ + $(pc_verbose)$(sed_process) + +data/entrance.conf: $(top_srcdir)/data/entrance.conf.in Makefile + $(AM_V_at)$(RM) $@ + $(AM_V_at)$(MKDIR_P) data/ + $(pc_verbose)$(sed_process) + +if HAVE_SYSTEMD +systemddir = /usr/lib/systemd/system/ +systemd_DATA = data/entrance.service + +data/entrance.service: $(top_srcdir)/data/entrance.service.in Makefile + $(AM_V_at)$(RM) $@ + $(pc_verbose)$(sed_process) + +endif + +ENTRANCE_CLEANFILES += \ +data/entrance.conf \ +data/entrance.service \ +data/sudoers/entrance + +EXTRA_DIST += \ +data/entrance \ +data/entrance.arch \ +data/entrance.conf.in \ +data/entrance.other \ +data/entrance.service.in \ +data/sudoers/entrance.in \ +data/Xsession diff --git a/data/themes/Makefile.am b/data/themes/Makefile.am deleted file mode 100644 index 31a2b40..0000000 --- a/data/themes/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -MAINTAINERCLEANFILES = Makefile.in - -SUBDIRS = default - diff --git a/data/themes/default/Makefile.am b/data/themes/default/Makefile.am deleted file mode 100644 index d532492..0000000 --- a/data/themes/default/Makefile.am +++ /dev/null @@ -1,37 +0,0 @@ -AUTOMAKE_OPTIONS = 1.4 foreign -MAINTAINERCLEANFILES = Makefile.in - -EDJE_CC = @edje_cc@ -EDJE_FLAGS = -v -id $(top_srcdir)/data/themes/default/images -fd $(top_srcdir)/data/themes/default/fonts - -filesdir = $(datadir)/entrance/themes/ -files_DATA = default.edj - -EXTRA_DIST = \ - default.edc \ - images/adrielhernandez-cmyk-tux.png \ -images/brunocb-tux-1-euro.png \ -images/cisoun-tux-coup-de-soleil.png \ -images/eliaden-tux-marin.png \ -images/entrance_background.jpg \ -images/fcys14-tux-breton.png \ -images/fcys14-tux-croco.png \ -images/fcys14-tux-pompier.png \ -images/fcys14-yoshi-tux.png \ -images/m4r10-tux-crema.png \ -images/mybob-calimetux.png \ -images/overlord59-astro-tux.png \ -images/overlord59-dj-tux-mix-platine.png \ -images/overlord59-magic-tux.png \ -images/overlord59-tux-pianiste.png \ -images/touko-tux-pirate.png - - -default.edj: Makefile $(EXTRA_DIST) - $(EDJE_CC) $(EDJE_FLAGS) \ - $(top_srcdir)/data/themes/default/default.edc \ - $(top_builddir)/data/themes/default/default.edj - -clean-local: - rm -f *.edj - diff --git a/data/themes/default/Makefile.mk b/data/themes/default/Makefile.mk new file mode 100644 index 0000000..7e8dcc1 --- /dev/null +++ b/data/themes/default/Makefile.mk @@ -0,0 +1,41 @@ + +edje_process = \ +$(edje) \ +-id $(top_srcdir)/data/themes/default/images \ +-fd $(top_srcdir)/data/themes/default/fonts \ +$< $@ || rm -f $@ + +edje = @edje_cc@ +edje_verbose = $(edje_verbose_@AM_V@) +edje_verbose_ = $(edje_verbose_@AM_DEFAULT_V@) +edje_verbose_0 = @echo " EDJ " $@; + +filesdir = $(datadir)/entrance/themes/ +files_DATA = data/themes/default/default.edj + +EXTRA_DIST += \ +data/themes/default/default.edc \ +data/themes/default/images/adrielhernandez-cmyk-tux.png \ +data/themes/default/images/brunocb-tux-1-euro.png \ +data/themes/default/images/cisoun-tux-coup-de-soleil.png \ +data/themes/default/images/eliaden-tux-marin.png \ +data/themes/default/images/entrance_background.jpg \ +data/themes/default/images/fcys14-tux-breton.png \ +data/themes/default/images/fcys14-tux-croco.png \ +data/themes/default/images/fcys14-tux-pompier.png \ +data/themes/default/images/fcys14-yoshi-tux.png \ +data/themes/default/images/m4r10-tux-crema.png \ +data/themes/default/images/mybob-calimetux.png \ +data/themes/default/images/overlord59-astro-tux.png \ +data/themes/default/images/overlord59-dj-tux-mix-platine.png \ +data/themes/default/images/overlord59-magic-tux.png \ +data/themes/default/images/overlord59-tux-pianiste.png \ +data/themes/default/images/touko-tux-pirate.png + + +data/themes/default/default.edj: $(top_srcdir)/data/themes/default/default.edc Makefile $(EXTRA_DIST) + $(AM_V_at)rm -f $@ + $(AM_V_at)$(MKDIR_P) data/themes/default/ + $(edje_verbose)$(edje_process) + +ENTRANCE_CLEANFILES += $(top_builddir)/data/themes/default/*.edj diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index d7c9551..0000000 --- a/src/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -SUBDIRS = bin daemon - -MAINTAINERCLEANFILES = Makefile.in diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am deleted file mode 100644 index 7254071..0000000 --- a/src/bin/Makefile.am +++ /dev/null @@ -1,39 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = \ --I$(top_srcdir)/src/bin \ --I$(top_builddir)/src/bin \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ --DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ -@ENTRANCE_CLIENT_CFLAGS@ - -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 \ -entrance_conf.c \ -entrance_conf_main.h \ -entrance_conf_main.c \ -entrance_conf_theme.h \ -entrance_conf_theme.c \ -entrance_conf_user.h \ -entrance_conf_user.c \ -entrance_connect.h \ -entrance_connect.c \ -entrance_fill.h \ -entrance_fill.c \ -entrance_login.h \ -entrance_login.c \ -entrance_gui.h \ -entrance_gui.c - - -entrance_client_LDFLAGS = -entrance_client_LDADD = @ENTRANCE_CLIENT_LIBS@ - diff --git a/src/bin/Makefile.mk b/src/bin/Makefile.mk new file mode 100644 index 0000000..7a3689b --- /dev/null +++ b/src/bin/Makefile.mk @@ -0,0 +1,32 @@ + +internal_lib_PROGRAMS += src/bin/entrance_client + +src_bin_entrance_client_SOURCES = \ +src/event/entrance_event.h \ +src/event/entrance_event.c \ +src/bin/entrance_client.h \ +src/bin/entrance_client.c \ +src/bin/entrance_conf.h \ +src/bin/entrance_conf.c \ +src/bin/entrance_conf_main.h \ +src/bin/entrance_conf_main.c \ +src/bin/entrance_conf_theme.h \ +src/bin/entrance_conf_theme.c \ +src/bin/entrance_conf_user.h \ +src/bin/entrance_conf_user.c \ +src/bin/entrance_connect.h \ +src/bin/entrance_connect.c \ +src/bin/entrance_fill.h \ +src/bin/entrance_fill.c \ +src/bin/entrance_login.h \ +src/bin/entrance_login.c \ +src/bin/entrance_gui.h \ +src/bin/entrance_gui.c + +src_bin_entrance_client_CPPFLAGS = \ +-I$(top_srcdir)/src/bin \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ +@ENTRANCE_CLIENT_CFLAGS@ + +src_bin_entrance_client_LDADD = @ENTRANCE_CLIENT_LIBS@ diff --git a/src/daemon/Makefile.am b/src/daemon/Makefile.am deleted file mode 100644 index 2a75a31..0000000 --- a/src/daemon/Makefile.am +++ /dev/null @@ -1,72 +0,0 @@ - -MAINTAINERCLEANFILES = Makefile.in - -AM_CPPFLAGS = \ --I$(top_srcdir)/src/daemon \ --I$(top_builddir)/src/daemon \ --DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ --DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ --DPACKAGE_LIB_DIR=\"$(libdir)\" \ --DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \ --DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \ --DSUDO=\"@SUDO@\" \ -@ENTRANCE_CFLAGS@ - -if HAVE_CONSOLEKIT -AM_CPPFLAGS += @ENTRANCE_CK_CFLAGS@ -endif - -sbin_PROGRAMS = entrance - -internal_bindir=$(libdir)/entrance -internal_bin_PROGRAMS = entrance_wait - -if HAVE_CONSOLEKIT -internal_bin_PROGRAMS += entrance_ck_launch -endif - -entrance_SOURCES = \ -entrance_config.h \ -entrance_config.c \ -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 \ -entrance_history.c \ -entrance_action.h \ -entrance_action.c \ -entrance_image.h \ -entrance_image.c \ -entrance.h \ -entrance.c - - -entrance_LDFLAGS = -entrance_LDADD = @ENTRANCE_LIBS@ -lrt - -entrance_wait_SOURCES = \ -entrance_wait.c - -entrance_wait_LDFLAGS = -entrance_wait_LDADD = - -if HAVE_PAM -entrance_SOURCES += entrance_pam.h entrance_pam.c -entrance_LDADD += -lpam -else -entrance_LDADD += -lcrypt -endif - -if HAVE_CONSOLEKIT -entrance_ck_launch_SOURCES = \ -entrance_ck_launch.c - -entrance_ck_launch_LDFLAGS = -entrance_ck_launch_LDADD = @ENTRANCE_CK_LIBS@ -endif - diff --git a/src/daemon/Makefile.mk b/src/daemon/Makefile.mk new file mode 100644 index 0000000..537bece --- /dev/null +++ b/src/daemon/Makefile.mk @@ -0,0 +1,86 @@ + +# entrance + +sbin_PROGRAMS = src/daemon/entrance + +src_daemon_entrance_SOURCES = \ +src/event/entrance_event.c \ +src/event/entrance_event.h \ +src/daemon/entrance_config.h \ +src/daemon/entrance_config.c \ +src/daemon/entrance_session.h \ +src/daemon/entrance_session.c \ +src/daemon/entrance_xserver.h \ +src/daemon/entrance_xserver.c \ +src/daemon/entrance_server.h \ +src/daemon/entrance_server.c \ +src/daemon/entrance_history.h \ +src/daemon/entrance_history.c \ +src/daemon/entrance_action.h \ +src/daemon/entrance_action.c \ +src/daemon/entrance_image.h \ +src/daemon/entrance_image.c \ +src/daemon/entrance.h \ +src/daemon/entrance.c + +if HAVE_PAM +src_daemon_entrance_SOURCES += \ +src/daemon/entrance_pam.h \ +src/daemon/entrance_pam.c +endif + +src_daemon_entrance_CPPFLAGS = \ +-I$(top_srcdir)/src/daemon \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \ +-DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \ +-DSUDO=\"@SUDO@\" \ +@ENTRANCE_CFLAGS@ + +src_daemon_entrance_LDADD = @ENTRANCE_LIBS@ -lrt + +if HAVE_PAM +src_daemon_entrance_LDADD += -lpam +else +src_daemon_entrance_LDADD += -lcrypt +endif + +# entrance_wait + +internal_lib_PROGRAMS += src/daemon/entrance_wait + +src_daemon_entrance_wait_SOURCES = \ +src/daemon/entrance_wait.c + +src_daemon_entrance_wait_CPPFLAGS = \ +-I$(top_srcdir)/src/daemon \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \ +-DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \ +-DSUDO=\"@SUDO@\" \ +@ENTRANCE_CFLAGS@ + +# entrance_ck_launch + +if HAVE_CONSOLEKIT +internal_lib_PROGRAMS += src/daemon/entrance_ck_launch + +src_daemon_entrance_ck_launch_SOURCES = \ +src/daemon/entrance_ck_launch.c + +src_daemon_entrance_ck_launch_CPPFLAGS = \ +-I$(top_srcdir)/src/daemon \ +-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ +-DSYSTEM_CONFIG_DIR=\"$(sysconfdir)\" \ +-DPACKAGE_LIB_DIR=\"$(libdir)\" \ +-DPACKAGE_BIN_DIR=\"$(libdir)/$(PACKAGE)\" \ +-DPACKAGE_SBIN_DIR=\"$(sbindir)/\" \ +-DSUDO=\"@SUDO@\" \ +@ENTRANCE_CK_CFLAGS@ + +src_daemon_entrance_ck_launch_LDADD = @ENTRANCE_CK_LIBS@ +endif --
