be explicit about SUBDIRS and DIST_SUBDIRS, fix maintainer-clean.

automake was "smart enough" to include in DIST_SUBDIRS even when 'if'
clause didn't add it to SUBDIRS, that was causing modules like XPM be
added twice, resulting maintainer-clean to double-clean the directory
(one from src/modules/loaders and other from src/lib), failing on the
second time.



SVN revision: 41060
This commit is contained in:
Gustavo Sverzut Barbieri 2009-06-16 19:03:28 +00:00
parent 6760437fdd
commit 3c6e35dd10
4 changed files with 27 additions and 0 deletions

View File

@ -226,3 +226,4 @@ endif
libevas_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @release_info@
DIST_SUBDIRS = canvas data cache cserve file engines imaging include

View File

@ -63,3 +63,27 @@ endif
#if !EVAS_STATIC_BUILD_SOFTWARE_QTOPIA
#SUBDIRS += software_qtopia
#endif
DIST_SUBDIRS = \
software_generic \
buffer \
direct3d \
directfb \
fb \
gl_common \
gl_glew \
gl_x11 \
quartz \
software_16 \
software_16_ddraw \
software_16_wince \
software_16_x11 \
software_16_sdl \
software_sdl \
software_ddraw \
software_gdi \
software_x11 \
xrender_x11
#cairo_common \
#cairo_x11 \
#software_qtopia

View File

@ -56,3 +56,4 @@ endif
SUBDIRS = $(edb_subdir) $(eet_subdir) $(gif_subdir) $(jpeg_subdir) $(pmaps_subdir) $(png_subdir) $(svg_subdir) $(tiff_subdir) $(xpm_subdir)
DIST_SUBDIRS = edb eet gif jpeg pmaps png svg tiff xpm

View File

@ -31,3 +31,4 @@ endif
endif
SUBDIRS = $(edb_subdir) $(eet_subdir) $(jpeg_subdir) $(png_subdir) $(tiff_subdir)
DIST_SUBDIRS = edb eet jpeg png tiff