1 files changed, 8 insertions, 2 deletions

diff --git a/libraries/eina/src/lib/Makefile.am b/libraries/eina/src/lib/Makefile.am
index 0537a61..d8c9d20 100644
--- a/libraries/eina/src/lib/Makefile.am
+++ b/libraries/eina/src/lib/Makefile.am
@@ -22,6 +22,7 @@ eina_error.c \
 eina_fp.c \
 eina_hamster.c \
 eina_hash.c \
+eina_inarray.c \
 eina_inlist.c \
 eina_iterator.c \
 eina_lalloc.c \
@@ -130,12 +131,17 @@ eina_amalgamation.c: $(base_sources) Makefile
         @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 "#ifdef HAVE_DLOPEN" >> eina_amalgamation.c
+        @echo "# include <dlfcn.h>" >> eina_amalgamation.c
+        @echo "#endif" >> eina_amalgamation.c
         @echo "#include <sys/types.h>" >> eina_amalgamation.c
-        @echo "#include <dirent.h>" >> eina_amalgamation.c
+        @echo "#ifdef HAVE_DIRENT_H" >> eina_amalgamation.c
+        @echo "# include <dirent.h>" >> eina_amalgamation.c
+        @echo "#endif" >> eina_amalgamation.c
         @echo "#include <assert.h>" >> eina_amalgamation.c
         @echo "#include <errno.h>" >> eina_amalgamation.c
         @echo "#include <fnmatch.h>" >> eina_amalgamation.c
+        @echo "#include <fcntl.h>" >> eina_amalgamation.c
 
         @echo "#ifdef HAVE_EVIL" >> eina_amalgamation.c
         @echo "# include <Evil.h>" >> eina_amalgamation.c