summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Dilly <bdilly@profusion.mobi>2012-09-04 17:07:18 +0000
committerBruno Dilly <bdilly@profusion.mobi>2012-09-04 17:07:18 +0000
commitb5760ff1814b6951b2ca2ce21348e5e58e0568b9 (patch)
tree171d8b19bd165ac39a046cf022829c6030613bb2
parentf906581cf53b8cbdc0b020815d8d0426b409fdba (diff)
econcentration: fix configure
Suggested by vtorri SVN revision: 76133
-rw-r--r--configure.ac3
-rw-r--r--src/bin/Makefile.am9
2 files changed, 5 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index ccf15df..92a7c03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -61,8 +61,7 @@ AC_C_CONST
61AC_FUNC_ALLOCA 61AC_FUNC_ALLOCA
62AC_C___ATTRIBUTE__ 62AC_C___ATTRIBUTE__
63 63
64PKG_CHECK_MODULES([ELEMENTARY], [elementary evas ecore]) 64PKG_CHECK_MODULES([ECONCENTRATION], [etrophy elementary ecore evas])
65PKG_CHECK_MODULES([ETROPHY], [etrophy])
66 65
67want_quicklaunch="auto" 66want_quicklaunch="auto"
68AC_ARG_ENABLE([quicklaunch], 67AC_ARG_ENABLE([quicklaunch],
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index c30f3e0..7234156 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -4,15 +4,14 @@ INCLUDES = \
4-I$(top_srcdir) \ 4-I$(top_srcdir) \
5-I$(top_srcdir)/src/bin \ 5-I$(top_srcdir)/src/bin \
6-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 6-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
7@ELEMENTARY_CFLAGS@ \ 7@ECONCENTRATION_CFLAGS@
8@ETROPHY_CFLAGS@
9 8
10bin_PROGRAMS = econcentration 9bin_PROGRAMS = econcentration
11if BUILD_QUICKLAUNCH 10if BUILD_QUICKLAUNCH
12bin_PROGRAMS += econcentration_ql 11bin_PROGRAMS += econcentration_ql
13endif 12endif
14 13
15econcentration_LDADD = @ELEMENTARY_LIBS@ @ETROPHY_LIBS@ 14econcentration_LDADD = @ECONCENTRATION_LIBS@
16econcentration_SOURCES = main.c 15econcentration_SOURCES = main.c
17 16
18if BUILD_QUICKLAUNCH 17if BUILD_QUICKLAUNCH
@@ -25,11 +24,11 @@ if BUILD_QUICKLAUNCH
25econcentration_qldir = $(quicklauncher_libdir) 24econcentration_qldir = $(quicklauncher_libdir)
26econcentration_ql_LTLIBRARIES = econcentration_ql.la 25econcentration_ql_LTLIBRARIES = econcentration_ql.la
27econcentration_ql_la_SOURCES = main.c 26econcentration_ql_la_SOURCES = main.c
28econcentration_ql_la_LIBADD = @ELEMENTARY_LIBS@ @ETROPHY_LIBS@ 27econcentration_ql_la_LIBADD = @ECONCENTRATION_LIBS@
29econcentration_ql_la_CFLAGS = 28econcentration_ql_la_CFLAGS =
30econcentration_ql_la_LDFLAGS = -module -avoid-version -no-undefined 29econcentration_ql_la_LDFLAGS = -module -avoid-version -no-undefined
31econcentration_ql_SOURCES = main.c 30econcentration_ql_SOURCES = main.c
32econcentration_ql_LDADD = @ELEMENTARY_LIBS@ @ETROPHY_LIBS@ 31econcentration_ql_LDADD = @ECONCENTRATION_LIBS@
33econcentration_ql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1 32econcentration_ql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
34econcentration_ql_LDFLAGS = 33econcentration_ql_LDFLAGS =
35endif 34endif