[libexif-cvs] libexif-testsuite Makefile.am,1.2,1.3 README,1.1,1.2 configure.ac,1.2,1.3

[Hans U. N. <hu...@us...>]

Update of /cvsroot/libexif/libexif-testsuite
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30968

Modified Files:
	Makefile.am README configure.ac 
Log Message:
enable proper recursive builds (e.g. 'make dist')

Index: README
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/README,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- README	13 Mar 2005 22:20:52 -0000	1.1
+++ README	14 Mar 2005 01:33:35 -0000	1.2
@@ -0,0 +1,4 @@
+		libexif-testsuite
+		-----------------
+
+FIXME: Write short intro.

Index: configure.ac
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/configure.ac,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- configure.ac	14 Mar 2005 00:47:25 -0000	1.2
+++ configure.ac	14 Mar 2005 01:33:35 -0000	1.3
@@ -6,14 +6,20 @@
 GP_CONFIG_INIT
 GP_CONFIG_MSG([Source code location],[${srcdir}])
 
+dnl ---------------------------------------------------------------------------
+dnl PKG_CONFIG and PKG_CONFIG_PATH setup
+dnl ---------------------------------------------------------------------------
 if test "x${PKG_CONFIG_PATH}" = "x"; then
 	PKG_CONFIG_PATH="`pwd`/src/libexif/libexif"
 else
 	PKG_CONFIG_PATH="`pwd`/src/libexif/libexif:${PKG_CONFIG_PATH}"
 fi
-
 GP_PKG_CONFIG
 
+
+dnl ---------------------------------------------------------------------------
+dnl compiler stuff
+dnl ---------------------------------------------------------------------------
 AC_PROG_CC
 AC_C_CONST
 AM_PROG_LIBTOOL
@@ -37,9 +43,18 @@
 dnl Configure subtrees
 dnl ---------------------------------------------------------------------------
 dnl Yes, the sequence matters!
+
 AC_CONFIG_SUBDIRS([src/libexif])
 AC_CONFIG_SUBDIRS([src/exif])
 
+# workaround, must be after all AC_CONFIG_SUBDIRS
+# recursive make, two-subdirs, and stuff.
+substdirs=""
+for subdir in ${subdirs}; do
+    substdirs="${substdirs} \$(top_builddir)/${subdir}"
+done
+AC_SUBST([substdirs])
+
 
 dnl ---------------------------------------------------------------------------
 dnl Output files

Index: Makefile.am
===================================================================
RCS file: /cvsroot/libexif/libexif-testsuite/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	14 Mar 2005 00:47:25 -0000	1.2
+++ Makefile.am	14 Mar 2005 01:33:35 -0000	1.3
@@ -1,5 +1,4 @@
-# @subdirs@ contains the directories configured via AC_CONFIG_SUBDIRS
-SUBDIRS = m4 @subdirs@ tests
+SUBDIRS = m4 src tests
 
 # It is not sufficient to have these options somewhere in autogen.sh!
 ACLOCAL_AMFLAGS = -I m4