From 2d3021f128c24dc40532f6e7e0e7d0995d12275d Mon Sep 17 00:00:00 2001 From: Vincent Torri Date: Wed, 9 Sep 2009 07:42:08 +0000 Subject: [PATCH] * add amalgation support in configure output * remove a warning when eina_amalgamation.c is deleted but does not exist * delete eina_amalgamation.c when doing 'make clean' SVN revision: 42363 --- legacy/eina/configure.ac | 1 + legacy/eina/src/lib/Makefile.am | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/legacy/eina/configure.ac b/legacy/eina/configure.ac index f988a138e2..fba62093b9 100644 --- a/legacy/eina/configure.ac +++ b/legacy/eina/configure.ac @@ -441,6 +441,7 @@ echo " Maximum log level....: ${with_max_log_level}" echo " Report string usage..: ${have_stringshare_usage}" echo " Default mempool......: ${have_default_mempool}" echo " Thread Support.......: ${have_pthread}" +echo " Amalgamation.........: ${do_amalgamation}" echo echo " Documentation........: ${build_doc}" echo " Tests................: ${enable_tests}" diff --git a/legacy/eina/src/lib/Makefile.am b/legacy/eina/src/lib/Makefile.am index 9220e46c1d..1951b9c9c3 100644 --- a/legacy/eina/src/lib/Makefile.am +++ b/legacy/eina/src/lib/Makefile.am @@ -1,4 +1,5 @@ MAINTAINERCLEANFILES = Makefile.in +CLEANFILES = eina_amalgamation.c AM_CPPFLAGS = \ -I$(top_srcdir)/src/include \ @@ -66,7 +67,7 @@ eina_sources_used = eina_amalgamation.c BUILT_SOURCES = eina_amalgamation.c $(builddir)/ eina_amalgamation.c: $(sources_used) Makefile - -rm $(builddir)/eina_amalgamation.c + -rm -f $(builddir)/eina_amalgamation.c @echo "#ifdef HAVE_CONFIG_H" >> $(builddir)/eina_amalgamation.c @echo "#include \"config.h\"" >> $(builddir)/eina_amalgamation.c