From: Hans U. N. <hu...@us...> - 2005-03-24 05:23:44
|
Update of /cvsroot/libexif/libexif-testsuite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23967 Modified Files: Makefile.am configure.ac Log Message: src/Makefile.am is redundant - so we reduce it to a few comments Index: configure.ac =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/configure.ac,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- configure.ac 24 Mar 2005 04:38:49 -0000 1.10 +++ configure.ac 24 Mar 2005 05:23:28 -0000 1.11 @@ -109,20 +109,16 @@ fi fi -# workaround, must be after all AC_CONFIG_SUBDIRS -# recursive make, two-subdirs, and stuff. -substdirs="" -for subdir in ${subdirs}; do - if test "x$substdirs" = "x"; then - substdirs="\$(top_builddir)/${subdir}" +GP_CONFIG_MSG()dnl +_subdirs="" +for sd in $subdirs; do + ssd="$(basename "$sd")" + if test "x$_subdirs" = "x"; then + _subdirs="$ssd"; else - substdirs="${substdirs} \$(top_builddir)/${subdir}" + _subdirs="$_subdirs $ssd" fi done -AC_SUBST([substdirs]) - -GP_CONFIG_MSG()dnl -_subdirs=$subdirs GP_CONFIG_MSG([Subprojects],[${_subdirs}])dnl Index: Makefile.am =================================================================== RCS file: /cvsroot/libexif/libexif-testsuite/Makefile.am,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- Makefile.am 24 Mar 2005 04:38:49 -0000 1.6 +++ Makefile.am 24 Mar 2005 05:23:28 -0000 1.7 @@ -1,6 +1,6 @@ -SUBDIRS = m4 po testlib src tests +# @subdirs@ are the configured subproject directories +SUBDIRS = m4 po testlib @subdirs@ tests EXTRA_DIST = autogen.sh build-config.sh build-config.txt -# It is not sufficient to have these options somewhere in autogen.sh! ACLOCAL_AMFLAGS = -I m4 |