summaryrefslogtreecommitdiff
path: root/src/modules
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/modules
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/modules')
-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
5 files changed, 14 insertions, 19 deletions
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