stefan pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=bb0d161d8ff3ea000e579714236e0ec52ea5dfaa
commit bb0d161d8ff3ea000e579714236e0ec52ea5dfaa
Author: Stefan Schmidt <ste...@osg.samsung.com>
Date: Mon Mar 7 23:49:23 2016 +0100
Revert "eina: reintroduce additional support for eina sub directory
compilation."
This reverts commit 1affc60d00e1fa2b702d6b170514b86e1438ed9a.
This reverts one of three parts of the try to get sub directory
compilation back into eina. It breaks our distcheck though and I
talked to Cedric about it and he prefers to revert these as we might
need to go another route to bring this functionality back. Details
will come to the mailing list.
---
configure.ac | 1 -
src/lib/eina/Makefile.am | 16 ----------------
2 files changed, 17 deletions(-)
diff --git a/configure.ac b/configure.ac
index fd6bf20..0768936 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5074,7 +5074,6 @@ src/examples/elua/Makefile
src/examples/eolian_cxx/Makefile
src/examples/elocation/Makefile
src/lib/eina/eina_config.h
-src/lib/eina/Makefile
src/lib/ecore_x/ecore_x_version.h
src/lib/efl/Efl_Config.h
spec/efl.spec
diff --git a/src/lib/eina/Makefile.am b/src/lib/eina/Makefile.am
deleted file mode 100644
index ee789b1..0000000
--- a/src/lib/eina/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-CLEANFILES =
-BUILT_SOURCES =
-
-include Makefile_File.am
-
-lib_LTLIBRARIES = libeina.la
-
-libeina_la_SOURCES = $(EINA_S)
-libeina_la_CPPFLAGS = $(EINA_FLAGS)
-libeina_la_LIBADD = @EINA_LIBS@ @UNWIND_LIBS@
-libeina_la_DEPENDENCIES = @EINA_INTERNAL_LIBS@
-libeina_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
-
-libeina_la-%.Plo: lib_eina_libeina_la-%.Plo
- ln -fs $(subst $(top_srcdir)/src/lib/eina/,,$<) $(subst
$(top_srcdir)/src/lib/eina/,,$@)
--
