From: Enlightenment S. <no-...@en...> - 2010-08-16 13:52:41
|
Log: * eina: fix amalgamation. Author: cedric Date: 2010-08-16 06:52:34 -0700 (Mon, 16 Aug 2010) New Revision: 51210 Added: trunk/eina/src/include/eina_share_common.h trunk/eina/src/include/eina_strbuf_common.h trunk/eina/src/include/eina_strbuf_template_c.x Removed: trunk/eina/src/lib/eina_share_common.h trunk/eina/src/lib/eina_strbuf_common.h trunk/eina/src/lib/eina_strbuf_template_c.i Modified: trunk/eina/src/include/Makefile.am trunk/eina/src/lib/Makefile.am trunk/eina/src/lib/eina_strbuf.c trunk/eina/src/lib/eina_ustrbuf.c Modified: trunk/eina/src/include/Makefile.am =================================================================== --- trunk/eina/src/include/Makefile.am 2010-08-16 12:56:01 UTC (rev 51209) +++ trunk/eina/src/include/Makefile.am 2010-08-16 13:52:34 UTC (rev 51210) @@ -61,4 +61,7 @@ EXTRA_DIST = \ eina_config.h.in \ -eina_private.h +eina_private.h \ +eina_share_common.h \ +eina_strbuf_common.h \ +eina_strbuf_template_c.x Modified: trunk/eina/src/lib/Makefile.am =================================================================== --- trunk/eina/src/lib/Makefile.am 2010-08-16 12:56:01 UTC (rev 51209) +++ trunk/eina/src/lib/Makefile.am 2010-08-16 13:52:34 UTC (rev 51210) @@ -45,10 +45,7 @@ eina_strbuf_common.c \ eina_ustrbuf.c \ eina_unicode.c \ -eina_quadtree.c \ -eina_share_common.h \ -eina_strbuf_common.h \ -eina_strbuf_template_c.i +eina_quadtree.c if EINA_STATIC_BUILD_CHAINED_POOL base_sources += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c Modified: trunk/eina/src/lib/eina_strbuf.c =================================================================== --- trunk/eina/src/lib/eina_strbuf.c 2010-08-16 12:56:01 UTC (rev 51209) +++ trunk/eina/src/lib/eina_strbuf.c 2010-08-16 13:52:34 UTC (rev 51210) @@ -43,7 +43,7 @@ #include "eina_unicode.h" #include "eina_private.h" -#include "eina_strbuf_template_c.i" +#include "eina_strbuf_template_c.x" @@ -122,4 +122,4 @@ ret = eina_strbuf_insert(buf, str, pos); free(str); return ret; -} \ No newline at end of file +} Modified: trunk/eina/src/lib/eina_ustrbuf.c =================================================================== --- trunk/eina/src/lib/eina_ustrbuf.c 2010-08-16 12:56:01 UTC (rev 51209) +++ trunk/eina/src/lib/eina_ustrbuf.c 2010-08-16 13:52:34 UTC (rev 51210) @@ -39,4 +39,4 @@ #define _FUNC_EXPAND(y) eina_ustrbuf_ ## y -#include "eina_strbuf_template_c.i" \ No newline at end of file +#include "eina_strbuf_template_c.x" |