oops, forgot to attach.
On Tue, Oct 13, 2009 at 11:25 AM, cantona <cant...@cantona.net> wrote:
> Hi all,
>
> Eina is broken...I attached a patch which fixed the problem.
>
> - cantona
> ---
> cd . && /bin/sh /home/cantona/e17_src/eina/missing --run autoheader
> rm -f stamp-h1
> touch config.h.in
> cd . && /bin/sh ./config.status config.h
> config.status: creating config.h
> config.status: config.h is unchanged
> make all-recursive
> make[1]: Entering directory `/home/cantona/e17_src/eina'
> Making all in src
> make[2]: Entering directory `/home/cantona/e17_src/eina/src'
> Making all in lib
> make[3]: Entering directory `/home/cantona/e17_src/eina/src/lib'
> rm -f /eina_amalgamation.c
> /bin/sh: /eina_amalgamation.c: Permission denied
> make[3]: *** [eina_amalgamation.c] Error 1
> make[3]: Leaving directory `/home/cantona/e17_src/eina/src/lib'
> make[2]: *** [all-recursive] Error 1
> make[2]: Leaving directory `/home/cantona/e17_src/eina/src'
> make[1]: *** [all-recursive] Error 1
> make[1]: Leaving directory `/home/cantona/e17_src/eina'
> make: *** [all] Error 2
>
Index: src/lib/Makefile.am
===================================================================
--- src/lib/Makefile.am (revision 43047)
+++ src/lib/Makefile.am (working copy)
@@ -67,49 +67,49 @@
eina_sources_used = eina_amalgamation.c
BUILT_SOURCES = eina_amalgamation.c
-$(builddir)/ eina_amalgamation.c: $(sources_used) Makefile
- -rm -f $(builddir)/eina_amalgamation.c
+eina_amalgamation.c: $(sources_used) Makefile
+ -rm -f eina_amalgamation.c
- @echo "#ifdef HAVE_CONFIG_H" >> $(builddir)/eina_amalgamation.c
- @echo "#include \"config.h\"" >> $(builddir)/eina_amalgamation.c
- @echo "#endif" >> $(builddir)/eina_amalgamation.c
+ @echo "#ifdef HAVE_CONFIG_H" >> eina_amalgamation.c
+ @echo "#include \"config.h\"" >> eina_amalgamation.c
+ @echo "#endif" >> eina_amalgamation.c
- @echo "#ifndef _WIN32" >> $(builddir)/eina_amalgamation.c
- @echo "#define _GNU_SOURCE" >> $(builddir)/eina_amalgamation.c
- @echo "#endif" >> $(builddir)/eina_amalgamation.c
+ @echo "#ifndef _WIN32" >> eina_amalgamation.c
+ @echo "#define _GNU_SOURCE" >> eina_amalgamation.c
+ @echo "#endif" >> eina_amalgamation.c
- @echo "#ifdef HAVE_ALLOCA_H" >> $(builddir)/eina_amalgamation.c
- @echo "# include <alloca.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#elif defined __GNUC__" >> $(builddir)/eina_amalgamation.c
- @echo "# define alloca __builtin_alloca" >> $(builddir)/eina_amalgamation.c
- @echo "#elif defined _AIX" >> $(builddir)/eina_amalgamation.c
- @echo "# define alloca __alloca" >> $(builddir)/eina_amalgamation.c
- @echo "#elif defined _MSC_VER" >> $(builddir)/eina_amalgamation.c
- @echo "# include <malloc.h>" >> $(builddir)/eina_amalgamation.c
- @echo "# define alloca _alloca" >> $(builddir)/eina_amalgamation.c
- @echo "#else" >> $(builddir)/eina_amalgamation.c
- @echo "# include <stddef.h>" >> $(builddir)/eina_amalgamation.c
- @echo "# ifdef __cplusplus" >> $(builddir)/eina_amalgamation.c
- @echo "#extern \"C\"" >> $(builddir)/eina_amalgamation.c
- @echo "# endif" >> $(builddir)/eina_amalgamation.c
- @echo "#void *alloca (size_t);" >> $(builddir)/eina_amalgamation.c
- @echo "#endif" >> $(builddir)/eina_amalgamation.c
+ @echo "#ifdef HAVE_ALLOCA_H" >> eina_amalgamation.c
+ @echo "# include <alloca.h>" >> eina_amalgamation.c
+ @echo "#elif defined __GNUC__" >> eina_amalgamation.c
+ @echo "# define alloca __builtin_alloca" >> eina_amalgamation.c
+ @echo "#elif defined _AIX" >> eina_amalgamation.c
+ @echo "# define alloca __alloca" >> eina_amalgamation.c
+ @echo "#elif defined _MSC_VER" >> eina_amalgamation.c
+ @echo "# include <malloc.h>" >> eina_amalgamation.c
+ @echo "# define alloca _alloca" >> eina_amalgamation.c
+ @echo "#else" >> eina_amalgamation.c
+ @echo "# include <stddef.h>" >> eina_amalgamation.c
+ @echo "# ifdef __cplusplus" >> eina_amalgamation.c
+ @echo "#extern \"C\"" >> eina_amalgamation.c
+ @echo "# endif" >> eina_amalgamation.c
+ @echo "#void *alloca (size_t);" >> eina_amalgamation.c
+ @echo "#endif" >> eina_amalgamation.c
- @echo "#include <stdio.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#include <stdlib.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#include <string.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#include <dlfcn.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#include <sys/types.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#include <dirent.h>" >> $(builddir)/eina_amalgamation.c
+ @echo "#include <stdio.h>" >> eina_amalgamation.c
+ @echo "#include <stdlib.h>" >> eina_amalgamation.c
+ @echo "#include <string.h>" >> eina_amalgamation.c
+ @echo "#include <dlfcn.h>" >> eina_amalgamation.c
+ @echo "#include <sys/types.h>" >> eina_amalgamation.c
+ @echo "#include <dirent.h>" >> eina_amalgamation.c
- @echo "#ifdef HAVE_EVIL" >> $(builddir)/eina_amalgamation.c
- @echo "# include <Evil.h>" >> $(builddir)/eina_amalgamation.c
- @echo "#endif" >> $(builddir)/eina_amalgamation.c
+ @echo "#ifdef HAVE_EVIL" >> eina_amalgamation.c
+ @echo "# include <Evil.h>" >> eina_amalgamation.c
+ @echo "#endif" >> eina_amalgamation.c
- @echo "#include \"eina_config.h\"" >> $(builddir)/eina_amalgamation.c
- @echo "#include \"eina_private.h\"" >> $(builddir)/eina_amalgamation.c
- @echo "#include \"eina_safety_checks.h\"" >> $(builddir)/eina_amalgamation.c
- @echo "#include \"Eina.h\"" >> $(builddir)/eina_amalgamation.c
+ @echo "#include \"eina_config.h\"" >> eina_amalgamation.c
+ @echo "#include \"eina_private.h\"" >> eina_amalgamation.c
+ @echo "#include \"eina_safety_checks.h\"" >> eina_amalgamation.c
+ @echo "#include \"Eina.h\"" >> eina_amalgamation.c
@for f in $(sources_used); do \
if [ `expr substr $$f 1 1` != '/' ]; then \
@@ -117,8 +117,8 @@
else \
file="$$f" ; \
fi ; \
- echo "/* file: $$file */" >> $(builddir)/eina_amalgamation.c; \
- grep -v -e '^# *include \+.\(config\|eina_[a-z_]\+\|Evil\|stdio\|stdlib\|string\|dlfcn\)[.]h.*' $$file >> $(builddir)/eina_amalgamation.c; \
+ echo "/* file: $$file */" >> eina_amalgamation.c; \
+ grep -v -e '^# *include \+.\(config\|eina_[a-z_]\+\|Evil\|stdio\|stdlib\|string\|dlfcn\)[.]h.*' $$file >> eina_amalgamation.c; \
done
@echo "eina_amalgamation.c generated"
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
