From 4f484b58f5bd5d3b9d21c55077bab457e0402056 Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 27 Apr 2011 16:15:41 +0000 Subject: [PATCH] do not enter the modules dir if they are not built SVN revision: 58971 --- legacy/eina/src/modules/mp/Makefile.am | 55 ++++++++++++++++++---- legacy/eina/src/modules/mp/buddy/Makefile.am | 6 --- .../eina/src/modules/mp/chained_pool/Makefile.am | 6 --- .../eina/src/modules/mp/ememoa_fixed/Makefile.am | 12 ++--- .../eina/src/modules/mp/ememoa_unknown/Makefile.am | 12 ++--- .../eina/src/modules/mp/fixed_bitmap/Makefile.am | 8 +--- legacy/eina/src/modules/mp/one_big/Makefile.am | 6 --- .../eina/src/modules/mp/pass_through/Makefile.am | 9 +--- 8 files changed, 53 insertions(+), 61 deletions(-) diff --git a/legacy/eina/src/modules/mp/Makefile.am b/legacy/eina/src/modules/mp/Makefile.am index 2d7f8d0..435d57a 100644 --- a/legacy/eina/src/modules/mp/Makefile.am +++ b/legacy/eina/src/modules/mp/Makefile.am @@ -1,10 +1,45 @@ -SUBDIRS = chained_pool \ - ememoa_fixed \ - pass_through \ - ememoa_unknown \ - fixed_bitmap \ - buddy \ - one_big - -MAINTAINERCLEANFILES = \ -Makefile.in +MAINTAINERCLEANFILES = Makefile.in + +SUBDIRS = + +if EINA_BUILD_BUDDY +if !EINA_STATIC_BUILD_BUDDY +SUBDIRS += buddy +endif +endif + +if EINA_BUILD_CHAINED_POOL +if !EINA_STATIC_BUILD_CHAINED_POOL +SUBDIRS += chained_pool +endif +endif + +if EINA_BUILD_EMEMOA_FIXED +if !EINA_STATIC_BUILD_EMEMOA_FIXED +SUBDIRS += ememoa_fixed +endif +endif + +if EINA_BUILD_EMEMOA_UNKNOWN +if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN +SUBDIRS += ememoa_unknown +endif +endif + +if EINA_BUILD_FIXED_BITMAP +if !EINA_STATIC_BUILD_FIXED_BITMAP +SUBDIRS += fixed_bitmap +endif +endif + +if EINA_BUILD_ONE_BIG +if !EINA_STATIC_BUILD_ONE_BIG +SUBDIRS += one_big +endif +endif + +if EINA_BUILD_PASS_THROUGH +if !EINA_STATIC_BUILD_PASS_THROUGH +SUBDIRS += pass_through +endif +endif diff --git a/legacy/eina/src/modules/mp/buddy/Makefile.am b/legacy/eina/src/modules/mp/buddy/Makefile.am index 0bb5ef6..c699c9d 100644 --- a/legacy/eina/src/modules/mp/buddy/Makefile.am +++ b/legacy/eina/src/modules/mp/buddy/Makefile.am @@ -9,9 +9,6 @@ AM_CPPFLAGS = \ @EINA_CPPFLAGS@ \ @EFL_EINA_BUILD@ -if EINA_BUILD_BUDDY -if !EINA_STATIC_BUILD_BUDDY - controllerdir = $(libdir)/eina/modules/mp/buddy/$(MODULE_ARCH) controller_LTLIBRARIES = module.la @@ -28,8 +25,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/chained_pool/Makefile.am b/legacy/eina/src/modules/mp/chained_pool/Makefile.am index bc52ac3..815bab7 100644 --- a/legacy/eina/src/modules/mp/chained_pool/Makefile.am +++ b/legacy/eina/src/modules/mp/chained_pool/Makefile.am @@ -10,9 +10,6 @@ AM_CPPFLAGS = \ @EFL_EINA_BUILD@ \ @VALGRIND_CFLAGS@ -if EINA_BUILD_CHAINED_POOL -if !EINA_STATIC_BUILD_CHAINED_POOL - controllerdir = $(libdir)/eina/modules/mp/chained_pool/$(MODULE_ARCH) controller_LTLIBRARIES = module.la @@ -29,8 +26,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am index 22cae36..4a27b3e 100644 --- a/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am +++ b/legacy/eina/src/modules/mp/ememoa_fixed/Makefile.am @@ -7,21 +7,18 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ @EINA_CPPFLAGS@ \ -@EINA_CFLAGS@ \ @EMEMOA_CFLAGS@ \ @EFL_EINA_BUILD@ -if EINA_BUILD_EMEMOA_FIXED -if !EINA_STATIC_BUILD_EMEMOA_FIXED - controllerdir = $(libdir)/eina/modules/mp/ememoa_fixed/$(MODULE_ARCH) controller_LTLIBRARIES = module.la module_la_SOURCES = \ eina_ememoa_fixed.c -module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ @EMEMOA_LIBS@ -module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version +module_la_CFLAGS = @EINA_CFLAGS@ +module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@ +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static install-data-hook: @@ -29,8 +26,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am index bbc846b..2814e31 100644 --- a/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am +++ b/legacy/eina/src/modules/mp/ememoa_unknown/Makefile.am @@ -7,21 +7,18 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ @EINA_CPPFLAGS@ \ -@EINA_CFLAGS@ \ @EMEMOA_CFLAGS@ \ @EFL_EINA_BUILD@ -if EINA_BUILD_EMEMOA_UNKNOWN -if !EINA_STATIC_BUILD_EMEMOA_UNKNOWN - controllerdir = $(libdir)/eina/modules/mp/ememoa_unknown/$(MODULE_ARCH) controller_LTLIBRARIES = module.la module_la_SOURCES = \ eina_ememoa_unknown.c -module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@ -module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version +module_la_CFLAGS = @EINA_CFLAGS@ +module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EMEMOA_LIBS@ @EINA_LIBS@ +module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static install-data-hook: @@ -29,8 +26,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am index e943ac7..caf239e 100644 --- a/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am +++ b/legacy/eina/src/modules/mp/fixed_bitmap/Makefile.am @@ -7,18 +7,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ @EINA_CPPFLAGS@ \ -@EINA_CFLAGS@ \ @EFL_EINA_BUILD@ -if EINA_BUILD_FIXED_BITMAP -if !EINA_STATIC_BUILD_FIXED_BITMAP - controllerdir = $(libdir)/eina/modules/mp/fixed_bitmap/$(MODULE_ARCH) controller_LTLIBRARIES = module.la module_la_SOURCES = \ eina_fixed_bitmap.c +module_la_CFLAGS = @EINA_CFLAGS@ module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -28,8 +25,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/one_big/Makefile.am b/legacy/eina/src/modules/mp/one_big/Makefile.am index 7d66dbd..8ca1a62 100644 --- a/legacy/eina/src/modules/mp/one_big/Makefile.am +++ b/legacy/eina/src/modules/mp/one_big/Makefile.am @@ -10,9 +10,6 @@ AM_CPPFLAGS = \ @EFL_EINA_BUILD@ \ @VALGRIND_CFLAGS@ -if EINA_BUILD_ONE_BIG -if !EINA_STATIC_BUILD_ONE_BIG - controllerdir = $(libdir)/eina/modules/mp/one_big/$(MODULE_ARCH) controller_LTLIBRARIES = module.la @@ -29,8 +26,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno diff --git a/legacy/eina/src/modules/mp/pass_through/Makefile.am b/legacy/eina/src/modules/mp/pass_through/Makefile.am index 7e0438d..8f48974 100644 --- a/legacy/eina/src/modules/mp/pass_through/Makefile.am +++ b/legacy/eina/src/modules/mp/pass_through/Makefile.am @@ -7,18 +7,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/src/lib \ -I$(top_builddir)/src/lib \ @EINA_CPPFLAGS@ \ -@EINA_CFLAGS@ \ @EFL_EINA_BUILD@ -if EINA_BUILD_PASS_THROUGH -if !EINA_STATIC_BUILD_PASS_THROUGH - controllerdir = $(libdir)//eina/modules/mp/pass_through/$(MODULE_ARCH) controller_LTLIBRARIES = module.la module_la_SOURCES = \ eina_pass_through.c +module_la_CFLAGS = @EINA_CFLAGS@ module_la_LIBADD = $(top_builddir)/src/lib/libeina.la @EINA_LIBS@ module_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -module -avoid-version module_la_LIBTOOLFLAGS = --tag=disable-static @@ -28,9 +25,5 @@ install-data-hook: uninstall-hook: rm -f $(DESTDIR)$(controllerdir)/module.* -endif -endif - clean-local: rm -rf *.gcno - -- 2.7.4