From b4f2e2e03037fde8793c68a969754c48bbd36c45 Mon Sep 17 00:00:00 2001 From: Carsten Haitzler Date: Fri, 26 Nov 2004 10:57:58 +0000 Subject: [PATCH] slightly tidier if's - spec up to pre10 SVN revision: 12273 --- enlightenment.oe | 2 +- enlightenment.spec | 8 ++++++-- src/bin/Makefile.am | 6 +++++- src/bin/e_module.c | 12 ++++++------ 4 files changed, 18 insertions(+), 10 deletions(-) diff --git a/enlightenment.oe b/enlightenment.oe index 1240e9304..eb54e679a 100644 --- a/enlightenment.oe +++ b/enlightenment.oe @@ -4,7 +4,7 @@ MAINTAINER = "Carsten Haitzler (Rasterman) " SECTION = "e/windowmanager" PRIORITY = "optional" DEPENDS = "ecore edje eet embryo evas imlib2 embryo-native edje-native imlib2-native" -PV = "0.17.0_pre5" +PV = "0.17.0_pre10" PR = "1" do_prepsources () { diff --git a/enlightenment.spec b/enlightenment.spec index c75fe555b..20756dddf 100644 --- a/enlightenment.spec +++ b/enlightenment.spec @@ -1,7 +1,7 @@ # Note that this is NOT a relocatable package -%define ver 0.17.0_pre5 +%define ver 0.17.0_pre10 %define rel NOT_RELEASE_1 -%define prefix /usr +%define prefix /usr/local Summary: enlightenment Name: enlightenment @@ -16,9 +16,13 @@ URL: http://www.enlightenment.org/ BuildRequires: evas-devel BuildRequires: edje-devel BuildRequires: ecore-devel +BuildRequires: embryo-devel +BuildRequires: eet-devel Requires: edje Requires: evas Requires: ecore +Requires: embryo +Requires: eet Docdir: %{prefix}/doc diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am index eb05130d7..4c4fc3669 100644 --- a/src/bin/Makefile.am +++ b/src/bin/Makefile.am @@ -6,7 +6,7 @@ INCLUDES = -I$(includedir) \ @e_cflags@ \ @EDJE_DEF@ -bin_PROGRAMS = enlightenment +bin_PROGRAMS = enlightenment enlightenment_remote enlightenment_SOURCES = \ e.h \ @@ -61,3 +61,7 @@ e_resist.h \ e_resist.c enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@ + +enlightenment_remote_SOURCES = \ +e.h \ +e_remote_main.c diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 0cc350d37..e9aee46a3 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -46,12 +46,12 @@ e_module_init(void) { E_Module *m; - if (m = e_module_new("test")) - e_module_enable(m); - if (m = e_module_new("ibar")) - e_module_enable(m); - if (m = e_module_new("dropshadow")) - e_module_enable(m); + m = e_module_new("test"); + if (m) e_module_enable(m); + m = e_module_new("ibar"); + if (m) e_module_enable(m); + m = e_module_new("dropshadow"); + if (m) e_module_enable(m); } return 1;