moved eet.h to its own dir - pkgconfig handles all the right stuff.

[framework/uifw/eet.git] / src / lib / Makefile.am

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 560b609..9f8bcab 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -16,7 +16,8 @@ AM_CPPFLAGS = \
 @OPENSSL_CFLAGS@ \
 @GNUTLS_CFLAGS@
 
-include_HEADERS = Eet.h
+includes_HEADERS = Eet.h
+includesdir = $(includedir)/eet-@VMAJ@
 
 lib_LTLIBRARIES = libeet.la
 
@@ -27,11 +28,11 @@ eet_image.c \
 eet_cipher.c \
 eet_dictionary.c \
 eet_node.c \
-eet_utils.c
+eet_utils.c \
+eet_connection.c
 
 if EET_AMALGAMATION
-eet_sources_used = eet_amalgamation.c
-BUILT_SOURCES = eet_amalgamation.c
+nodist_libeet_la_SOURCES = eet_amalgamation.c
 
 eet_amalgamation.c: $(base_sources) Makefile
        -rm -f eet_amalgamation.c
@@ -113,7 +114,7 @@ eet_amalgamation.c: $(base_sources) Makefile
 
        @echo "#ifdef HAVE_CIPHER" >> eet_amalgamation.c
        @echo "# ifdef HAVE_GNUTLS" >> eet_amalgamation.c
-       @echo "#  include <gnutls/x509..h>" >> eet_amalgamation.c
+       @echo "#  include <gnutls/x509.h>" >> eet_amalgamation.c
        @echo "#  include <gcrypt.h>" >> eet_amalgamation.c
        @echo "# else" >> eet_amalgamation.c
        @echo "#  include <openssl/evp.h>" >> eet_amalgamation.c
@@ -135,24 +136,23 @@ eet_amalgamation.c: $(base_sources) Makefile
        @echo "#include \"Eet.h\"" >> eet_amalgamation.c
 
        @for f in $(base_sources); do \
-          if [ `expr substr $$f 1 1` != '/' ]; then \
+          if [ `echo $$f | sed -e 's/^...\(.\).*/\1/'` != '/' ]; then \
                  file="$(srcdir)/$$f" ; \
           else \
                  file="$$f" ; \
           fi ; \
           echo "/* file: $$file */" >> eet_amalgamation.c; \
-          grep -v -e '^# *include \+.\(config\|\|Evil\|Eina\|stdio\|string\|math\|ctype\|limits\|types\|stat\|mman\|setjmp\|errno\|time\|fnmatch\|fcntl\|winsowk2\|unistd\|in\|gnutls\|gcrypt\|x509\|rsa\|objects\|err\|ssl\|dh\|dsa\|evp\|pem\|sha\|hmac\|rand\|zlib\|jpeglib\|Eet_private\|Eet\)[.]h.*' $$file >> eet_amalgamation.c; \
+          grep -v -e '^# *include \+.\(config\|\|Evil\|Eina\|stdio\|string\|math\|ctype\|limits\|sys/types\|sys/stat\|sys/mman\|setjmp\|errno\|time\|fnmatch\|fcntl\|winsock2\|unistd\|netinet/in\|gnutls/gnutls\|gcrypt\|gnutls/x509\|openssl/rsa\|openssl/objects\|openssl/err\|openssl/ssl\|openssl/dh\|openssl/dsa\|openssl/evp\|openssl/pem\|openssl/sha\|openssl/hmac\|openssl/x509\|openssl/rand\|zlib\|jpeglib\|Eet_private\|Eet\)[.]h.*' $$file >> eet_amalgamation.c; \
        done
        @echo "eet_amalgamation.c generated"
 
 else
-eet_sources_used = $(base_sources)
+libeet_la_SOURCES = $(base_sources)
 endif
 
-libeet_la_SOURCES = $(eet_sources_used)
-libeet_la_CFLAGS = @EET_CFLAGS@ @DEBUG_CFLAGS@
+libeet_la_CFLAGS = @EET_CFLAGS@ @DEBUG_CFLAGS@ @EFL_PTHREAD_CFLAGS@
 libeet_la_LIBADD = @GNUTLS_LIBS@ @OPENSSL_LIBS@ @EFL_COVERAGE_LIBS@ @EET_LIBS@ @EINA_LIBS@ @EVIL_LIBS@ -lz -ljpeg -lm
-libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
+libeet_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
 
 EXTRA_DIST = Eet_private.h