Ecore: Decide whether library will be built or not in upper level

As requested by vtorri. :D

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@53967 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 0c00c6a..e36b91d 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,20 +1,68 @@
 ## Process this file with automake to produce Makefile.in
 MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = \
-ecore \
-ecore_input \
-ecore_input_evas \
-ecore_fb \
-ecore_directfb \
-ecore_con \
-ecore_x \
-ecore_win32 \
-ecore_wince \
-ecore_sdl \
-ecore_cocoa \
-ecore_ipc \
-ecore_evas \
-ecore_config \
-ecore_file \
-ecore_imf \
-ecore_imf_evas
+SUBDIRS = ecore
+
+if BUILD_ECORE_INPUT
+SUBDIRS += ecore_input
+endif
+
+if BUILD_ECORE_INPUT_EVAS
+
+SUBDIRS += ecore_input_evas
+endif
+
+if BUILD_ECORE_FB
+SUBDIRS += ecore_fb
+endif
+
+if BUILD_ECORE_DIRECTFB
+SUBDIRS += ecore_directfb
+endif
+
+if BUILD_ECORE_CON
+SUBDIRS += ecore_con
+endif
+
+if BUILD_ECORE_X
+SUBDIRS += ecore_x
+endif
+
+if BUILD_ECORE_WIN32
+SUBDIRS += ecore_win32
+endif
+
+if BUILD_ECORE_WINCE
+SUBDIRS += ecore_wince
+endif
+
+if BUILD_ECORE_SDL
+SUBDIRS += ecore_sdl
+endif
+
+if BUILD_ECORE_COCOA
+SUBDIRS += ecore_cocoa
+endif
+
+if BUILD_ECORE_IPC
+SUBDIRS += ecore_ipc
+endif
+
+if BUILD_ECORE_EVAS
+SUBDIRS += ecore_evas
+endif
+
+if BUILD_ECORE_CONFIG
+SUBDIRS += ecore_config
+endif
+
+if BUILD_ECORE_FILE
+SUBDIRS += ecore_file
+endif
+
+if BUILD_ECORE_IMF
+SUBDIRS += ecore_imf
+endif
+
+if BUILD_ECORE_IMF_EVAS
+SUBDIRS += ecore_imf_evas
+endif

diff --git a/src/lib/ecore_cocoa/Makefile.am b/src/lib/ecore_cocoa/Makefile.am
index ba9c8fd..4ac7b11 100644 (file)
--- a/src/lib/ecore_cocoa/Makefile.am
+++ b/src/lib/ecore_cocoa/Makefile.am
@@ -8,8 +8,6 @@ AM_CPPFLAGS = \
 @EVAS_CFLAGS@ \
 @EINA_CFLAGS@
 
-if BUILD_ECORE_COCOA
-
 lib_LTLIBRARIES = libecore_cocoa.la
 includes_HEADERS = \
 Ecore_Cocoa.h \
@@ -28,6 +26,4 @@ $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 
 libecore_cocoa_la_LDFLAGS = @cocoa_ldflags@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_cocoa_private.h

diff --git a/src/lib/ecore_con/Makefile.am b/src/lib/ecore_con/Makefile.am
index bd9a083..e2969bd 100644 (file)
--- a/src/lib/ecore_con/Makefile.am
+++ b/src/lib/ecore_con/Makefile.am
@@ -12,8 +12,6 @@ AM_CPPFLAGS = \
 @CARES_CFLAGS@ \
 @WIN32_CPPFLAGS@
 
-if BUILD_ECORE_CON
-
 lib_LTLIBRARIES = libecore_con.la
 includes_HEADERS = Ecore_Con.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -37,6 +35,4 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 
 libecore_con_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_con_private.h

diff --git a/src/lib/ecore_config/Makefile.am b/src/lib/ecore_config/Makefile.am
index 80fe04f..c459351 100644 (file)
--- a/src/lib/ecore_config/Makefile.am
+++ b/src/lib/ecore_config/Makefile.am
@@ -16,8 +16,6 @@ AM_CPPFLAGS = \
 
 CLEANFILES = $(DB)
 
-if BUILD_ECORE_CONFIG
-
 #DB = system.db
 #$(DB): Makefile
 #      edb_ed $(top_builddir)/src/lib/ecore_config/$(DB) add /e/theme/name str "winter"
@@ -58,8 +56,6 @@ libecore_config_la_LIBADD += $(top_builddir)/src/lib/ecore_ipc/libecore_ipc.la
 
 endif
 
-endif
-
 EXTRA_DIST = \
 ecore_config_ipc.h \
 ecore_config_private.h \

diff --git a/src/lib/ecore_directfb/Makefile.am b/src/lib/ecore_directfb/Makefile.am
index 7761e7b..8142d33 100644 (file)
--- a/src/lib/ecore_directfb/Makefile.am
+++ b/src/lib/ecore_directfb/Makefile.am
@@ -5,8 +5,6 @@ AM_CPPFLAGS = \
 -I$(top_builddir)/src/lib/ecore \
 @DIRECTFB_CFLAGS@ @EINA_CFLAGS@
 
-if BUILD_ECORE_DIRECTFB
-
 lib_LTLIBRARIES = libecore_directfb.la
 includes_HEADERS = Ecore_DirectFB.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -26,8 +24,6 @@ libecore_directfb_la_LDFLAGS = -version-info @version_info@ @release_info@
 libecore_directfb_la_DEPENDENCIES = \
 $(top_builddir)/src/lib/ecore/libecore.la
 
-endif
-
 EXTRA_DIST = \
 Ecore_DirectFB.h \
 ecore_directfb.c \

diff --git a/src/lib/ecore_evas/Makefile.am b/src/lib/ecore_evas/Makefile.am
index 78a3b21..a4eba85 100644 (file)
--- a/src/lib/ecore_evas/Makefile.am
+++ b/src/lib/ecore_evas/Makefile.am
@@ -82,8 +82,6 @@ $(ECORE_WINCE_INC) \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-if BUILD_ECORE_EVAS
-
 lib_LTLIBRARIES = libecore_evas.la
 includes_HEADERS = Ecore_Evas.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -118,7 +116,5 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 
 libecore_evas_la_LDFLAGS = @cocoa_ldflags@ -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = \
 ecore_evas_private.h

diff --git a/src/lib/ecore_fb/Makefile.am b/src/lib/ecore_fb/Makefile.am
index 696f6cb..a9af6c6 100644 (file)
--- a/src/lib/ecore_fb/Makefile.am
+++ b/src/lib/ecore_fb/Makefile.am
@@ -6,7 +6,6 @@ AM_CPPFLAGS = \
 @TSLIB_CFLAGS@ \
 @EINA_CFLAGS@
 
-if BUILD_ECORE_FB
 
 lib_LTLIBRARIES = libecore_fb.la
 includes_HEADERS = Ecore_Fb.h
@@ -28,8 +27,6 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 
 libecore_fb_la_LDFLAGS = -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = \
 ecore_fb_private.h \
 ecore_fb_keytable.h

diff --git a/src/lib/ecore_file/Makefile.am b/src/lib/ecore_file/Makefile.am
index 55c8097..ab23ace 100644 (file)
--- a/src/lib/ecore_file/Makefile.am
+++ b/src/lib/ecore_file/Makefile.am
@@ -16,8 +16,6 @@ if BUILD_ECORE_CON
 lib_ecore_con_la = $(top_builddir)/src/lib/ecore_con/libecore_con.la
 endif
 
-if BUILD_ECORE_FILE
-
 lib_LTLIBRARIES = libecore_file.la
 includes_HEADERS = Ecore_File.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -39,7 +37,5 @@ $(lib_ecore_con_la) \
 
 libecore_file_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_file_private.h
 

diff --git a/src/lib/ecore_imf/Makefile.am b/src/lib/ecore_imf/Makefile.am
index 1efe763..10f6c2f 100644 (file)
--- a/src/lib/ecore_imf/Makefile.am
+++ b/src/lib/ecore_imf/Makefile.am
@@ -1,6 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-if BUILD_ECORE_IMF
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -DPACKAGE_LIB_DIR=\"$(libdir)\" \
@@ -25,6 +24,5 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 @EVIL_LIBS@
 
 libecore_imf_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-endif
 
 EXTRA_DIST = ecore_imf_private.h

diff --git a/src/lib/ecore_imf_evas/Makefile.am b/src/lib/ecore_imf_evas/Makefile.am
index 37d9a8f..fa5c491 100644 (file)
--- a/src/lib/ecore_imf_evas/Makefile.am
+++ b/src/lib/ecore_imf_evas/Makefile.am
@@ -1,6 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-if BUILD_ECORE_IMF_EVAS
 AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore \
 -I$(top_srcdir)/src/lib/ecore_imf \
@@ -21,4 +20,3 @@ $(top_builddir)/src/lib/ecore_imf/libecore_imf.la \
 @EINA_LIBS@
 
 libecore_imf_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
-endif

diff --git a/src/lib/ecore_input/Makefile.am b/src/lib/ecore_input/Makefile.am
index f9ff7c8..427dc1a 100644 (file)
--- a/src/lib/ecore_input/Makefile.am
+++ b/src/lib/ecore_input/Makefile.am
@@ -7,8 +7,6 @@ AM_CPPFLAGS = \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@
 
-if BUILD_ECORE_INPUT
-
 lib_LTLIBRARIES = libecore_input.la
 includes_HEADERS = Ecore_Input.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -23,6 +21,4 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 
 libecore_input_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_input_private.h

diff --git a/src/lib/ecore_input_evas/Makefile.am b/src/lib/ecore_input_evas/Makefile.am
index 4749ec9..9019bc9 100644 (file)
--- a/src/lib/ecore_input_evas/Makefile.am
+++ b/src/lib/ecore_input_evas/Makefile.am
@@ -10,8 +10,6 @@ AM_CPPFLAGS = \
 @EINA_CFLAGS@ \
 @EVIL_CFLAGS@
 
-if BUILD_ECORE_INPUT_EVAS
-
 lib_LTLIBRARIES = libecore_input_evas.la
 includes_HEADERS = Ecore_Input_Evas.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -28,6 +26,4 @@ $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 
 libecore_input_evas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_input_evas_private.h

diff --git a/src/lib/ecore_ipc/Makefile.am b/src/lib/ecore_ipc/Makefile.am
index 0ed48c8..03b392d 100644 (file)
--- a/src/lib/ecore_ipc/Makefile.am
+++ b/src/lib/ecore_ipc/Makefile.am
@@ -9,8 +9,6 @@ AM_CPPFLAGS = \
 -I$(top_srcdir)/src/lib/ecore_ipc \
 @SSL_CFLAGS@ @EINA_CFLAGS@
 
-if BUILD_ECORE_IPC
-
 lib_LTLIBRARIES = libecore_ipc.la
 includes_HEADERS = Ecore_Ipc.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -26,6 +24,4 @@ $(top_builddir)/src/lib/ecore_con/libecore_con.la \
 
 libecore_ipc_la_LDFLAGS = -no-undefined -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_ipc_private.h

diff --git a/src/lib/ecore_sdl/Makefile.am b/src/lib/ecore_sdl/Makefile.am
index 3948bc4..27210bb 100644 (file)
--- a/src/lib/ecore_sdl/Makefile.am
+++ b/src/lib/ecore_sdl/Makefile.am
@@ -12,8 +12,6 @@ AM_CPPFLAGS = \
 @EVAS_CFLAGS@ \
 @EINA_CFLAGS@
 
-if BUILD_ECORE_SDL
-
 lib_LTLIBRARIES = libecore_sdl.la
 includes_HEADERS = Ecore_Sdl.h
 includesdir = $(includedir)/ecore-@VMAJ@
@@ -28,6 +26,4 @@ $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 
 libecore_sdl_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = Ecore_Sdl_Keys.h ecore_sdl_private.h

diff --git a/src/lib/ecore_win32/Makefile.am b/src/lib/ecore_win32/Makefile.am
index 2f4ced9..ce317c7 100644 (file)
--- a/src/lib/ecore_win32/Makefile.am
+++ b/src/lib/ecore_win32/Makefile.am
@@ -9,9 +9,6 @@ AM_CPPFLAGS = \
 @EINA_CFLAGS@ \
 @WIN32_CPPFLAGS@
 
-
-if BUILD_ECORE_WIN32
-
 lib_LTLIBRARIES = libecore_win32.la
 
 includes_HEADERS = Ecore_Win32.h
@@ -37,8 +34,6 @@ $(top_builddir)/src/lib/ecore_input/libecore_input.la \
 
 libecore_win32_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = \
 ecore_win32_private.h \
 ecore_win32_dnd_enumformatetc.h \

diff --git a/src/lib/ecore_wince/Makefile.am b/src/lib/ecore_wince/Makefile.am
index f349763..a264ffb 100644 (file)
--- a/src/lib/ecore_wince/Makefile.am
+++ b/src/lib/ecore_wince/Makefile.am
@@ -12,9 +12,6 @@ AM_CPPFLAGS = \
 
 AM_CFLAGS = @WIN32_CFLAGS@
 
-
-if BUILD_ECORE_WINCE
-
 lib_LTLIBRARIES = libecore_wince.la
 
 includes_HEADERS = Ecore_WinCE.h
@@ -35,6 +32,4 @@ $(top_builddir)/src/lib/ecore/libecore.la \
 
 libecore_wince_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
 
-endif
-
 EXTRA_DIST = ecore_wince_private.h

diff --git a/src/lib/ecore_x/Makefile.am b/src/lib/ecore_x/Makefile.am
index c3a5d96..b14fc7d 100644 (file)
--- a/src/lib/ecore_x/Makefile.am
+++ b/src/lib/ecore_x/Makefile.am
@@ -1,7 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-if BUILD_ECORE_X
-
 SUBDIRS = xlib xcb
 
 if BUILD_ECORE_X_XCB
@@ -29,6 +27,4 @@ Ecore_X_Atoms.h \
 Ecore_X_Cursor.h
 includesdir = $(includedir)/ecore-@VMAJ@
 
-endif
-
 EXTRA_DIST = ecore_x_atoms_decl.h