summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler <raster@rasterman.com>2004-11-26 10:57:58 +0000
committerCarsten Haitzler <raster@rasterman.com>2004-11-26 10:57:58 +0000
commitb4f2e2e03037fde8793c68a969754c48bbd36c45 (patch)
tree6312094235c3a4f8c1a2c4195bc8e27d43d0502f
parent0dd8ecf2b97cb7fc96cdbc32a68bb22b7174b674 (diff)
slightly tidier if's - spec up to pre10
SVN revision: 12273
-rw-r--r--enlightenment.oe2
-rw-r--r--enlightenment.spec8
-rw-r--r--src/bin/Makefile.am6
-rw-r--r--src/bin/e_module.c12
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) <raster@rasterman.com>"
4SECTION = "e/windowmanager" 4SECTION = "e/windowmanager"
5PRIORITY = "optional" 5PRIORITY = "optional"
6DEPENDS = "ecore edje eet embryo evas imlib2 embryo-native edje-native imlib2-native" 6DEPENDS = "ecore edje eet embryo evas imlib2 embryo-native edje-native imlib2-native"
7PV = "0.17.0_pre5" 7PV = "0.17.0_pre10"
8PR = "1" 8PR = "1"
9 9
10do_prepsources () { 10do_prepsources () {
diff --git a/enlightenment.spec b/enlightenment.spec
index c75fe555b..20756dddf 100644
--- a/enlightenment.spec
+++ b/enlightenment.spec
@@ -1,7 +1,7 @@
1# Note that this is NOT a relocatable package 1# Note that this is NOT a relocatable package
2%define ver 0.17.0_pre5 2%define ver 0.17.0_pre10
3%define rel NOT_RELEASE_1 3%define rel NOT_RELEASE_1
4%define prefix /usr 4%define prefix /usr/local
5 5
6Summary: enlightenment 6Summary: enlightenment
7Name: enlightenment 7Name: enlightenment
@@ -16,9 +16,13 @@ URL: http://www.enlightenment.org/
16BuildRequires: evas-devel 16BuildRequires: evas-devel
17BuildRequires: edje-devel 17BuildRequires: edje-devel
18BuildRequires: ecore-devel 18BuildRequires: ecore-devel
19BuildRequires: embryo-devel
20BuildRequires: eet-devel
19Requires: edje 21Requires: edje
20Requires: evas 22Requires: evas
21Requires: ecore 23Requires: ecore
24Requires: embryo
25Requires: eet
22 26
23Docdir: %{prefix}/doc 27Docdir: %{prefix}/doc
24 28
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) \
6 @e_cflags@ \ 6 @e_cflags@ \
7 @EDJE_DEF@ 7 @EDJE_DEF@
8 8
9bin_PROGRAMS = enlightenment 9bin_PROGRAMS = enlightenment enlightenment_remote
10 10
11enlightenment_SOURCES = \ 11enlightenment_SOURCES = \
12e.h \ 12e.h \
@@ -61,3 +61,7 @@ e_resist.h \
61e_resist.c 61e_resist.c
62 62
63enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@ 63enlightenment_LDFLAGS = -export-dynamic @e_libs@ @dlopen_libs@
64
65enlightenment_remote_SOURCES = \
66e.h \
67e_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)
46 { 46 {
47 E_Module *m; 47 E_Module *m;
48 48
49 if (m = e_module_new("test")) 49 m = e_module_new("test");
50 e_module_enable(m); 50 if (m) e_module_enable(m);
51 if (m = e_module_new("ibar")) 51 m = e_module_new("ibar");
52 e_module_enable(m); 52 if (m) e_module_enable(m);
53 if (m = e_module_new("dropshadow")) 53 m = e_module_new("dropshadow");
54 e_module_enable(m); 54 if (m) e_module_enable(m);
55 } 55 }
56 56
57 return 1; 57 return 1;