summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2011-04-27 16:15:15 +0000
committerVincent Torri <vincent.torri@gmail.com>2011-04-27 16:15:15 +0000
commitfe99f9b5028b3d37ca78db2e2bcb8a18a7a862a1 (patch)
treefa3859f73f148d2ceb050af82a52c0e96a421cc2
parentd1a5e930dfca34444befa096ee17ee5755674cb4 (diff)
do not enter the modules dir if they are not built
SVN revision: 58970
-rw-r--r--src/modules/mp/Makefile.am55
-rw-r--r--src/modules/mp/buddy/Makefile.am6
-rw-r--r--src/modules/mp/chained_pool/Makefile.am6
-rw-r--r--src/modules/mp/ememoa_fixed/Makefile.am12
-rw-r--r--src/modules/mp/ememoa_unknown/Makefile.am12
-rw-r--r--src/modules/mp/fixed_bitmap/Makefile.am8
-rw-r--r--src/modules/mp/one_big/Makefile.am6
-rw-r--r--src/modules/mp/pass_through/Makefile.am9
8 files changed, 53 insertions, 61 deletions
diff --git a/src/modules/mp/Makefile.am b/src/modules/mp/Makefile.am
index 2d7f8d0..435d57a 100644
--- a/src/modules/mp/Makefile.am
+++ b/src/modules/mp/Makefile.am
@@ -1,10 +1,45 @@
1SUBDIRS = chained_pool \ 1MAINTAINERCLEANFILES = Makefile.in
2 ememoa_fixed \ 2
3 pass_through \ 3SUBDIRS =
4 ememoa_unknown \ 4
5 fixed_bitmap \ 5if EINA_BUILD_BUDDY
6 buddy \ 6if !EINA_STATIC_BUILD_BUDDY
7 one_big 7SUBDIRS += buddy
8 8endif
9MAINTAINERCLEANFILES = \ 9endif
10Makefile.in 10
11if EINA_BUILD_CHAINED_POOL
12if !EINA_STATIC_BUILD_CHAINED_POOL
13SUBDIRS += chained_pool
14endif
15endif
16
17if EINA_BUILD_EMEMOA_FIXED
18if !EINA_STATIC_BUILD_EMEMOA_FIXED
19SUBDIRS += ememoa_fixed
20endif
21endif
22
23if EINA_BUILD_EMEMOA_UNKNOWN
24if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
25SUBDIRS += ememoa_unknown
26endif
27endif
28
29if EINA_BUILD_FIXED_BITMAP
30if !EINA_STATIC_BUILD_FIXED_BITMAP
31SUBDIRS += fixed_bitmap
32endif
33endif
34
35if EINA_BUILD_ONE_BIG
36if !EINA_STATIC_BUILD_ONE_BIG
37SUBDIRS += one_big
38endif
39endif
40
41if EINA_BUILD_PASS_THROUGH
42if !EINA_STATIC_BUILD_PASS_THROUGH
43SUBDIRS += pass_through
44endif
45endif
diff --git a/src/modules/mp/buddy/Makefile.am b/src/modules/mp/buddy/Makefile.am
index 0bb5ef6..c699c9d 100644
--- a/src/modules/mp/buddy/Makefile.am
+++ b/src/modules/mp/buddy/Makefile.am
@@ -9,9 +9,6 @@ AM_CPPFLAGS = \
9@EINA_CPPFLAGS@ \ 9@EINA_CPPFLAGS@ \
10@EFL_EINA_BUILD@ 10@EFL_EINA_BUILD@
11 11
12if EINA_BUILD_BUDDY
13if !EINA_STATIC_BUILD_BUDDY
14
15controllerdir = $(libdir)/eina/modules/mp/buddy/$(MODULE_ARCH) 12controllerdir = $(libdir)/eina/modules/mp/buddy/$(MODULE_ARCH)
16controller_LTLIBRARIES = module.la 13controller_LTLIBRARIES = module.la
17 14
@@ -28,8 +25,5 @@ install-data-hook:
28uninstall-hook: 25uninstall-hook:
29 rm -f $(DESTDIR)$(controllerdir)/module.* 26 rm -f $(DESTDIR)$(controllerdir)/module.*
30 27
31endif
32endif
33
34clean-local: 28clean-local:
35 rm -rf *.gcno 29 rm -rf *.gcno
diff --git a/src/modules/mp/chained_pool/Makefile.am b/src/modules/mp/chained_pool/Makefile.am
index bc52ac3..815bab7 100644
--- a/src/modules/mp/chained_pool/Makefile.am
+++ b/src/modules/mp/chained_pool/Makefile.am
@@ -10,9 +10,6 @@ AM_CPPFLAGS = \
10@EFL_EINA_BUILD@ \ 10@EFL_EINA_BUILD@ \
11@VALGRIND_CFLAGS@ 11@VALGRIND_CFLAGS@
12 12
13if EINA_BUILD_CHAINED_POOL
14if !EINA_STATIC_BUILD_CHAINED_POOL
15
16controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) 13controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH)
17controller_LTLIBRARIES = module.la 14controller_LTLIBRARIES = module.la
18 15
@@ -29,8 +26,5 @@ install-data-hook:
29uninstall-hook: 26uninstall-hook:
30 rm -f $(DESTDIR)$(controllerdir)/module.* 27 rm -f $(DESTDIR)$(controllerdir)/module.*
31 28
32endif
33endif
34
35clean-local: 29clean-local:
36 rm -rf *.gcno 30 rm -rf *.gcno
diff --git a/src/modules/mp/ememoa_fixed/Makefile.am b/src/modules/mp/ememoa_fixed/Makefile.am
index 22cae36..4a27b3e 100644
--- a/src/modules/mp/ememoa_fixed/Makefile.am
+++ b/src/modules/mp/ememoa_fixed/Makefile.am
@@ -7,21 +7,18 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib \ 7-I$(top_srcdir)/src/lib \
8-I$(top_builddir)/src/lib \ 8-I$(top_builddir)/src/lib \
9@EINA_CPPFLAGS@ \ 9@EINA_CPPFLAGS@ \
10@EINA_CFLAGS@ \
11@EMEMOA_CFLAGS@ \ 10@EMEMOA_CFLAGS@ \
12@EFL_EINA_BUILD@ 11@EFL_EINA_BUILD@
13 12
14if EINA_BUILD_EMEMOA_FIXED
15if !EINA_STATIC_BUILD_EMEMOA_FIXED
16
17controllerdir = $(libdir)/eina/modules/mp/ememoa_fixed/$(MODULE_ARCH) 13controllerdir = $(libdir)/eina/modules/mp/ememoa_fixed/$(MODULE_ARCH)
18controller_LTLIBRARIES = module.la 14controller_LTLIBRARIES = module.la
19 15
20module_la_SOURCES = \ 16module_la_SOURCES = \
21eina_ememoa_fixed.c 17eina_ememoa_fixed.c
22 18
23module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ @EMEMOA_LIBS@ 19module_la_CFLAGS = @EINA_CFLAGS@
24module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 20module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@
21module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 22module_la_LIBTOOLFLAGS = --tag=disable-static
26 23
27install-data-hook: 24install-data-hook:
@@ -29,8 +26,5 @@ install-data-hook:
29uninstall-hook: 26uninstall-hook:
30 rm -f $(DESTDIR)$(controllerdir)/module.* 27 rm -f $(DESTDIR)$(controllerdir)/module.*
31 28
32endif
33endif
34
35clean-local: 29clean-local:
36 rm -rf *.gcno 30 rm -rf *.gcno
diff --git a/src/modules/mp/ememoa_unknown/Makefile.am b/src/modules/mp/ememoa_unknown/Makefile.am
index bbc846b..2814e31 100644
--- a/src/modules/mp/ememoa_unknown/Makefile.am
+++ b/src/modules/mp/ememoa_unknown/Makefile.am
@@ -7,21 +7,18 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib \ 7-I$(top_srcdir)/src/lib \
8-I$(top_builddir)/src/lib \ 8-I$(top_builddir)/src/lib \
9@EINA_CPPFLAGS@ \ 9@EINA_CPPFLAGS@ \
10@EINA_CFLAGS@ \
11@EMEMOA_CFLAGS@ \ 10@EMEMOA_CFLAGS@ \
12@EFL_EINA_BUILD@ 11@EFL_EINA_BUILD@
13 12
14if EINA_BUILD_EMEMOA_UNKNOWN
15if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN
16
17controllerdir = $(libdir)/eina/modules/mp/ememoa_unknown/$(MODULE_ARCH) 13controllerdir = $(libdir)/eina/modules/mp/ememoa_unknown/$(MODULE_ARCH)
18controller_LTLIBRARIES = module.la 14controller_LTLIBRARIES = module.la
19 15
20module_la_SOURCES = \ 16module_la_SOURCES = \
21eina_ememoa_unknown.c 17eina_ememoa_unknown.c
22 18
23module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@ 19module_la_CFLAGS = @EINA_CFLAGS@
24module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 20module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@
21module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
25module_la_LIBTOOLFLAGS = --tag=disable-static 22module_la_LIBTOOLFLAGS = --tag=disable-static
26 23
27install-data-hook: 24install-data-hook:
@@ -29,8 +26,5 @@ install-data-hook:
29uninstall-hook: 26uninstall-hook:
30 rm -f $(DESTDIR)$(controllerdir)/module.* 27 rm -f $(DESTDIR)$(controllerdir)/module.*
31 28
32endif
33endif
34
35clean-local: 29clean-local:
36 rm -rf *.gcno 30 rm -rf *.gcno
diff --git a/src/modules/mp/fixed_bitmap/Makefile.am b/src/modules/mp/fixed_bitmap/Makefile.am
index e943ac7..caf239e 100644
--- a/src/modules/mp/fixed_bitmap/Makefile.am
+++ b/src/modules/mp/fixed_bitmap/Makefile.am
@@ -7,18 +7,15 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib \ 7-I$(top_srcdir)/src/lib \
8-I$(top_builddir)/src/lib \ 8-I$(top_builddir)/src/lib \
9@EINA_CPPFLAGS@ \ 9@EINA_CPPFLAGS@ \
10@EINA_CFLAGS@ \
11@EFL_EINA_BUILD@ 10@EFL_EINA_BUILD@
12 11
13if EINA_BUILD_FIXED_BITMAP
14if !EINA_STATIC_BUILD_FIXED_BITMAP
15
16controllerdir = $(libdir)/eina/modules/mp/fixed_bitmap/$(MODULE_ARCH) 12controllerdir = $(libdir)/eina/modules/mp/fixed_bitmap/$(MODULE_ARCH)
17controller_LTLIBRARIES = module.la 13controller_LTLIBRARIES = module.la
18 14
19module_la_SOURCES = \ 15module_la_SOURCES = \
20eina_fixed_bitmap.c 16eina_fixed_bitmap.c
21 17
18module_la_CFLAGS = @EINA_CFLAGS@
22module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ 19module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
23module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 20module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
24module_la_LIBTOOLFLAGS = --tag=disable-static 21module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -28,8 +25,5 @@ install-data-hook:
28uninstall-hook: 25uninstall-hook:
29 rm -f $(DESTDIR)$(controllerdir)/module.* 26 rm -f $(DESTDIR)$(controllerdir)/module.*
30 27
31endif
32endif
33
34clean-local: 28clean-local:
35 rm -rf *.gcno 29 rm -rf *.gcno
diff --git a/src/modules/mp/one_big/Makefile.am b/src/modules/mp/one_big/Makefile.am
index 7d66dbd..8ca1a62 100644
--- a/src/modules/mp/one_big/Makefile.am
+++ b/src/modules/mp/one_big/Makefile.am
@@ -10,9 +10,6 @@ AM_CPPFLAGS = \
10@EFL_EINA_BUILD@ \ 10@EFL_EINA_BUILD@ \
11@VALGRIND_CFLAGS@ 11@VALGRIND_CFLAGS@
12 12
13if EINA_BUILD_ONE_BIG
14if !EINA_STATIC_BUILD_ONE_BIG
15
16controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH) 13controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH)
17controller_LTLIBRARIES = module.la 14controller_LTLIBRARIES = module.la
18 15
@@ -29,8 +26,5 @@ install-data-hook:
29uninstall-hook: 26uninstall-hook:
30 rm -f $(DESTDIR)$(controllerdir)/module.* 27 rm -f $(DESTDIR)$(controllerdir)/module.*
31 28
32endif
33endif
34
35clean-local: 29clean-local:
36 rm -rf *.gcno 30 rm -rf *.gcno
diff --git a/src/modules/mp/pass_through/Makefile.am b/src/modules/mp/pass_through/Makefile.am
index 7e0438d..8f48974 100644
--- a/src/modules/mp/pass_through/Makefile.am
+++ b/src/modules/mp/pass_through/Makefile.am
@@ -7,18 +7,15 @@ AM_CPPFLAGS = \
7-I$(top_srcdir)/src/lib \ 7-I$(top_srcdir)/src/lib \
8-I$(top_builddir)/src/lib \ 8-I$(top_builddir)/src/lib \
9@EINA_CPPFLAGS@ \ 9@EINA_CPPFLAGS@ \
10@EINA_CFLAGS@ \
11@EFL_EINA_BUILD@ 10@EFL_EINA_BUILD@
12 11
13if EINA_BUILD_PASS_THROUGH
14if !EINA_STATIC_BUILD_PASS_THROUGH
15
16controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH) 12controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH)
17controller_LTLIBRARIES = module.la 13controller_LTLIBRARIES = module.la
18 14
19module_la_SOURCES = \ 15module_la_SOURCES = \
20eina_pass_through.c 16eina_pass_through.c
21 17
18module_la_CFLAGS = @EINA_CFLAGS@
22module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ 19module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@
23module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version 20module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version
24module_la_LIBTOOLFLAGS = --tag=disable-static 21module_la_LIBTOOLFLAGS = --tag=disable-static
@@ -28,9 +25,5 @@ install-data-hook:
28uninstall-hook: 25uninstall-hook:
29 rm -f $(DESTDIR)$(controllerdir)/module.* 26 rm -f $(DESTDIR)$(controllerdir)/module.*
30 27
31endif
32endif
33
34clean-local: 28clean-local:
35 rm -rf *.gcno 29 rm -rf *.gcno
36