summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2013-12-01 16:45:06 +0000
committerJérémy Zurcher <jeremy@asynk.ch>2013-12-01 16:45:06 +0000
commitc18276dcfd9e23545149495511d16872706f7869 (patch)
treeea2358c5d100ba5d110bdb232d9227170d170cf9
parentff86fc7bd7fff94af66d5b758b9e7bf6f7a61bf6 (diff)
app: clean up autofoo var definition and usage
-rw-r--r--app/configure.ac2
-rw-r--r--app/src/Makefile.am1
-rw-r--r--app/src/Makefile_bin.am2
-rw-r--r--app/src/Makefile_lib.am10
4 files changed, 6 insertions, 9 deletions
diff --git a/app/configure.ac b/app/configure.ac
index b00f641..bdb1e24 100644
--- a/app/configure.ac
+++ b/app/configure.ac
@@ -152,7 +152,7 @@ AC_SUBST(ELM_SKEL_BUILD)
152# Dependencies for the library 152# Dependencies for the library
153 153
154requirement_elm_skel="elementary >= 1.7.0 evas >= 1.7.0 ecore-file >= 1.7.0 ecore >= 1.7.0 eet >= 1.7.0 eina >= 1.7.0 ${requirement_elm_skel}" 154requirement_elm_skel="elementary >= 1.7.0 evas >= 1.7.0 ecore-file >= 1.7.0 ecore >= 1.7.0 eet >= 1.7.0 eina >= 1.7.0 ${requirement_elm_skel}"
155PKG_CHECK_MODULES([ELM_SKEL], [ $requirement_elm_skel ]) 155PKG_CHECK_MODULES([EFL], [ $requirement_elm_skel ])
156 156
157AC_SUBST(requirement_elm_skel) 157AC_SUBST(requirement_elm_skel)
158 158
diff --git a/app/src/Makefile.am b/app/src/Makefile.am
index e5cef39..d72716c 100644
--- a/app/src/Makefile.am
+++ b/app/src/Makefile.am
@@ -23,6 +23,7 @@ AM_CPPFLAGS = -I. \
23 -DPACKAGE_BIN_DIR=\"$(bindir)\" \ 23 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
24 -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
25 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 25 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
26 @EFL_CFLAGS@ \
26 @ELM_SKEL_CFLAGS@ \ 27 @ELM_SKEL_CFLAGS@ \
27 @ELM_SKEL_COV_CFLAGS@ 28 @ELM_SKEL_COV_CFLAGS@
28 29
diff --git a/app/src/Makefile_bin.am b/app/src/Makefile_bin.am
index ecd62e4..e1d6f96 100644
--- a/app/src/Makefile_bin.am
+++ b/app/src/Makefile_bin.am
@@ -11,5 +11,5 @@ EXTRA_DIST += bin/app.h
11 11
12bin_elm_skel_LDADD = $(top_builddir)/src/lib/libelm_skel.la 12bin_elm_skel_LDADD = $(top_builddir)/src/lib/libelm_skel.la
13bin_elm_skel_CFLAGS = 13bin_elm_skel_CFLAGS =
14bin_elm_skel_LDFLAGS = $(LTLIBINTL) 14bin_elm_skel_LDFLAGS = @ELM_SKEL_LDFLAGS@ $(LTLIBINTL)
15 15
diff --git a/app/src/Makefile_lib.am b/app/src/Makefile_lib.am
index 90f4df3..5651a4e 100644
--- a/app/src/Makefile_lib.am
+++ b/app/src/Makefile_lib.am
@@ -11,9 +11,9 @@ EXTRA_DIST += lib/lib_private.h
11 11
12lib_LTLIBRARIES += lib/libelm_skel.la 12lib_LTLIBRARIES += lib/libelm_skel.la
13 13
14lib_libelm_skel_la_LIBADD = @ELM_SKEL_LIBS@ @ELM_SKEL_COV_LIBS@ 14lib_libelm_skel_la_LIBADD = @EFL_LIBS@ @ELM_SKEL_COV_LIBS@
15lib_libelm_skel_la_CFLAGS = 15lib_libelm_skel_la_CFLAGS =
16lib_libelm_skel_la_LDFLAGS = @PROJECT_LTLIBRARY_FLAGS@ 16lib_libelm_skel_la_LDFLAGS = @ELM_SKEL_LDFLAGS@ @PROJECT_LTLIBRARY_FLAGS@
17 17
18### Unit tests 18### Unit tests
19 19
@@ -25,11 +25,7 @@ check_PROGRAMS += tests/elm_skel_suite
25tests_elm_skel_suite_SOURCES = \ 25tests_elm_skel_suite_SOURCES = \
26 tests/elm_skel_suite.c 26 tests/elm_skel_suite.c
27 27
28tests_elm_skel_suite_CPPFLAGS = \ 28tests_elm_skel_suite_CFLAGS = @CHECK_CFLAGS@
29 -I$(top_srcdir)/src/lib \
30 @CHECK_CFLAGS@ \
31 @ELM_SKEL_CFLAGS@
32
33tests_elm_skel_suite_LDADD = @CHECK_LIBS@ lib/libelm_skel.la 29tests_elm_skel_suite_LDADD = @CHECK_LIBS@ lib/libelm_skel.la
34tests_elm_skel_suite_DEPENDENCIES = 30tests_elm_skel_suite_DEPENDENCIES =
35 31