summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorVincent Torri <vincent dot torri at gmail dot com>2014-08-29 19:05:30 +0200
committerTom Hacohen <tom@stosb.com>2014-09-02 10:29:50 +0100
commit2a1bc688a94583af71ce44a3db0b1d403590b23d (patch)
tree7f9a9de26698fe69e300f62e1038aa194d857942 /src
parentc707a638d365f401d0f1063fa8eb738d35c44089 (diff)
Reorganise configure.ac layout (and simplify)
This includes: Bumping versions of autoconf and automake. Remove or replace deprecated macros. Use correct paths.
Diffstat (limited to 'src')
-rw-r--r--src/bin/Makefile.am5
-rw-r--r--src/edje_externals/Makefile.am3
-rw-r--r--src/lib/Makefile.am11
-rw-r--r--src/modules/access_output/Makefile.am7
-rw-r--r--src/modules/datetime_input_ctxpopup/Makefile.am5
-rw-r--r--src/modules/prefs/Makefile.am9
-rw-r--r--src/modules/test_entry/Makefile.am7
-rw-r--r--src/modules/test_map/Makefile.am5
-rw-r--r--src/tests/Makefile.am6
9 files changed, 23 insertions, 35 deletions
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index f4f6e4600..b86dc2db6 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -9,7 +9,7 @@ AM_CPPFLAGS = \
9-I$(top_srcdir)/src/bin \ 9-I$(top_srcdir)/src/bin \
10-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 10-DPACKAGE_BIN_DIR=\"$(bindir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 12-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
13@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
14@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
15@ELEMENTARY_FB_CFLAGS@ \ 15@ELEMENTARY_FB_CFLAGS@ \
@@ -20,8 +20,7 @@ AM_CPPFLAGS = \
20@ELEMENTARY_WEB_CFLAGS@ \ 20@ELEMENTARY_WEB_CFLAGS@ \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ \ 22@ELEMENTARY_WAYLAND_CFLAGS@ \
23@ELEMENTARY_DRM_CFLAGS@ \ 23@ELEMENTARY_DRM_CFLAGS@
24@EVIL_CFLAGS@
25 24
26bin_PROGRAMS = \ 25bin_PROGRAMS = \
27@ELEMENTARY_TEST_PRG@ \ 26@ELEMENTARY_TEST_PRG@ \
diff --git a/src/edje_externals/Makefile.am b/src/edje_externals/Makefile.am
index ab4d73b4b..8357b73ee 100644
--- a/src/edje_externals/Makefile.am
+++ b/src/edje_externals/Makefile.am
@@ -17,8 +17,7 @@ AM_CPPFLAGS = \
17@ELEMENTARY_EMAP_CFLAGS@ \ 17@ELEMENTARY_EMAP_CFLAGS@ \
18@ELEMENTARY_WEB_CFLAGS@ \ 18@ELEMENTARY_WEB_CFLAGS@ \
19@ELEMENTARY_WAYLAND_CFLAGS@ \ 19@ELEMENTARY_WAYLAND_CFLAGS@ \
20@ELEMENTARY_DRM_CFLAGS@ \ 20@ELEMENTARY_DRM_CFLAGS@
21@EVIL_CFLAGS@
22 21
23if ELEMENTARY_WINDOWS_BUILD 22if ELEMENTARY_WINDOWS_BUILD
24AM_CPPFLAGS += -DELEMENTARY_BUILD 23AM_CPPFLAGS += -DELEMENTARY_BUILD
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 337e14c7c..4b4ca848b 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -18,10 +18,10 @@ AM_CPPFLAGS = \
18-I$(top_srcdir)/src/imported \ 18-I$(top_srcdir)/src/imported \
19-I$(top_srcdir)/src/lib \ 19-I$(top_srcdir)/src/lib \
20-I$(top_builddir)/src/lib \ 20-I$(top_builddir)/src/lib \
21-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 21-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
22-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 22-DLOCALE_DIR=\"$(localedir)\" \
23-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 23-DPACKAGE_LIB_DIR=\"$(libdir)\" \
24-DICON_DIR=\"$(elementary_icon_dir)\" \ 24-DICON_DIR=\"$(datadir)/icons\" \
25@ELEMENTARY_CFLAGS@ \ 25@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 26@ELEMENTARY_X_CFLAGS@ \
27@ELEMENTARY_FB_CFLAGS@ \ 27@ELEMENTARY_FB_CFLAGS@ \
@@ -32,8 +32,7 @@ AM_CPPFLAGS = \
32@ELEMENTARY_WEB_CFLAGS@ \ 32@ELEMENTARY_WEB_CFLAGS@ \
33@ELEMENTARY_EMAP_CFLAGS@ \ 33@ELEMENTARY_EMAP_CFLAGS@ \
34@ELEMENTARY_WAYLAND_CFLAGS@ \ 34@ELEMENTARY_WAYLAND_CFLAGS@ \
35@ELEMENTARY_DRM_CFLAGS@ \ 35@ELEMENTARY_DRM_CFLAGS@
36@EVIL_CFLAGS@
37 36
38if ELEMENTARY_WINDOWS_BUILD 37if ELEMENTARY_WINDOWS_BUILD
39AM_CPPFLAGS += -DELEMENTARY_BUILD 38AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -514,7 +513,6 @@ elu_ews_wm.c
514libelementary_la_CFLAGS = 513libelementary_la_CFLAGS =
515libelementary_la_LIBADD = \ 514libelementary_la_LIBADD = \
516@my_libs@ \ 515@my_libs@ \
517@dlopen_libs@ \
518@ELEMENTARY_LIBS@ \ 516@ELEMENTARY_LIBS@ \
519@ELEMENTARY_X_LIBS@ \ 517@ELEMENTARY_X_LIBS@ \
520@ELEMENTARY_FB_LIBS@ \ 518@ELEMENTARY_FB_LIBS@ \
@@ -525,7 +523,6 @@ libelementary_la_LIBADD = \
525@ELEMENTARY_EMAP_LIBS@ \ 523@ELEMENTARY_EMAP_LIBS@ \
526@ELEMENTARY_WAYLAND_LIBS@ \ 524@ELEMENTARY_WAYLAND_LIBS@ \
527@ELEMENTARY_DRM_LIBS@ \ 525@ELEMENTARY_DRM_LIBS@ \
528@EVIL_LIBS@ \
529@LTLIBINTL@ 526@LTLIBINTL@
530 527
531libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ 528libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
diff --git a/src/modules/access_output/Makefile.am b/src/modules/access_output/Makefile.am
index 06b940f38..72906902e 100644
--- a/src/modules/access_output/Makefile.am
+++ b/src/modules/access_output/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12@ELEMENTARY_CFLAGS@ \ 12@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
18@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ \ 20@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ \ 21@ELEMENTARY_WAYLAND_CFLAGS@
22@EVIL_CFLAGS@
23 22
24if ELEMENTARY_WINDOWS_BUILD 23if ELEMENTARY_WINDOWS_BUILD
25AM_CPPFLAGS += -DELEMENTARY_BUILD 24AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -30,6 +29,6 @@ pkg_LTLIBRARIES = module.la
30 29
31module_la_SOURCES = mod.c 30module_la_SOURCES = mod.c
32 31
33module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 32module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
34module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 33module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
35module_la_LIBTOOLFLAGS = --tag=disable-static 34module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/datetime_input_ctxpopup/Makefile.am b/src/modules/datetime_input_ctxpopup/Makefile.am
index ddbc4cc18..3fe00e2b1 100644
--- a/src/modules/datetime_input_ctxpopup/Makefile.am
+++ b/src/modules/datetime_input_ctxpopup/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
8-I$(top_srcdir) \ 8-I$(top_srcdir) \
9-I$(top_srcdir)/src/lib \ 9-I$(top_srcdir)/src/lib \
10-I$(top_builddir)/src/lib \ 10-I$(top_builddir)/src/lib \
11-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 11-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
12-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 12-DPACKAGE_LIB_DIR=\"$(libdir)\" \
13@ELEMENTARY_CFLAGS@ \ 13@ELEMENTARY_CFLAGS@ \
14@ELEMENTARY_X_CFLAGS@ \ 14@ELEMENTARY_X_CFLAGS@ \
@@ -21,8 +21,7 @@ AM_CPPFLAGS = \
21@ELEMENTARY_EMAP_CFLAGS@ \ 21@ELEMENTARY_EMAP_CFLAGS@ \
22@ELEMENTARY_WAYLAND_CFLAGS@ \ 22@ELEMENTARY_WAYLAND_CFLAGS@ \
23@ELEMENTARY_EMAP_CFLAGS@ \ 23@ELEMENTARY_EMAP_CFLAGS@ \
24@ELEMENTARY_DRM_CFLAGS@ \ 24@ELEMENTARY_DRM_CFLAGS@
25@EVIL_CFLAGS@
26 25
27if ELEMENTARY_WINDOWS_BUILD 26if ELEMENTARY_WINDOWS_BUILD
28AM_CPPFLAGS += -DELEMENTARY_BUILD 27AM_CPPFLAGS += -DELEMENTARY_BUILD
diff --git a/src/modules/prefs/Makefile.am b/src/modules/prefs/Makefile.am
index 023ddf4e2..d53f1d2e7 100644
--- a/src/modules/prefs/Makefile.am
+++ b/src/modules/prefs/Makefile.am
@@ -19,8 +19,8 @@ AM_CPPFLAGS = \
19-I$(top_srcdir) \ 19-I$(top_srcdir) \
20-I$(top_srcdir)/src/lib \ 20-I$(top_srcdir)/src/lib \
21-I$(top_builddir)/src/lib \ 21-I$(top_builddir)/src/lib \
22-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 22-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
23-DLOCALE_DIR=\"@LOCALE_DIR@\" \ 23-DLOCALE_DIR=\"$(localedir)\" \
24-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 24-DPACKAGE_LIB_DIR=\"$(libdir)\" \
25@ELEMENTARY_CFLAGS@ \ 25@ELEMENTARY_CFLAGS@ \
26@ELEMENTARY_X_CFLAGS@ \ 26@ELEMENTARY_X_CFLAGS@ \
@@ -30,8 +30,7 @@ AM_CPPFLAGS = \
30@ELEMENTARY_ELOCATION_CFLAGS@ \ 30@ELEMENTARY_ELOCATION_CFLAGS@ \
31@ELEMENTARY_WEB_CFLAGS@ \ 31@ELEMENTARY_WEB_CFLAGS@ \
32@ELEMENTARY_EMAP_CFLAGS@ \ 32@ELEMENTARY_EMAP_CFLAGS@ \
33@ELEMENTARY_WAYLAND_CFLAGS@ \ 33@ELEMENTARY_WAYLAND_CFLAGS@
34@EVIL_CFLAGS@
35 34
36if ELEMENTARY_WINDOWS_BUILD 35if ELEMENTARY_WINDOWS_BUILD
37AM_CPPFLAGS += -DELEMENTARY_BUILD 36AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -59,7 +58,7 @@ elm_horizontal_box.c \
59elm_vertical_frame.c \ 58elm_vertical_frame.c \
60elm_horizontal_frame.c 59elm_horizontal_frame.c
61 60
62module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 61module_la_LIBADD = @ELEMENTARY_LIBS@ $(top_builddir)/src/lib/libelementary.la
63module_la_LDFLAGS = -no-undefined -module -avoid-version 62module_la_LDFLAGS = -no-undefined -module -avoid-version
64module_la_LIBTOOLFLAGS = --tag=disable-static 63module_la_LIBTOOLFLAGS = --tag=disable-static
65 64
diff --git a/src/modules/test_entry/Makefile.am b/src/modules/test_entry/Makefile.am
index 7eec5a94b..bf191b8ab 100644
--- a/src/modules/test_entry/Makefile.am
+++ b/src/modules/test_entry/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12@ELEMENTARY_CFLAGS@ \ 12@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
18@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ \ 20@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ \ 21@ELEMENTARY_WAYLAND_CFLAGS@
22@EVIL_CFLAGS@
23 22
24if ELEMENTARY_WINDOWS_BUILD 23if ELEMENTARY_WINDOWS_BUILD
25AM_CPPFLAGS += -DELEMENTARY_BUILD 24AM_CPPFLAGS += -DELEMENTARY_BUILD
@@ -30,6 +29,6 @@ pkg_LTLIBRARIES = module.la
30 29
31module_la_SOURCES = mod.c 30module_la_SOURCES = mod.c
32 31
33module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la @EVIL_LIBS@ 32module_la_LIBADD = $(top_builddir)/src/lib/libelementary.la
34module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@ 33module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
35module_la_LIBTOOLFLAGS = --tag=disable-static 34module_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/test_map/Makefile.am b/src/modules/test_map/Makefile.am
index 6d2565991..260cd59f3 100644
--- a/src/modules/test_map/Makefile.am
+++ b/src/modules/test_map/Makefile.am
@@ -7,7 +7,7 @@ AM_CPPFLAGS = \
7-I$(top_srcdir) \ 7-I$(top_srcdir) \
8-I$(top_srcdir)/src/lib \ 8-I$(top_srcdir)/src/lib \
9-I$(top_builddir)/src/lib \ 9-I$(top_builddir)/src/lib \
10-DPACKAGE_DATA_DIR=\"$(datadir)/$(PACKAGE)\" \ 10-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
11-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 11-DPACKAGE_LIB_DIR=\"$(libdir)\" \
12@ELEMENTARY_CFLAGS@ \ 12@ELEMENTARY_CFLAGS@ \
13@ELEMENTARY_X_CFLAGS@ \ 13@ELEMENTARY_X_CFLAGS@ \
@@ -18,8 +18,7 @@ AM_CPPFLAGS = \
18@ELEMENTARY_EWEATHER_CFLAGS@ \ 18@ELEMENTARY_EWEATHER_CFLAGS@ \
19@ELEMENTARY_WEB_CFLAGS@ \ 19@ELEMENTARY_WEB_CFLAGS@ \
20@ELEMENTARY_EMAP_CFLAGS@ \ 20@ELEMENTARY_EMAP_CFLAGS@ \
21@ELEMENTARY_WAYLAND_CFLAGS@ \ 21@ELEMENTARY_WAYLAND_CFLAGS@
22@EVIL_CFLAGS@
23 22
24if ELEMENTARY_WINDOWS_BUILD 23if ELEMENTARY_WINDOWS_BUILD
25AM_CPPFLAGS += -DELEMENTARY_BUILD 24AM_CPPFLAGS += -DELEMENTARY_BUILD
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 4766a3134..6c97ce634 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -88,8 +88,7 @@ elm_suite_CPPFLAGS = \
88 @ELEMENTARY_EWEATHER_CFLAGS@ \ 88 @ELEMENTARY_EWEATHER_CFLAGS@ \
89 @ELEMENTARY_WEB_CFLAGS@ \ 89 @ELEMENTARY_WEB_CFLAGS@ \
90 @ELEMENTARY_EMAP_CFLAGS@ \ 90 @ELEMENTARY_EMAP_CFLAGS@ \
91 @ELEMENTARY_WAYLAND_CFLAGS@ \ 91 @ELEMENTARY_WAYLAND_CFLAGS@
92 @EVIL_CFLAGS@
93 92
94elm_suite_LDADD = \ 93elm_suite_LDADD = \
95 $(top_builddir)/src/lib/libelementary.la \ 94 $(top_builddir)/src/lib/libelementary.la \
@@ -121,8 +120,7 @@ elm_cxx_suite_CPPFLAGS = \
121 @ELEMENTARY_EWEATHER_CFLAGS@ \ 120 @ELEMENTARY_EWEATHER_CFLAGS@ \
122 @ELEMENTARY_WEB_CFLAGS@ \ 121 @ELEMENTARY_WEB_CFLAGS@ \
123 @ELEMENTARY_EMAP_CFLAGS@ \ 122 @ELEMENTARY_EMAP_CFLAGS@ \
124 @ELEMENTARY_WAYLAND_CFLAGS@ \ 123 @ELEMENTARY_WAYLAND_CFLAGS@
125 @EVIL_CFLAGS@
126 124
127elm_cxx_suite_LDADD = \ 125elm_cxx_suite_LDADD = \
128 $(top_builddir)/src/lib/libelementary.la \ 126 $(top_builddir)/src/lib/libelementary.la \