summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2014-02-07 14:41:56 +0100
committerJérémy Zurcher <jeremy@asynk.ch>2014-02-07 14:41:56 +0100
commitc3db0e00963586c0b06f04a01bb70a87f1577f9a (patch)
tree6ae84aa7e0f51072098614b4b93e25a45ae45a55
parent9600df729fc6fc555405467a41325cfd8adace3f (diff)
PKG_CHECK_MODULES EFL instead of SKELETON
-rw-r--r--configure.ac2
-rw-r--r--src/bin/Makefile.am4
-rw-r--r--src/lib/Makefile.am6
-rw-r--r--src/tests/Makefile.am2
4 files changed, 7 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac
index 66e6a88..402e811 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@ EFL_COMPILER_FLAG([-W])
30EFL_CHECK_PATH_MAX 30EFL_CHECK_PATH_MAX
31 31
32# Check for EFL 32# Check for EFL
33PKG_CHECK_MODULES([SKELETON], 33PKG_CHECK_MODULES([EFL],
34[ 34[
35 eina >= 1.8.0 35 eina >= 1.8.0
36 evas >= 1.8.0 36 evas >= 1.8.0
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index a4f97af..fefaf8a 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,10 +7,10 @@ AM_CPPFLAGS = -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
7-I$(top_srcdir)/src/bin/ \ 7-I$(top_srcdir)/src/bin/ \
8-I$(top_builddir)/src/lib/ \ 8-I$(top_builddir)/src/lib/ \
9-I$(top_srcdir)/src/lib/ \ 9-I$(top_srcdir)/src/lib/ \
10@SKELETON_CFLAGS@ 10@EFL_CFLAGS@
11 11
12skeleton_SOURCES = skeleton_main.c 12skeleton_SOURCES = skeleton_main.c
13skeleton_LDADD = @SKELETON_LIBS@ $(top_builddir)/src/lib/libskeleton.la 13skeleton_LDADD = @EFL_LIBS@ $(top_builddir)/src/lib/libskeleton.la
14 14
15localedir = $(datadir)/locale 15localedir = $(datadir)/locale
16DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ 16DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index fc1f0bb..e91dcf7 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -5,8 +5,8 @@ AM_CPPFLAGS = \
5-I$(top_builddir)/src/lib \ 5-I$(top_builddir)/src/lib \
6-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 6-DPACKAGE_LIB_DIR=\"$(libdir)\" \
7-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 7-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
8@SKELETON_CFLAGS@ \ 8@EFL_CFLAGS@ \
9-DEFL_SKELETON_BUILD 9-DEFL_EFL_BUILD
10 10
11lib_LTLIBRARIES = libskeleton.la 11lib_LTLIBRARIES = libskeleton.la
12 12
@@ -14,5 +14,5 @@ includes_HEADERS = Skeleton.h
14includesdir = $(includedir)/skeleton-@VMAJ@ 14includesdir = $(includedir)/skeleton-@VMAJ@
15 15
16libskeleton_la_SOURCES = skeleton.c 16libskeleton_la_SOURCES = skeleton.c
17libskeleton_la_LIBADD = @SKELETON_LIBS@ -lm 17libskeleton_la_LIBADD = @EFL_LIBS@ -lm
18libskeleton_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 18libskeleton_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 2cb4e1d..e8d5e2c 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -7,7 +7,7 @@ skeleton_tests_SOURCES = test_skeleton.c
7skeleton_tests_CPPFLAGS = -I$(top_builddir)/src/lib/ \ 7skeleton_tests_CPPFLAGS = -I$(top_builddir)/src/lib/ \
8-DPACKAGE_TESTS_DIR=\"$(top_srcdir)/src/tests/\" \ 8-DPACKAGE_TESTS_DIR=\"$(top_srcdir)/src/tests/\" \
9-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/\" \ 9-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/src/tests/\" \
10@SKELETON_CFLAGS@ \ 10@EFL_CFLAGS@ \
11@CHECK_CFLAGS@ 11@CHECK_CFLAGS@
12skeleton_tests_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libskeleton.la 12skeleton_tests_LDADD = @CHECK_LIBS@ $(top_builddir)/src/lib/libskeleton.la
13skeleton_tests_DEPENDENCIES = $(top_builddir)/src/lib/libskeleton.la 13skeleton_tests_DEPENDENCIES = $(top_builddir)/src/lib/libskeleton.la