summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2012-09-04 17:06:25 +0000
committerBruno Dilly <bdilly@profusion.mobi>2012-09-04 17:06:25 +0000
commitaf1551414463bd1cfacf62a2a863077a54881c87 (patch)
treedf4b03f75687e22456e716a19bf72bb033577f09
parenta1e29dd8fec4f124be5f2c2fb86e9095846dabd7 (diff)
e_cho: fix configure
Suggested by vtorri SVN revision: 76132
-rw-r--r--configure.ac7
-rw-r--r--src/bin/Makefile.am13
2 files changed, 5 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac
index 1ea0340..8bedcdd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -64,12 +64,7 @@ AC_SUBST(sounddir)
64AS_AC_EXPAND(SOUNDDIR, $sounddir) 64AS_AC_EXPAND(SOUNDDIR, $sounddir)
65AC_DEFINE_UNQUOTED(SOUNDDIR, ["$SOUNDDIR"], [Where sound files are installed.]) 65AC_DEFINE_UNQUOTED(SOUNDDIR, ["$SOUNDDIR"], [Where sound files are installed.])
66 66
67PKG_CHECK_MODULES([ETROPHY], [etrophy]) 67PKG_CHECK_MODULES([ECHO], [libcanberra etrophy elementary edje ecore evas])
68PKG_CHECK_MODULES([ELEMENTARY], [elementary])
69PKG_CHECK_MODULES(LIBCANBERRA, [libcanberra])
70PKG_CHECK_MODULES(EVAS, [evas])
71PKG_CHECK_MODULES(ECORE, [ecore])
72PKG_CHECK_MODULES(EDJE, [edje])
73 68
74AC_ARG_WITH([edje-cc], 69AC_ARG_WITH([edje-cc],
75 [AC_HELP_STRING([--with-edje-cc=PATH], 70 [AC_HELP_STRING([--with-edje-cc=PATH],
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 7714aa8..4a58179 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -6,19 +6,14 @@ INCLUDES = \
6-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 6-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
7-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \ 7-DGETTEXT_PACKAGE=\"$(PACKAGE)\" \
8-DLOCALEDIR=\"$(localedir)\" \ 8-DLOCALEDIR=\"$(localedir)\" \
9@ETROPHY_CFLAGS@ \ 9@ECHO_CFLAGS@
10@ELEMENTARY_CFLAGS@ \
11@LIBCANBERRA_CFLAGS@ \
12@EVAS_CFLAGS@ \
13@ECORE_CFLAGS@ \
14@EDJE_CFLAGS@
15 10
16bin_PROGRAMS = e_cho 11bin_PROGRAMS = e_cho
17if BUILD_QUICKLAUNCH 12if BUILD_QUICKLAUNCH
18bin_PROGRAMS += e_cho_ql 13bin_PROGRAMS += e_cho_ql
19endif 14endif
20 15
21e_cho_LDADD = @ETROPHY_LIBS@ @ELEMENTARY_LIBS@ @LIBCANBERRA_LIBS@ @EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ 16e_cho_LDADD = @ECHO_LIBS@
22e_cho_SOURCES = main.c sound.c 17e_cho_SOURCES = main.c sound.c
23 18
24if BUILD_QUICKLAUNCH 19if BUILD_QUICKLAUNCH
@@ -31,11 +26,11 @@ if BUILD_QUICKLAUNCH
31e_cho_qldir = $(quicklauncher_libdir) 26e_cho_qldir = $(quicklauncher_libdir)
32e_cho_ql_LTLIBRARIES = e_cho_ql.la 27e_cho_ql_LTLIBRARIES = e_cho_ql.la
33e_cho_ql_la_SOURCES = main.c sound.c 28e_cho_ql_la_SOURCES = main.c sound.c
34e_cho_ql_la_LIBADD = @ETROPHY_LIBS@ @ELEMENTARY_LIBS@ @LIBCANBERRA_LIBS@ @EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ 29e_cho_ql_la_LIBADD = @ECHO_LIBS@
35e_cho_ql_la_CFLAGS = 30e_cho_ql_la_CFLAGS =
36e_cho_ql_la_LDFLAGS = -module -avoid-version -no-undefined 31e_cho_ql_la_LDFLAGS = -module -avoid-version -no-undefined
37e_cho_ql_SOURCES = main.c 32e_cho_ql_SOURCES = main.c
38e_cho_ql_LDADD = @ETROPHY_LIBS@ @ELEMENTARY_LIBS@ @LIBCANBERRA_LIBS@ @EVAS_LIBS@ @ECORE_LIBS@ @EDJE_LIBS@ 33e_cho_ql_LDADD = @ECHO_LIBS@
39e_cho_ql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1 34e_cho_ql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
40e_cho_ql_LDFLAGS = 35e_cho_ql_LDFLAGS =
41endif 36endif