aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-16 18:28:43 +0000
committerGustavo Sverzut Barbieri <barbieri@gmail.com>2013-01-16 18:28:43 +0000
commit4d050b6d4ecc74b7e3bd58f5091eee1287b138bd (patch)
tree139f1a68af13d34963d824874cd2d0e12b59f722
parent22a48925b17b0fadcac8cfc45dd5ef5bc124d86b (diff)
downloadefl-4d050b6d4ecc74b7e3bd58f5091eee1287b138bd.tar.gz
efl-4d050b6d4ecc74b7e3bd58f5091eee1287b138bd.tar.xz
efl-4d050b6d4ecc74b7e3bd58f5091eee1287b138bd.zip
fix distcheck.
it was failing: - leaving missing objects (.edj, .la) - eo was not building its examples automatically with --enable-always-build-examples - make dist with '--enable-always-build-examples' was not including 'src/examples' plus lots of ignored files due test changes. SVN revision: 82894
-rw-r--r--data/Makefile.am5
-rw-r--r--src/Makefile.am73
-rw-r--r--src/Makefile_Eina.am5
-rw-r--r--src/Makefile_Emotion.am1
-rw-r--r--src/Makefile_Ethumb.am1
-rw-r--r--src/examples/eo/Makefile.am4
6 files changed, 13 insertions, 76 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 03801598e..65205e452 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,7 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST =
+CLEANFILES =
########################################################################
# Embryo
@@ -85,8 +86,8 @@ ethumbfiles_DATA = ethumb/checkme
EXTRA_DIST += $(ethumbfiles_DATA)
ethumbframesdir = $(datadir)/ethumb/frames
-ethumbframes_DATA = \
-ethumb/frames/default.edj
+ethumbframes_DATA = ethumb/frames/default.edj
+CLEANFILES += ethumb/frames/default.edj
ethumb/frames/default.edj: ethumb/frames/default.edc
@$(MKDIR_P) ethumb/frames/
diff --git a/src/Makefile.am b/src/Makefile.am
index 8600eaca5..7dce3c75d 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
AUTOMAKE_OPTIONS = subdir-objects
MAINTAINERCLEANFILES = Makefile.in
+CLEANFILES =
BUILT_SOURCES =
DIST_SUBDIRS =
@@ -77,9 +78,8 @@ examples/emotion \
examples/ethumb_client
if ALWAYS_BUILD_EXAMPLES
SUBDIRS += . $(EXAMPLES_SUBDIRS)
-else
-DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
endif
+DIST_SUBDIRS += $(EXAMPLES_SUBDIRS)
examples: all-am
@for d in $(EXAMPLES_SUBDIRS); do \
@@ -94,71 +94,4 @@ install-examples:
done
clean-local:
- rm -rf bin/eet/*.gcno
- rm -rf bin/efreet/*.gcno
- rm -rf bin/eeze/*.gcno
- rm -rf bin/edje/*.gcno
- rm -rf lib/evil/*.gcno
- rm -rf lib/eina/*.gcno
- rm -rf lib/eo/*.gcno
- rm -rf lib/eet/*.gcno
- rm -rf lib/evas/*.gcno
- rm -rf lib/evas/cache/*.gcno
- rm -rf lib/evas/cache2/*.gcno
- rm -rf lib/evas/canvas/*.gcno
- rm -rf lib/evas/common/*.gcno
- rm -rf lib/evas/common/evas_op_blend/*.gcno
- rm -rf lib/evas/common/language/*.gcno
- rm -rf lib/evas/cserve2/*.gcno
- rm -rf lib/evas/file/*.gcno
- rm -rf lib/embryo/*.gcno
- rm -rf lib/edbus/*.gcno
- rm -rf lib/efreet/*.gcno
- rm -rf lib/eeze/*.gcno
- rm -rf lib/ephysics/*.gcno
- rm -rf lib/edje/*.gcno
- rm -rf lib/emotion/*.gcno
- rm -rf modules/eina/mp/pass_through/*.gcno
- rm -rf modules/eina/mp/one_big/*.gcno
- rm -rf modules/eina/mp/chained_pool/*.gcno
- rm -rf modules/evas/engines/buffer/*.gcno
- rm -rf modules/evas/engines/direct3d/*.gcno
- rm -rf modules/evas/engines/fb/*.gcno
- rm -rf modules/evas/engines/gl_cocoa/*.gcno
- rm -rf modules/evas/engines/gl_common/*.gcno
- rm -rf modules/evas/engines/gl_sdl/*.gcno
- rm -rf modules/evas/engines/gl_x11/*.gcno
- rm -rf modules/evas/engines/psl1ght/*.gcno
- rm -rf modules/evas/engines/software_ddraw/*.gcno
- rm -rf modules/evas/engines/software_gdi/*.gcno
- rm -rf modules/evas/engines/software_generic/*.gcno
- rm -rf modules/evas/engines/software_x11/*.gcno
- rm -rf modules/evas/engines/wayland_egl/*.gcno
- rm -rf modules/evas/engines/wayland_shm/*.gcno
- rm -rf modules/evas/loaders/bmp/*.gcno
- rm -rf modules/evas/loaders/eet/*.gcno
- rm -rf modules/evas/loaders/generic/*.gcno
- rm -rf modules/evas/loaders/gif/*.gcno
- rm -rf modules/evas/loaders/ico/*.gcno
- rm -rf modules/evas/loaders/jpeg/*.gcno
- rm -rf modules/evas/loaders/pmaps/*.gcno
- rm -rf modules/evas/loaders/png/*.gcno
- rm -rf modules/evas/loaders/psd/*.gcno
- rm -rf modules/evas/loaders/svg/*.gcno
- rm -rf modules/evas/loaders/tga/*.gcno
- rm -rf modules/evas/loaders/tiff/*.gcno
- rm -rf modules/evas/loaders/wbmp/*.gcno
- rm -rf modules/evas/loaders/webp/*.gcno
- rm -rf modules/evas/loaders/xpm/*.gcno
- rm -rf modules/evas/savers/eet/*.gcno
- rm -rf modules/evas/savers/jpeg/*.gcno
- rm -rf modules/evas/savers/png/*.gcno
- rm -rf modules/evas/savers/tiff/*.gcno
- rm -rf modules/edje/alsa_snd_player/*.gcno
- rm -rf modules/edje/eet_snd_reader/*.gcno
- rm -rf modules/edje/multisense_factory/*.gcno
- rm -rf modules/emotion/xine/*.gcno
- rm -rf modules/emotion/gstreamer/*.gcno
- rm -rf modules/emotion/generic/*.gcno
- rm -rf static_libs/libunibreak/*.gcno
- rm -rf static_libs/lz4/*.gcno
+ find . -type f -name '*.gcno' -delete
diff --git a/src/Makefile_Eina.am b/src/Makefile_Eina.am
index 08899d315..58f429843 100644
--- a/src/Makefile_Eina.am
+++ b/src/Makefile_Eina.am
@@ -276,12 +276,9 @@ tests_eina_cxx_compile_test_CPPFLAGS = @EINA_CFLAGS@
tests_eina_cxx_compile_test_LDADD = @USE_EINA_LIBS@
tests_eina_cxx_compile_test_DEPENDENCIES = @USE_EINA_INTERNAL_LIBS@
-EXTRA_LTLIBRARIES = tests/eina/module_dummy.la
-
-check-local: tests/eina/module_dummy.la
+check_LTLIBRARIES = tests/eina/module_dummy.la
tests_eina_module_dummy_la_SOURCES = tests/eina/eina_test_module_dummy.c
-
tests_eina_module_dummy_la_CPPFLAGS = \
-DPACKAGE_BUILD_DIR=\"`pwd`/$(top_builddir)/tests/eina\" \
@CHECK_CFLAGS@ \
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 085f2b4e5..dc1f188c6 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -189,6 +189,7 @@ tests/emotion/data/window_inner_shadow.png
emotiondatafilesdir = $(datadir)/emotion/data
emotiondatafiles_DATA = tests/emotion/data/theme.edj
+CLEANFILES += tests/emotion/data/theme.edj
endif
EXTRA_DIST += \
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index f81d85890..c2aa2d375 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -52,6 +52,7 @@ modules/ethumb/emotion/template.edj: modules/ethumb/emotion/template.edc modules
$(AM_V_EDJ)$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(srcdir)/modules/ethumb/emotion $< $@
ethumbmoduleemotion_DATA = modules/ethumb/emotion/template.edj
+CLEANFILES += modules/ethumb/emotion/template.edj
EXTRA_DIST += \
modules/ethumb/emotion/template.edc \
diff --git a/src/examples/eo/Makefile.am b/src/examples/eo/Makefile.am
index eeca8cbe6..540d3fc02 100644
--- a/src/examples/eo/Makefile.am
+++ b/src/examples/eo/Makefile.am
@@ -84,3 +84,7 @@ uninstall-local:
for f in $(simple_SOURCES) ; do \
rm -f $(datadir)/eo/examples/simple/$$f ; \
done
+
+if ALWAYS_BUILD_EXAMPLES
+noinst_PROGRAMS = $(EXTRA_PROGRAMS)
+endif