summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVincent Torri <vincent.torri@gmail.com>2009-11-06 01:02:35 +0000
committerVincent Torri <vincent.torri@gmail.com>2009-11-06 01:02:35 +0000
commit7c24994f1856409d97955eed7a973a6e16e6f429 (patch)
tree7cddc56fa11c9d9867a264cec6dc870307634071
parentcf472c4d50a77e9811eef2e1d6337caad5da2baa (diff)
fix dist/distcheck rule
SVN revision: 43474
-rw-r--r--legacy/eina/src/lib/Makefile.am22
1 files changed, 9 insertions, 13 deletions
diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am
index 45fb0d0050..53ed7abcfe 100644
--- a/legacy/eina/src/lib/Makefile.am
+++ b/legacy/eina/src/lib/Makefile.am
@@ -37,35 +37,32 @@ eina_tiler.c \
37eina_hamster.c \ 37eina_hamster.c \
38eina_safety_checks.c 38eina_safety_checks.c
39 39
40sources_used = $(base_sources)
41
42if EINA_STATIC_BUILD_CHAINED_POOL 40if EINA_STATIC_BUILD_CHAINED_POOL
43sources_used += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c 41base_sources += $(top_srcdir)/src/modules/mp/chained_pool/eina_chained_mempool.c
44endif 42endif
45 43
46if EINA_STATIC_BUILD_EMEMOA_FIXED 44if EINA_STATIC_BUILD_EMEMOA_FIXED
47sources_used += $(top_srcdir)/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c 45base_sources += $(top_srcdir)/src/modules/mp/ememoa_fixed/eina_ememoa_fixed.c
48endif 46endif
49 47
50if EINA_STATIC_BUILD_EMEMOA_UNKNOWN 48if EINA_STATIC_BUILD_EMEMOA_UNKNOWN
51sources_used += $(top_srcdir)/src/modules/mp/ememoa_unknown/eina_ememoa_unknown.c 49base_sources += $(top_srcdir)/src/modules/mp/ememoa_unknown/eina_ememoa_unknown.c
52endif 50endif
53 51
54if EINA_STATIC_BUILD_FIXED_BITMAP 52if EINA_STATIC_BUILD_FIXED_BITMAP
55sources_used += $(top_srcdir)/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c 53base_sources += $(top_srcdir)/src/modules/mp/fixed_bitmap/eina_fixed_bitmap.c
56endif 54endif
57 55
58if EINA_STATIC_BUILD_PASS_THROUGH 56if EINA_STATIC_BUILD_PASS_THROUGH
59sources_used += $(top_srcdir)/src/modules/mp/pass_through/eina_pass_through.c 57base_sources += $(top_srcdir)/src/modules/mp/pass_through/eina_pass_through.c
60endif 58endif
61 59
62lib_LTLIBRARIES = libeina.la 60lib_LTLIBRARIES = libeina.la
63 61
64if EINA_AMALGAMATION 62if EINA_AMALGAMATION
65eina_sources_used = eina_amalgamation.c 63nodist_libeina_la_SOURCES = eina_amalgamation.c
66BUILT_SOURCES = eina_amalgamation.c
67 64
68eina_amalgamation.c: $(sources_used) Makefile 65eina_amalgamation.c: $(base_sources) Makefile
69 -rm -f eina_amalgamation.c 66 -rm -f eina_amalgamation.c
70 67
71 @echo "#ifdef HAVE_CONFIG_H" >> eina_amalgamation.c 68 @echo "#ifdef HAVE_CONFIG_H" >> eina_amalgamation.c
@@ -111,7 +108,7 @@ eina_amalgamation.c: $(sources_used) Makefile
111 @echo "#include \"eina_safety_checks.h\"" >> eina_amalgamation.c 108 @echo "#include \"eina_safety_checks.h\"" >> eina_amalgamation.c
112 @echo "#include \"Eina.h\"" >> eina_amalgamation.c 109 @echo "#include \"Eina.h\"" >> eina_amalgamation.c
113 110
114 @for f in $(sources_used); do \ 111 @for f in $(base_sources); do \
115 if [ `expr substr $$f 1 1` != '/' ]; then \ 112 if [ `expr substr $$f 1 1` != '/' ]; then \
116 file="$(srcdir)/$$f" ; \ 113 file="$(srcdir)/$$f" ; \
117 else \ 114 else \
@@ -123,10 +120,9 @@ eina_amalgamation.c: $(sources_used) Makefile
123 @echo "eina_amalgamation.c generated" 120 @echo "eina_amalgamation.c generated"
124 121
125else 122else
126eina_sources_used = $(sources_used) 123libeina_la_SOURCES = $(base_sources)
127endif 124endif
128 125
129libeina_la_SOURCES = $(eina_sources_used)
130libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@ 126libeina_la_LIBADD = @EINA_LIBS@ @dlopen_libs@
131libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@ 127libeina_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@ @EFL_PTHREAD_LIBS@
132libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@ 128libeina_la_CFLAGS = @EINA_CFLAGS@ @EFL_PTHREAD_CFLAGS@