summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérémy Zurcher <jeremy@asynk.ch>2013-07-08 16:45:33 +0200
committerJérémy Zurcher <jeremy@asynk.ch>2013-07-08 16:45:33 +0200
commit519d7dc2f6703bb23866ebf60c1c62ed7e238cd3 (patch)
treef9d981e4dd4cb420aa266b4e596b3815feb6785a
parenta7e5e9b4e2155e1fa401d05c96d90e445f91ed2e (diff)
app: replace @ELEMENTARY_…@ with @ELM_SKEL_…@ and clean up Makefile.am
-rw-r--r--app/configure.ac8
-rw-r--r--app/src/bin/Makefile.am23
-rw-r--r--app/src/lib/Makefile.am5
3 files changed, 16 insertions, 20 deletions
diff --git a/app/configure.ac b/app/configure.ac
index 978d5ad..ea41ea8 100644
--- a/app/configure.ac
+++ b/app/configure.ac
@@ -31,9 +31,6 @@ PROJECT_INIT
31AC_CANONICAL_BUILD 31AC_CANONICAL_BUILD
32AC_CANONICAL_HOST 32AC_CANONICAL_HOST
33 33
34EFL_CHECK_COMPILER_FLAGS([ELM_SKEL], [-Wall -Wunused -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections])
35EFL_CHECK_LINKER_FLAGS([ELM_SKEL], [-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
36
37### Additional options to configure 34### Additional options to configure
38 35
39### Checks for programs 36### Checks for programs
@@ -73,7 +70,7 @@ AC_SUBST(ELM_SKEL_BUILD)
73# Dependencies for the library 70# Dependencies for the library
74 71
75requirement_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}" 72requirement_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}"
76PKG_CHECK_MODULES([ELEMENTARY], [ $requirement_elm_skel ]) 73PKG_CHECK_MODULES([ELM_SKEL], [ $requirement_elm_skel ])
77 74
78AC_SUBST(requirement_elm_skel) 75AC_SUBST(requirement_elm_skel)
79 76
@@ -104,6 +101,9 @@ case "$host_os" in
104 ;; 101 ;;
105esac 102esac
106 103
104EFL_CHECK_COMPILER_FLAGS([ELM_SKEL], [-Wall -Wunused -Wextra -Wpointer-arith -Wno-missing-field-initializers -fvisibility=hidden -fdata-sections -ffunction-sections])
105EFL_CHECK_LINKER_FLAGS([ELM_SKEL], [-fvisibility=hidden -fdata-sections -ffunction-sections -Wl,--gc-sections -fno-strict-aliasing -Wl,--as-needed -Wl,--no-copy-dt-needed-entries])
106
107# CPU architecture specific assembly 107# CPU architecture specific assembly
108 108
109### Checks for linker characteristics 109### Checks for linker characteristics
diff --git a/app/src/bin/Makefile.am b/app/src/bin/Makefile.am
index 4030780..e078ec2 100644
--- a/app/src/bin/Makefile.am
+++ b/app/src/bin/Makefile.am
@@ -4,30 +4,27 @@ AM_CPPFLAGS = \
4 -I$(top_srcdir)/src/lib \ 4 -I$(top_srcdir)/src/lib \
5 -DPACKAGE_BIN_DIR=\"$(bindir)\" \ 5 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
6 -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 6 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
7 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" 7 -DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
8 8 @ELM_SKEL_CFLAGS@
9common_ldadd = @ELEMENTARY_LIBS@ @EVIL_LIBS@ $(top_builddir)/src/lib/libelm_skel.la
10common_cflags = @ELM_SKEL_CFLAGS@ @ELEMENTARY_CFLAGS@ @EVIL_CFLAGS@
11common_ldflags = @ELM_SKEL_LDFLAGS@
12 9
13bin_PROGRAMS = elm_skel elm_skel_ql 10bin_PROGRAMS = elm_skel elm_skel_ql
14 11
15elm_skel_SOURCES = \ 12elm_skel_SOURCES = \
16 main.c 13 main.c
17 14
18elm_skel_LDADD = ${common_ldadd} 15elm_skel_LDADD = $(top_builddir)/src/lib/libelm_skel.la
19elm_skel_CFLAGS = ${common_cflags} 16elm_skel_CFLAGS =
20elm_skel_LDFLAGS = ${common_ldflags} 17elm_skel_LDFLAGS =
21 18
22# QuickLaunch 19# QuickLaunch
23elm_skel_ql_LTLIBRARIES = elm_skel_ql.la 20elm_skel_ql_LTLIBRARIES = elm_skel_ql.la
24elm_skel_ql_SOURCES = $(elm_skel_SOURCES) 21elm_skel_ql_SOURCES = $(elm_skel_SOURCES)
25elm_skel_ql_LDADD = ${common_ldadd} 22elm_skel_ql_LDADD = $(top_builddir)/src/lib/libelm_skel.la
26elm_skel_ql_CFLAGS = ${common_cflags} -DELM_LIB_QUICKLAUNCH=1 23elm_skel_ql_CFLAGS = -DELM_LIB_QUICKLAUNCH=1
27elm_skel_ql_LDFLAGS = -module -avoid-version -no-undefined 24elm_skel_ql_LDFLAGS =
28 25
29elm_skel_qldir = $(libdir) 26elm_skel_qldir = $(libdir)
30elm_skel_ql_la_SOURCES = $(elm_skel_SOURCES) 27elm_skel_ql_la_SOURCES = $(elm_skel_SOURCES)
31elm_skel_ql_la_LIBADD = ${common_ldadd} 28elm_skel_ql_la_LIBADD = @ELM_SKEL_LIBS@
32elm_skel_ql_la_CFLAGS = ${common_cflags} 29elm_skel_ql_la_CFLAGS =
33elm_skel_ql_la_LDFLAGS = -module @PROJECT_LTMODULE_FLAGS@ 30elm_skel_ql_la_LDFLAGS = -module @PROJECT_LTMODULE_FLAGS@
diff --git a/app/src/lib/Makefile.am b/app/src/lib/Makefile.am
index baa61d3..db48c18 100644
--- a/app/src/lib/Makefile.am
+++ b/app/src/lib/Makefile.am
@@ -6,8 +6,7 @@ AM_CPPFLAGS = -I. \
6 -DPACKAGE_BIN_DIR=\"$(bindir)\" \ 6 -DPACKAGE_BIN_DIR=\"$(bindir)\" \
7 -DPACKAGE_LIB_DIR=\"$(libdir)\" \ 7 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
8 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 8 -DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \
9 @ELEMENTARY_CFLAGS@ \ 9 @ELM_SKEL_CFLAGS@
10 @EVIL_CFLAGS@
11 10
12includes_HEADERS = elm_skel.h 11includes_HEADERS = elm_skel.h
13includesdir = $(includedir)/elm_skel-@VMAJ@ 12includesdir = $(includedir)/elm_skel-@VMAJ@
@@ -17,7 +16,7 @@ lib_LTLIBRARIES = libelm_skel.la
17libelm_skel_la_SOURCES = \ 16libelm_skel_la_SOURCES = \
18 elm_skel.c 17 elm_skel.c
19 18
20libelm_skel_la_LIBADD = @ELEMENTARY_LIBS@ @EVIL_LIBS@ 19libelm_skel_la_LIBADD = @ELM_SKEL_LIBS@
21libelm_skel_la_CFLAGS = 20libelm_skel_la_CFLAGS =
22libelm_skel_la_LDFLAGS = @PROJECT_LTLIBRARY_FLAGS@ 21libelm_skel_la_LDFLAGS = @PROJECT_LTLIBRARY_FLAGS@
23 22